diff --git a/Install.sh b/Install.sh
index eb546ff..4c3dca0 100644
--- a/Install.sh
+++ b/Install.sh
@@ -15,40 +15,40 @@ echo -e " * 8: Exit"
 
 read NUM
 case $NUM in 
-1)
-sudo bash ./Install_moonlight.sh
-sudo bash ./Pair_moonlight.sh
-sudo bash ./Install_moonlight_menu.sh
-sudo bash ./Install_Scripts.sh
-sudo bash ./Install_themes.sh	
-;;
-2)
-		sudo bash ./Install_moonlight.sh
-		sudo bash ./Install.sh
-	;;
-	3)				
-		sudo bash ./Pair_moonlight.sh
-		sudo bash ./Install.sh
-	;;
-	4)
-		sudo bash ./Install_moonlight_menu.sh
-		sudo bash ./Install.sh
-	;;	
-	5) 
-		sudo bash ./Install_Scripts.sh
-		sudo bash ./Install.sh
-	;;
+    1)
+        sudo bash ./Scripts/Install_moonlight.sh
+        sudo bash ./Scripts/Pair_moonlight.sh
+        sudo bash ./Scripts/Install_moonlight_menu.sh
+        sudo bash ./Scripts/Install_Scripts.sh
+        sudo bash ./Scripts/Install_themes.sh	
+        ;;
+    2)
+        sudo bash ./Scripts/Install_moonlight.sh
+        sudo bash ./Install.sh
+        ;;
+    3)				
+        sudo bash ./Scripts/Pair_moonlight.sh
+        sudo bash ./Install.sh
+        ;;
+    4)
+        sudo bash ./Scripts/Install_moonlight_menu.sh
+        sudo bash ./Install.sh
+        ;;	
+    5) 
+        sudo bash ./Scripts/Install_Scripts.sh
+        sudo bash ./Install.sh
+        ;;
     6)  
-		sudo bash ./Install_themes.sh
-		sudo bash ./Install.sh
-	;;
-	7)
-		echo -e "\nRemoving all Moonlight launch scripts..."
-		rm -rf /home/pi/RetroPie/roms/moonlight	
-		sudo bash ./Install.sh
-	;;
-	8)
-	 	exit 1
-	;;		
-	*) echo "INVALID NUMBER!" ;;
-esac
\ No newline at end of file
+        sudo bash ./Scripts/Install_themes.sh
+        sudo bash ./Install.sh
+        ;;
+    7)
+        echo -e "\nRemoving all Moonlight launch scripts..."
+        rm -rf /home/pi/RetroPie/roms/moonlight	
+        sudo bash ./Install.sh
+        ;;
+    8)
+        exit 1
+        ;;		
+    *) echo "INVALID NUMBER!" ;;
+esac
diff --git a/README.md b/README.md
index 47433a6..dde403f 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ There is already a [solution available](https://github.com/TechWizTime/moonlight
   2. I've found Steam BPM to be unreliable when used with RetroPie and I wanted something better.
   
 ## Minimum Requirements ##
-
+  * Raspberry Pi running Raspian Stretch (or latest RetroPie release)
   * GPU: Desktop: GeForce GTX 650 or higher desktop GPU.
   * CPU: Intel Core i3-2100 3.1GHz or AMD Athlon II X4 630 2.8 GHz or higher.
   * System Memory: 4 GB or higher.
diff --git a/Install_Scripts.sh b/Scripts/Install_Scripts.sh
similarity index 71%
rename from Install_Scripts.sh
rename to Scripts/Install_Scripts.sh
index 5c7e0f1..870484d 100644
--- a/Install_Scripts.sh
+++ b/Scripts/Install_Scripts.sh
@@ -8,13 +8,12 @@ then
 fi
 
 mkdir -p /home/pi/RetroPie/roms/moonlight
-chmod 775 /home/pi/RetroPie/roms/moonlight
-chown pi:pi /home/pi/RetroPie/roms/moonlight
 
-chmod -x+ Refresh.sh
-
-/bin/cp ./Refresh.sh /home/pi/RetroPie/roms/moonlight/Refresh.sh
+chmod a+x ./Scripts/Refresh.sh
+/bin/cp ./Scripts/Refresh.sh /home/pi/RetroPie/roms/moonlight/Refresh.sh
 /bin/cp ./GenerateGamesList.py /home/pi/RetroPie/roms/moonlight/GenerateGamesList.py
 
+chmod 777 /home/pi/RetroPie/roms/moonlight
+
 echo -e "Refresh script has been added to RetroPie\n"
 echo -e "After loading RetroPie, use the \"Refresh\" rom listed in the Moonlight system.\n"
diff --git a/Install_moonlight.sh b/Scripts/Install_moonlight.sh
similarity index 70%
rename from Install_moonlight.sh
rename to Scripts/Install_moonlight.sh
index 0c4b197..b481959 100644
--- a/Install_moonlight.sh
+++ b/Scripts/Install_moonlight.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 echo -e "\nAdding Moonlight to Sources List..."
-		
-if grep -q "deb http://archive.itimmer.nl/raspbian/moonlight jessie main" /etc/apt/sources.list; then
+
+if grep -q "deb http://archive.itimmer.nl/raspbian/moonlight stretch main" /etc/apt/sources.list; then
     echo -e "NOTE: Moonlight Source Exists - Skipping"
 else
     echo -e "Adding Moonlight to Sources List"
-    echo "deb http://archive.itimmer.nl/raspbian/moonlight jessie main" >> /etc/apt/sources.list
+    echo "deb http://archive.itimmer.nl/raspbian/moonlight stretch main" >> /etc/apt/sources.list
 fi
 
 echo -e "\nFetching and installing the GPG key....\n"
@@ -25,4 +25,4 @@ apt-get update -y
 
 echo -e "\nInstalling Moonlight..."
 apt-get install moonlight-embedded -y
-echo -e "\nMoonlight Installed!"
\ No newline at end of file
+echo -e "\nMoonlight Installed!"
diff --git a/Install_moonlight_menu.sh b/Scripts/Install_moonlight_menu.sh
similarity index 56%
rename from Install_moonlight_menu.sh
rename to Scripts/Install_moonlight_menu.sh
index efe7881..4633569 100644
--- a/Install_moonlight_menu.sh
+++ b/Scripts/Install_moonlight_menu.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo -e "\nCreating Moonlight Menu for RetroPie..."
-		
+
 CONFIG=$(<./menu_config.txt)
 DIRECTORY=/home/pi/.emulationstation/es_systems.cfg
 
@@ -15,6 +15,6 @@ echo -e "Copying Systems Config File"
 cp /etc/emulationstation/es_systems.cfg $DIRECTORY
 
 echo -e "Adding Moonlight to Systems"
-sudo sed -i -e 's|</systemList>|  <system>\n    <name>steam</name>\n    <fullname>Steam</fullname>\n    <path>~/RetroPie/roms/moonlight</path>\n    <extension>.sh .SH</extension>\n    <command>bash %ROM%</command>\n    <platform>pc</platform>\n    <theme>moonlight</theme>\n  </system>\n</systemList>|g' $DIRECTORY
+sudo sed -i -e 's|</systemList>|  <system>\n    <name>moonlight</name>\n    <fullname>Moonlight</fullname>\n    <path>~/RetroPie/roms/moonlight</path>\n    <extension>.sh .SH</extension>\n    <command>bash %ROM%</command>\n    <platform>pc</platform>\n    <theme>moonlight</theme>\n  </system>\n</systemList>|g' $DIRECTORY
 
 echo -e "\nMoonlight menu added to RetroPie..."
diff --git a/Install_themes.sh b/Scripts/Install_themes.sh
similarity index 100%
rename from Install_themes.sh
rename to Scripts/Install_themes.sh
diff --git a/Pair_moonlight.sh b/Scripts/Pair_moonlight.sh
similarity index 100%
rename from Pair_moonlight.sh
rename to Scripts/Pair_moonlight.sh
diff --git a/Refresh.sh b/Scripts/Refresh.sh
old mode 100644
new mode 100755
similarity index 100%
rename from Refresh.sh
rename to Scripts/Refresh.sh
diff --git a/menu_config.txt b/Scripts/menu_config.txt
similarity index 100%
rename from menu_config.txt
rename to Scripts/menu_config.txt