diff --git a/msys2/msys2_shell.cmd b/msys2/msys2_shell.cmd
index d269ccfc2..719c7929a 100644
--- a/msys2/msys2_shell.cmd
+++ b/msys2/msys2_shell.cmd
@@ -22,7 +22,7 @@ del %WD%..\..\etc\passwd 2> nul
 del %WD%..\..\etc\group 2> nul
 %WD%touch /etc/passwd
 %WD%touch /etc/group
-%WD%bash /user_setup.sh
+%WD%bash /ps/user_setup.sh
 
 :checkparams
 rem Help option
diff --git a/msys2/etc/post-install/09-proxspace.post b/msys2/ps/09-proxspace_setup.post
similarity index 85%
rename from msys2/etc/post-install/09-proxspace.post
rename to msys2/ps/09-proxspace_setup.post
index f47361260..f9adfda00 100644
--- a/msys2/etc/post-install/09-proxspace.post
+++ b/msys2/ps/09-proxspace_setup.post
@@ -1,3 +1,10 @@
+PSVERSION="3.3"
+export LANG=en_US.UTF-8
+export PS1='\[\033]0;ProxSpace v$PSVERSION - $MSYSTEM:\w\007\033[32m\]pm3 \[\033[33m\]\w\[\033[0m\]$ '
+export PATH=/gcc-arm-none-eabi/bin:$PATH
+alias ls='ls -hF --color=auto' 
+
+
 check_install () { 
 	pacman -Q $1 > /dev/null
 	if [ $? == 1 ]; then
@@ -48,8 +55,6 @@ setup_proxspace ()
 	clean_86	
   fi
 }
-
-export LANG=en_US.UTF-8
 	
 if [ "$MAYBE_FIRST_START" = "false" ]; then
 	yes | pacman -Su
diff --git a/msys2/autobuild.sh b/msys2/ps/autobuild.sh
similarity index 97%
rename from msys2/autobuild.sh
rename to msys2/ps/autobuild.sh
index 9bd59a69d..f20e85a40 100644
--- a/msys2/autobuild.sh
+++ b/msys2/ps/autobuild.sh
@@ -40,7 +40,7 @@ for i in $( ls ); do
 	  mkdir -p "$buildDir/$i/Windows Driver"
 	  #you have to thank QT5 for all that dlls
 	  cp $mingwDir/bin/{libbz2-1.dll,libdouble-conversion.dll,libfreetype-*.dll,libgcc_s_*.dll,libglib-2.0-0.dll,libgraphite2.dll,libharfbuzz-0.dll,libiconv-2.dll,libicudt64.dll,libicuin64.dll,libicuuc64.dll,libintl-8.dll,libpcre-1.dll,libpcre2-16-0.dll,libpng16-16.dll,libreadline*.dll,libstdc++-*.dll,libtermcap-0.dll,libwinpthread-1.dll,Qt5Core.dll,Qt5Gui.dll,Qt5Widgets.dll,zlib1.dll,libsndfile-1.dll,libFLAC-8.dll,libogg-0.dll,libspeex-1.dll,libvorbis-0.dll,libvorbisenc-2.dll} $buildDir/$i/win$arch
-	  cp -r /autobuild/* $buildDir/$i/win$arch
+	  cp -r /ps/autobuild/* $buildDir/$i/win$arch
 	  cp -r $pm3Dir/$i/client/{proxmark3.exe,flasher.exe,*.dic,lualibs,scripts,hardnested} $buildDir/$i/win$arch
 	  cp $mingwDir/share/qt5/plugins/platforms/qwindows.dll $buildDir/$i/win$arch/platforms
 	  cp $pm3Dir/$i/armsrc/obj/{fullimage.elf,fullimage.s19} $buildDir/$i/firmware_win
diff --git a/msys2/autobuild/FLASH - All.bat b/msys2/ps/autobuild/FLASH - All.bat
similarity index 100%
rename from msys2/autobuild/FLASH - All.bat
rename to msys2/ps/autobuild/FLASH - All.bat
diff --git a/msys2/autobuild/FLASH - Bootrom.bat b/msys2/ps/autobuild/FLASH - Bootrom.bat
similarity index 100%
rename from msys2/autobuild/FLASH - Bootrom.bat
rename to msys2/ps/autobuild/FLASH - Bootrom.bat
diff --git a/msys2/autobuild/FLASH - fullimage.bat b/msys2/ps/autobuild/FLASH - fullimage.bat
similarity index 100%
rename from msys2/autobuild/FLASH - fullimage.bat
rename to msys2/ps/autobuild/FLASH - fullimage.bat
diff --git a/msys2/autobuild/Go.bat b/msys2/ps/autobuild/Go.bat
similarity index 100%
rename from msys2/autobuild/Go.bat
rename to msys2/ps/autobuild/Go.bat
diff --git a/msys2/autobuild/qt.conf b/msys2/ps/autobuild/qt.conf
similarity index 100%
rename from msys2/autobuild/qt.conf
rename to msys2/ps/autobuild/qt.conf
diff --git a/msys2/user_setup.sh b/msys2/ps/user_setup.sh
similarity index 100%
rename from msys2/user_setup.sh
rename to msys2/ps/user_setup.sh
diff --git a/msys2/var/lib/pacman/local/filesystem-2018.12-1/files b/msys2/var/lib/pacman/local/filesystem-2018.12-1/files
index 4899da3ae..e0111a07b 100644
--- a/msys2/var/lib/pacman/local/filesystem-2018.12-1/files
+++ b/msys2/var/lib/pacman/local/filesystem-2018.12-1/files
@@ -29,7 +29,6 @@ etc/post-install/05-home-dir.post
 etc/post-install/06-windows-files.post
 etc/post-install/07-pacman-key.post
 etc/post-install/08-xml-catalog.post
-etc/post-install/09-proxspace.post
 etc/profile
 etc/profile.d/
 etc/profile.d/lang.sh
diff --git a/pm3/.bash_logout b/pm3/.bash_logout
deleted file mode 100644
index 0e4e4f184..000000000
--- a/pm3/.bash_logout
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# ~/.bash_logout
-#
diff --git a/pm3/.bash_profile b/pm3/.bash_profile
deleted file mode 100644
index f694f7813..000000000
--- a/pm3/.bash_profile
+++ /dev/null
@@ -1,36 +0,0 @@
-# To the extent possible under law, the author(s) have dedicated all 
-# copyright and related and neighboring rights to this software to the 
-# public domain worldwide. This software is distributed without any warranty. 
-# You should have received a copy of the CC0 Public Domain Dedication along 
-# with this software. 
-# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. 
-
-# ~/.bash_profile: executed by bash(1) for login shells.
-
-# The copy in your home directory (~/.bash_profile) is yours, please
-# feel free to customise it to create a shell
-# environment to your liking.  If you feel a change
-# would be benifitial to all, please feel free to send
-# a patch to the msys2 mailing list.
-
-# User dependent .bash_profile file
-
-# source the users bashrc if it exists
-if [ -f "${HOME}/.bashrc" ] ; then
-  source "${HOME}/.bashrc"
-fi
-
-# Set PATH so it includes user's private bin if it exists
-# if [ -d "${HOME}/bin" ] ; then
-#   PATH="${HOME}/bin:${PATH}"
-# fi
-
-# Set MANPATH so it includes users' private man if it exists
-# if [ -d "${HOME}/man" ]; then
-#   MANPATH="${HOME}/man:${MANPATH}"
-# fi
-
-# Set INFOPATH so it includes users' private info if it exists
-# if [ -d "${HOME}/info" ]; then
-#   INFOPATH="${HOME}/info:${INFOPATH}"
-# fi
diff --git a/pm3/.bashrc b/pm3/.bashrc
deleted file mode 100644
index 50791c67d..000000000
--- a/pm3/.bashrc
+++ /dev/null
@@ -1,194 +0,0 @@
-# To the extent possible under law, the author(s) have dedicated all 
-# copyright and related and neighboring rights to this software to the 
-# public domain worldwide. This software is distributed without any warranty. 
-# You should have received a copy of the CC0 Public Domain Dedication along 
-# with this software. 
-# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. 
-
-# ~/.bashrc: executed by bash(1) for interactive shells.
-
-# The copy in your home directory (~/.bashrc) is yours, please
-# feel free to customise it to create a shell
-# environment to your liking.  If you feel a change
-# would be benifitial to all, please feel free to send
-# a patch to the msys2 mailing list.
-
-# User dependent .bashrc file
-
-# If not running interactively, don't do anything
-[[ "$-" != *i* ]] && return
-
-# Shell Options
-#
-# See man bash for more options...
-#
-# Don't wait for job termination notification
-# set -o notify
-#
-# Don't use ^D to exit
-# set -o ignoreeof
-#
-# Use case-insensitive filename globbing
-# shopt -s nocaseglob
-#
-# Make bash append rather than overwrite the history on disk
-# shopt -s histappend
-#
-# When changing directory small typos can be ignored by bash
-# for example, cd /vr/lgo/apaache would find /var/log/apache
-# shopt -s cdspell
-
-# Completion options
-#
-# These completion tuning parameters change the default behavior of bash_completion:
-#
-# Define to access remotely checked-out files over passwordless ssh for CVS
-# COMP_CVS_REMOTE=1
-#
-# Define to avoid stripping description in --option=description of './configure --help'
-# COMP_CONFIGURE_HINTS=1
-#
-# Define to avoid flattening internal contents of tar files
-# COMP_TAR_INTERNAL_PATHS=1
-#
-# Uncomment to turn on programmable completion enhancements.
-# Any completions you add in ~/.bash_completion are sourced last.
-# [[ -f /etc/bash_completion ]] && . /etc/bash_completion
-
-# History Options
-#
-# Don't put duplicate lines in the history.
-# export HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups
-#
-# Ignore some controlling instructions
-# HISTIGNORE is a colon-delimited list of patterns which should be excluded.
-# The '&' is a special pattern which suppresses duplicate entries.
-# export HISTIGNORE=$'[ \t]*:&:[fb]g:exit'
-# export HISTIGNORE=$'[ \t]*:&:[fb]g:exit:ls' # Ignore the ls command as well
-#
-# Whenever displaying the prompt, write the previous line to disk
-# export PROMPT_COMMAND="history -a"
-
-# Aliases
-#
-# Some people use a different file for aliases
-# if [ -f "${HOME}/.bash_aliases" ]; then
-#   source "${HOME}/.bash_aliases"
-# fi
-#
-# Some example alias instructions
-# If these are enabled they will be used instead of any instructions
-# they may mask.  For example, alias rm='rm -i' will mask the rm
-# application.  To override the alias instruction use a \ before, ie
-# \rm will call the real rm not the alias.
-#
-# Interactive operation...
-# alias rm='rm -i'
-# alias cp='cp -i'
-# alias mv='mv -i'
-#
-# Default to human readable figures
-# alias df='df -h'
-# alias du='du -h'
-#
-# Misc :)
-# alias less='less -r'                          # raw control characters
-# alias whence='type -a'                        # where, of a sort
-# alias grep='grep --color'                     # show differences in colour
-# alias egrep='egrep --color=auto'              # show differences in colour
-# alias fgrep='fgrep --color=auto'              # show differences in colour
-#
-# Some shortcuts for different directory listings
-# alias ls='ls -hF --color=tty'                 # classify files in colour
-# alias dir='ls --color=auto --format=vertical'
-# alias vdir='ls --color=auto --format=long'
-# alias ll='ls -l'                              # long list
-# alias la='ls -A'                              # all but . and ..
-# alias l='ls -CF'                              #
-
-# Umask
-#
-# /etc/profile sets 022, removing write perms to group + others.
-# Set a more restrictive umask: i.e. no exec perms for others:
-# umask 027
-# Paranoid: neither group nor others have any perms:
-# umask 077
-
-# Functions
-#
-# Some people use a different file for functions
-# if [ -f "${HOME}/.bash_functions" ]; then
-#   source "${HOME}/.bash_functions"
-# fi
-#
-# Some example functions:
-#
-# a) function settitle
-# settitle () 
-# { 
-#   echo -ne "\e]2;$@\a\e]1;$@\a"; 
-# }
-# 
-# b) function cd_func
-# This function defines a 'cd' replacement function capable of keeping, 
-# displaying and accessing history of visited directories, up to 10 entries.
-# To use it, uncomment it, source this file and try 'cd --'.
-# acd_func 1.0.5, 10-nov-2004
-# Petar Marinov, http:/geocities.com/h2428, this is public domain
-# cd_func ()
-# {
-#   local x2 the_new_dir adir index
-#   local -i cnt
-# 
-#   if [[ $1 ==  "--" ]]; then
-#     dirs -v
-#     return 0
-#   fi
-# 
-#   the_new_dir=$1
-#   [[ -z $1 ]] && the_new_dir=$HOME
-# 
-#   if [[ ${the_new_dir:0:1} == '-' ]]; then
-#     #
-#     # Extract dir N from dirs
-#     index=${the_new_dir:1}
-#     [[ -z $index ]] && index=1
-#     adir=$(dirs +$index)
-#     [[ -z $adir ]] && return 1
-#     the_new_dir=$adir
-#   fi
-# 
-#   #
-#   # '~' has to be substituted by ${HOME}
-#   [[ ${the_new_dir:0:1} == '~' ]] && the_new_dir="${HOME}${the_new_dir:1}"
-# 
-#   #
-#   # Now change to the new dir and add to the top of the stack
-#   pushd "${the_new_dir}" > /dev/null
-#   [[ $? -ne 0 ]] && return 1
-#   the_new_dir=$(pwd)
-# 
-#   #
-#   # Trim down everything beyond 11th entry
-#   popd -n +11 2>/dev/null 1>/dev/null
-# 
-#   #
-#   # Remove any other occurence of this dir, skipping the top of the stack
-#   for ((cnt=1; cnt <= 10; cnt++)); do
-#     x2=$(dirs +${cnt} 2>/dev/null)
-#     [[ $? -ne 0 ]] && return 0
-#     [[ ${x2:0:1} == '~' ]] && x2="${HOME}${x2:1}"
-#     if [[ "${x2}" == "${the_new_dir}" ]]; then
-#       popd -n +$cnt 2>/dev/null 1>/dev/null
-#       cnt=cnt-1
-#     fi
-#   done
-# 
-#   return 0
-# }
-# 
-# alias cd=cd_func
-export LANG=en_US.UTF-8
-export PS1='\[\033]0;ProxSpace v3.2 - $MSYSTEM:\w\007\033[32m\]pm3 \[\033[33m\]\w\[\033[0m\]$ '
-export PATH=/gcc-arm-none-eabi/bin:$PATH
-alias ls='ls -hF --color=auto' 
\ No newline at end of file
diff --git a/pm3/.inputrc b/pm3/.inputrc
deleted file mode 100644
index 5391e2f42..000000000
--- a/pm3/.inputrc
+++ /dev/null
@@ -1,114 +0,0 @@
-# To the extent possible under law, the author(s) have dedicated all 
-# copyright and related and neighboring rights to this software to the 
-# public domain worldwide. This software is distributed without any warranty. 
-# You should have received a copy of the CC0 Public Domain Dedication along 
-# with this software. 
-# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. 
-
-# ~/.inputrc: readline initialization file.
-
-# The copy in your home directory (~/.inputrc) is yours, please
-# feel free to customise it to create a shell
-# environment to your liking.  If you feel a change
-# would be benifitial to all, please feel free to send
-# a patch to the msys2 mailing list.
-
-# the following line is actually
-# equivalent to "\C-?": delete-char
-# "\e[3~": delete-char
-
-# VT
-# "\e[1~": beginning-of-line
-# "\e[4~": end-of-line
-
-# kvt
-# "\e[H": beginning-of-line
-# "\e[F": end-of-line
-
-# rxvt and konsole (i.e. the KDE-app...)
-# "\e[7~": beginning-of-line
-# "\e[8~": end-of-line
-
-# VT220
-# "\eOH": beginning-of-line
-# "\eOF": end-of-line
-
-# Allow 8-bit input/output
-# set meta-flag on
-# set convert-meta off
-# set input-meta on
-# set output-meta on
-#$if Bash
-  # Don't ring bell on completion
-  set bell-style none
-
-  # or, don't beep at me - show me
-  #set bell-style visible
-
-  # Show all instead of beeping first
-  set show-all-if-ambiguous off
-
-  # Filename completion/expansion
-  set completion-ignore-case on
-  #set show-all-if-ambiguous on
-
-  # Expand homedir name
-  #set expand-tilde on
-
-  # Append "/" to all dirnames
-  #set mark-directories on
-  #set mark-symlinked-directories on
-
-  # visible-stats
-  # Append a mark according to the file type in a listing
-  set visible-stats off
-  set mark-directories on
-
-  # Match all files
-  #set match-hidden-files on
-
-  # 'Magic Space'
-  # Insert a space character then performs
-  # a history expansion in the line
-  #Space: magic-space
-#$endif
-
-# MSYSTEM is emacs based
-$if mode=emacs
-  # Common to Console & RXVT
-  "\C-?": backward-kill-line         # Ctrl-BackSpace
-  "\e[2~": paste-from-clipboard      # "Ins. Key"
-  "\e[5~": beginning-of-history      # Page up
-  "\e[6~": end-of-history            # Page down
-
-  $if term=msys # RXVT
-    "\e[7~": beginning-of-line      # Home Key
-    "\e[8~": end-of-line            # End Key
-    "\e[11~": display-shell-version # F1
-    "\e[15~": re-read-init-file     # F5
-    "\e[12~": "Function Key 2"
-    "\e[13~": "Function Key 3"
-    "\e[14~": "Function Key 4"
-    "\e[17~": "Function Key 6"
-    "\e[18~": "Function Key 7"
-    "\e[19~": "Function Key 8"
-    "\e[20~": "Function Key 9"
-    "\e[21~": "Function Key 10"
-  $else
-  # Eh, normal Console is not really cygwin anymore, is it? Using 'else' instead. -mstormo
-  # $if term=cygwin # Console
-    "\e[1~": beginning-of-line      # Home Key
-    "\e[4~": end-of-line            # End Key
-    "\e[3~": delete-char      # Delete Key
-    "\e\e[C": forward-word      # Alt-Right
-    "\e\e[D": backward-word      # Alt-Left
-    "\e[1;5C": forward-word   # ctrl + right
-    "\e[1;5D": backward-word  # ctrl + left 
-    "\e[17~": "Function Key 6"
-    "\e[18~": "Function Key 7"
-    "\e[19~": "Function Key 8"
-    "\e[20~": "Function Key 9"
-    "\e[21~": "Function Key 10"
-    "\e[23~": "Function Key 11"
-  $endif
-$endif
\ No newline at end of file
diff --git a/pm3/.profile b/pm3/.profile
deleted file mode 100644
index b78573850..000000000
--- a/pm3/.profile
+++ /dev/null
@@ -1,52 +0,0 @@
-# To the extent possible under law, the author(s) have dedicated all 
-# copyright and related and neighboring rights to this software to the 
-# public domain worldwide. This software is distributed without any warranty. 
-# You should have received a copy of the CC0 Public Domain Dedication along 
-# with this software. 
-# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. 
-
-# ~/.profile: executed by the command interpreter for login shells.
-
-# The copy in your home directory (~/.profile) is yours, please
-# feel free to customise it to create a shell
-# environment to your liking.  If you feel a change
-# would be benificial to all, please feel free to send
-# a patch to the msys2 mailing list.
-
-# User dependent .profile file
-
-# Set user-defined locale
-export LANG=$(locale -uU)
-
-# This file is not read by bash(1) if ~/.bash_profile or ~/.bash_login
-# exists.
-#
-# if running bash
-if [ -n "${BASH_VERSION}" ]; then
-  if [ -f "${HOME}/.bashrc" ]; then
-    source "${HOME}/.bashrc"
-  fi
-fi
-
-agm2() {
-  local MINGW_DIRS="mingw32 mingw64"
-  local AG_FIND=
-  
-  for dir in ${MINGW_DIRS}; do
-    if type -p /${dir}/bin/ag >/dev/null; then
-      AG_FIND=/${dir}/bin/ag
-    fi
-  done
-  
-  if ! type -p /usr/bin/git >/dev/null; then
-    echo "bash: git: command not found. Please install \"git\" package."
-    exit 1
-  fi
-  
-  if [ -n "$AG_FIND" ]; then
-    $AG_FIND --makepkg --depth 1 "$@" $(git rev-parse --show-toplevel)
-  else
-    echo "bash: ag: conmmand not found. Please install \"mingw-w64-i686-ag\" or \"mingw-w64-x86_64-ag\" package."
-    exit 1
-  fi
-}
diff --git a/runme.bat b/runme.bat
index 3b52db03c..a541169fd 100644
--- a/runme.bat
+++ b/runme.bat
@@ -3,7 +3,7 @@ REM *******************************************
 REM CHANGE THIS PATH TO MATCH YOUR INSTALLATION
 REM *******************************************
 set MYPATH=%~dp0
-
+copy /Y msys2\ps\*.post msys2\etc\post-install\ >NUL
 echo # For a description of the file format, see the Users Guide >msys2/etc/fstab 
 echo # http://cygwin.com/cygwin-ug-net/using.html#mount-table >>msys2/etc/fstab 
 echo none / cygdrive binary,posix=0,noacl,user 0 0 >>msys2/etc/fstab
diff --git a/runme64.bat b/runme64.bat
index cb2248cae..206f5713f 100644
--- a/runme64.bat
+++ b/runme64.bat
@@ -3,7 +3,7 @@ REM *******************************************
 REM CHANGE THIS PATH TO MATCH YOUR INSTALLATION
 REM *******************************************
 set MYPATH=%~dp0
-
+copy /Y msys2\ps\*.post msys2\etc\post-install\ >NUL
 echo # For a description of the file format, see the Users Guide >msys2/etc/fstab 
 echo # http://cygwin.com/cygwin-ug-net/using.html#mount-table >>msys2/etc/fstab 
 echo none / cygdrive binary,posix=0,noacl,user 0 0 >>msys2/etc/fstab