diff --git a/Makefile b/Makefile
index 832b867..de1f41b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,11 @@ shellchooser: $(FILES)
 install: $(FILES)
 	chmod 755 shellchooser.sh
 	cp shellchooser.sh /bin/shellchooser.sh
-	cp -r bashfiles /etc/bashfiles
-	cp -r cshfiles /etc/cshfiles
-	cp -r dashfiles /etc/dashfiles
+	mkdir /etc/shellchooser
+	cp -r bashfiles /etc/shellchooser/bashfiles
+	cp -r cshfiles /etc/shellchooser/cshfiles
+	cp -r dashfiles /etc/shellchooser/dashfiles
 
 uninstall:
 	rm /bin/shellchooser.sh
-	rm -rf /etc/bashfiles
-	rm -rf /etc/cshfiles
-	rm -rf /etc/dashfiles
+	rm -rf /etc/shellchooser
diff --git a/shellchooser.sh b/shellchooser.sh
index 2a2bc47..17dcd78 100755
--- a/shellchooser.sh
+++ b/shellchooser.sh
@@ -32,8 +32,9 @@ Which="/usr/bin/which"
 Binaries=(clear cp printf cat mktemp rm tail dialog diff)
 
 # Variables
-BashFiles="/etc/shellchooser/bash"
-CshFiles="/etc/shellchooser/csh"
+BashFiles="/etc/shellchooser/bashfiles"
+CshFiles="/etc/shellchooser/cshfiles"
+DashFiles="/etc/shellchooser/dashfiles"
 
 
 ### Functions ###
@@ -140,7 +141,7 @@ if [ $? -ne 0 ]; then
 	echo "Aborting..."
 	exit 1
 fi
-#check_env
+check_env
 $Clear
 $Shell