diff --git a/linapple-pie/CHANGELOG b/CHANGELOG
similarity index 100%
rename from linapple-pie/CHANGELOG
rename to CHANGELOG
diff --git a/linapple-pie/INSTALL b/INSTALL
similarity index 100%
rename from linapple-pie/INSTALL
rename to INSTALL
diff --git a/linapple-pie/LICENSE b/LICENSE
similarity index 100%
rename from linapple-pie/LICENSE
rename to LICENSE
diff --git a/linapple-pie/Master.dsk b/Master.dsk
similarity index 100%
rename from linapple-pie/Master.dsk
rename to Master.dsk
diff --git a/linapple-pie/Printer.txt b/Printer.txt
similarity index 100%
rename from linapple-pie/Printer.txt
rename to Printer.txt
diff --git a/linapple-pie/README b/README
similarity index 100%
rename from linapple-pie/README
rename to README
diff --git a/linapple-pie/README-linapple-pie b/README-linapple-pie
similarity index 100%
rename from linapple-pie/README-linapple-pie
rename to README-linapple-pie
diff --git a/emulators.cfg b/emulators.cfg
new file mode 100644
index 0000000..974d2c2
--- /dev/null
+++ b/emulators.cfg
@@ -0,0 +1,3 @@
+linapple="/opt/retropie/emulators/linapple/linapple -r -1 %ROM%"
+default="linapple"
+
diff --git a/linapple-pie/icon.bmp b/icon.bmp
similarity index 100%
rename from linapple-pie/icon.bmp
rename to icon.bmp
diff --git a/linapple b/linapple
new file mode 100755
index 0000000..13fb257
Binary files /dev/null and b/linapple differ
diff --git a/linapple-pie/linapple.conf b/linapple.conf
similarity index 100%
rename from linapple-pie/linapple.conf
rename to linapple.conf
diff --git a/linapple-pie/linapple.installed.conf b/linapple.installed.conf
similarity index 100%
rename from linapple-pie/linapple.installed.conf
rename to linapple.installed.conf
diff --git a/retro-pie-notes.txt b/retro-pie-notes.txt
new file mode 100644
index 0000000..925b4f9
--- /dev/null
+++ b/retro-pie-notes.txt
@@ -0,0 +1,35 @@
+Ok, all should be installed, but before you can actually use disk images, you need to edit the /etc/emulationstation/es_systems.cfg file.
+
+The command is.
+
+sudo nano /etc/emulationstation/es_systems.cfg
+
+
+
+Change the apple2 section from this..
+
+  <system>
+    <name>apple2</name>
+    <fullname>Apple II</fullname>
+    <path>/home/pi/RetroPie/roms/apple2</path>
+    <extension>.sh .SH</extension>
+    <command>/opt/retropie/supplementary/runcommand/runcommand.sh 0 _SYS_ apple2 %ROM%</command>
+    <platform>apple2</platform>
+    <theme>apple2</theme>
+    <directlaunch/>
+  </system>
+
+
+to this..
+
+  <system>
+    <name>apple2</name>
+    <fullname>Apple II</fullname>
+    <path>/home/pi/RetroPie/roms/apple2</path>
+    <extension>.dsk .nib .po .DSK .NIB .PO</extension>
+    <command>/opt/retropie/supplementary/runcommand/runcommand.sh 0 _SYS_ apple2 %ROM%</command>
+    <platform>apple2</platform>
+    <theme>apple2</theme>
+    <directlaunch/>
+  </system>
+
diff --git a/retropie-install-from-source.sh b/retropie-install-from-source.sh
new file mode 100755
index 0000000..87774e4
--- /dev/null
+++ b/retropie-install-from-source.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+cd src
+make
+cd ..
+sudo cp linapple /opt/retropie/emulators/linapple
+sudo ln -s /opt/retropie/configs/apple2 /home/pi/.linapple
+cp emulators.cfg /opt/retropie/configs/apple2
+cp Master.dsk /opt/retropie/configs/apple2
+cp linapple.conf /opt/retropie/configs/apple2
+cat retro-pie-notes.txt
+
diff --git a/retropie-install.sh b/retropie-install.sh
new file mode 100755
index 0000000..8a52994
--- /dev/null
+++ b/retropie-install.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+sudo cp linapple /opt/retropie/emulators/linapple
+sudo ln -s /opt/retropie/configs/apple2 /home/pi/.linapple
+cp emulators.cfg /opt/retropie/configs/apple2
+cp Master.dsk /opt/retropie/configs/apple2
+cp linapple.conf /opt/retropie/configs/apple2
+cat retro-pie-notes.txt
+
diff --git a/linapple-pie/src/6821.cpp b/src/6821.cpp
similarity index 100%
rename from linapple-pie/src/6821.cpp
rename to src/6821.cpp
diff --git a/linapple-pie/src/6821.h b/src/6821.h
similarity index 100%
rename from linapple-pie/src/6821.h
rename to src/6821.h
diff --git a/linapple-pie/src/AY8910.cpp b/src/AY8910.cpp
similarity index 100%
rename from linapple-pie/src/AY8910.cpp
rename to src/AY8910.cpp
diff --git a/linapple-pie/src/AY8910.h b/src/AY8910.h
similarity index 100%
rename from linapple-pie/src/AY8910.h
rename to src/AY8910.h
diff --git a/linapple-pie/src/AppleWin.h b/src/AppleWin.h
similarity index 100%
rename from linapple-pie/src/AppleWin.h
rename to src/AppleWin.h
diff --git a/linapple-pie/src/Applewin.cpp b/src/Applewin.cpp
similarity index 100%
rename from linapple-pie/src/Applewin.cpp
rename to src/Applewin.cpp
diff --git a/linapple-pie/src/CPU.cpp b/src/CPU.cpp
similarity index 100%
rename from linapple-pie/src/CPU.cpp
rename to src/CPU.cpp
diff --git a/linapple-pie/src/CPU.h b/src/CPU.h
similarity index 100%
rename from linapple-pie/src/CPU.h
rename to src/CPU.h
diff --git a/linapple-pie/src/Common.h b/src/Common.h
similarity index 100%
rename from linapple-pie/src/Common.h
rename to src/Common.h
diff --git a/linapple-pie/src/Debug.cpp b/src/Debug.cpp
similarity index 100%
rename from linapple-pie/src/Debug.cpp
rename to src/Debug.cpp
diff --git a/linapple-pie/src/Debug.h b/src/Debug.h
similarity index 100%
rename from linapple-pie/src/Debug.h
rename to src/Debug.h
diff --git a/linapple-pie/src/Debugger_Types.h b/src/Debugger_Types.h
similarity index 100%
rename from linapple-pie/src/Debugger_Types.h
rename to src/Debugger_Types.h
diff --git a/linapple-pie/src/Disk.cpp b/src/Disk.cpp
similarity index 100%
rename from linapple-pie/src/Disk.cpp
rename to src/Disk.cpp
diff --git a/linapple-pie/src/Disk.h b/src/Disk.h
similarity index 100%
rename from linapple-pie/src/Disk.h
rename to src/Disk.h
diff --git a/linapple-pie/src/DiskChoose.cpp b/src/DiskChoose.cpp
similarity index 100%
rename from linapple-pie/src/DiskChoose.cpp
rename to src/DiskChoose.cpp
diff --git a/linapple-pie/src/DiskChoose.h b/src/DiskChoose.h
similarity index 100%
rename from linapple-pie/src/DiskChoose.h
rename to src/DiskChoose.h
diff --git a/linapple-pie/src/DiskFTP.cpp b/src/DiskFTP.cpp
similarity index 100%
rename from linapple-pie/src/DiskFTP.cpp
rename to src/DiskFTP.cpp
diff --git a/linapple-pie/src/DiskFTP.h b/src/DiskFTP.h
similarity index 100%
rename from linapple-pie/src/DiskFTP.h
rename to src/DiskFTP.h
diff --git a/linapple-pie/src/DiskImage.cpp b/src/DiskImage.cpp
similarity index 100%
rename from linapple-pie/src/DiskImage.cpp
rename to src/DiskImage.cpp
diff --git a/linapple-pie/src/DiskImage.h b/src/DiskImage.h
similarity index 100%
rename from linapple-pie/src/DiskImage.h
rename to src/DiskImage.h
diff --git a/linapple-pie/src/Frame.cpp b/src/Frame.cpp
similarity index 100%
rename from linapple-pie/src/Frame.cpp
rename to src/Frame.cpp
diff --git a/linapple-pie/src/Frame.h b/src/Frame.h
similarity index 100%
rename from linapple-pie/src/Frame.h
rename to src/Frame.h
diff --git a/linapple-pie/src/Harddisk.cpp b/src/Harddisk.cpp
similarity index 100%
rename from linapple-pie/src/Harddisk.cpp
rename to src/Harddisk.cpp
diff --git a/linapple-pie/src/Harddisk.h b/src/Harddisk.h
similarity index 100%
rename from linapple-pie/src/Harddisk.h
rename to src/Harddisk.h
diff --git a/linapple-pie/src/Joystick.cpp b/src/Joystick.cpp
similarity index 100%
rename from linapple-pie/src/Joystick.cpp
rename to src/Joystick.cpp
diff --git a/linapple-pie/src/Joystick.h b/src/Joystick.h
similarity index 100%
rename from linapple-pie/src/Joystick.h
rename to src/Joystick.h
diff --git a/linapple-pie/src/Keyboard.cpp b/src/Keyboard.cpp
similarity index 100%
rename from linapple-pie/src/Keyboard.cpp
rename to src/Keyboard.cpp
diff --git a/linapple-pie/src/Keyboard.h b/src/Keyboard.h
similarity index 100%
rename from linapple-pie/src/Keyboard.h
rename to src/Keyboard.h
diff --git a/linapple-pie/src/Log.cpp b/src/Log.cpp
similarity index 100%
rename from linapple-pie/src/Log.cpp
rename to src/Log.cpp
diff --git a/linapple-pie/src/Log.h b/src/Log.h
similarity index 100%
rename from linapple-pie/src/Log.h
rename to src/Log.h
diff --git a/linapple-pie/src/Makefile b/src/Makefile
similarity index 100%
rename from linapple-pie/src/Makefile
rename to src/Makefile
diff --git a/linapple-pie/src/Memory.cpp b/src/Memory.cpp
similarity index 100%
rename from linapple-pie/src/Memory.cpp
rename to src/Memory.cpp
diff --git a/linapple-pie/src/Memory.h b/src/Memory.h
similarity index 100%
rename from linapple-pie/src/Memory.h
rename to src/Memory.h
diff --git a/linapple-pie/src/Mockingboard.cpp b/src/Mockingboard.cpp
similarity index 100%
rename from linapple-pie/src/Mockingboard.cpp
rename to src/Mockingboard.cpp
diff --git a/linapple-pie/src/Mockingboard.h b/src/Mockingboard.h
similarity index 100%
rename from linapple-pie/src/Mockingboard.h
rename to src/Mockingboard.h
diff --git a/linapple-pie/src/MouseInterface.cpp b/src/MouseInterface.cpp
similarity index 100%
rename from linapple-pie/src/MouseInterface.cpp
rename to src/MouseInterface.cpp
diff --git a/linapple-pie/src/MouseInterface.h b/src/MouseInterface.h
similarity index 100%
rename from linapple-pie/src/MouseInterface.h
rename to src/MouseInterface.h
diff --git a/linapple-pie/src/ParallelPrinter.cpp b/src/ParallelPrinter.cpp
similarity index 100%
rename from linapple-pie/src/ParallelPrinter.cpp
rename to src/ParallelPrinter.cpp
diff --git a/linapple-pie/src/ParallelPrinter.h b/src/ParallelPrinter.h
similarity index 100%
rename from linapple-pie/src/ParallelPrinter.h
rename to src/ParallelPrinter.h
diff --git a/linapple-pie/src/Registry.cpp b/src/Registry.cpp
similarity index 100%
rename from linapple-pie/src/Registry.cpp
rename to src/Registry.cpp
diff --git a/linapple-pie/src/Registry.h b/src/Registry.h
similarity index 100%
rename from linapple-pie/src/Registry.h
rename to src/Registry.h
diff --git a/linapple-pie/src/Riff.cpp b/src/Riff.cpp
similarity index 100%
rename from linapple-pie/src/Riff.cpp
rename to src/Riff.cpp
diff --git a/linapple-pie/src/Riff.h b/src/Riff.h
similarity index 100%
rename from linapple-pie/src/Riff.h
rename to src/Riff.h
diff --git a/linapple-pie/src/SSI263Phonemes.h b/src/SSI263Phonemes.h
similarity index 100%
rename from linapple-pie/src/SSI263Phonemes.h
rename to src/SSI263Phonemes.h
diff --git a/linapple-pie/src/SaveState.cpp b/src/SaveState.cpp
similarity index 100%
rename from linapple-pie/src/SaveState.cpp
rename to src/SaveState.cpp
diff --git a/linapple-pie/src/SaveState.h b/src/SaveState.h
similarity index 100%
rename from linapple-pie/src/SaveState.h
rename to src/SaveState.h
diff --git a/linapple-pie/src/SerialComms.cpp b/src/SerialComms.cpp
similarity index 100%
rename from linapple-pie/src/SerialComms.cpp
rename to src/SerialComms.cpp
diff --git a/linapple-pie/src/SerialComms.h b/src/SerialComms.h
similarity index 100%
rename from linapple-pie/src/SerialComms.h
rename to src/SerialComms.h
diff --git a/linapple-pie/src/SoundCore.cpp b/src/SoundCore.cpp
similarity index 100%
rename from linapple-pie/src/SoundCore.cpp
rename to src/SoundCore.cpp
diff --git a/linapple-pie/src/SoundCore.h b/src/SoundCore.h
similarity index 100%
rename from linapple-pie/src/SoundCore.h
rename to src/SoundCore.h
diff --git a/linapple-pie/src/Speaker.cpp b/src/Speaker.cpp
similarity index 100%
rename from linapple-pie/src/Speaker.cpp
rename to src/Speaker.cpp
diff --git a/linapple-pie/src/Speaker.h b/src/Speaker.h
similarity index 100%
rename from linapple-pie/src/Speaker.h
rename to src/Speaker.h
diff --git a/linapple-pie/src/Structs.h b/src/Structs.h
similarity index 100%
rename from linapple-pie/src/Structs.h
rename to src/Structs.h
diff --git a/linapple-pie/src/Timer.cpp b/src/Timer.cpp
similarity index 100%
rename from linapple-pie/src/Timer.cpp
rename to src/Timer.cpp
diff --git a/linapple-pie/src/Timer.h b/src/Timer.h
similarity index 100%
rename from linapple-pie/src/Timer.h
rename to src/Timer.h
diff --git a/linapple-pie/src/Util_MemoryTextFile.cpp b/src/Util_MemoryTextFile.cpp
similarity index 100%
rename from linapple-pie/src/Util_MemoryTextFile.cpp
rename to src/Util_MemoryTextFile.cpp
diff --git a/linapple-pie/src/Util_MemoryTextFile.h b/src/Util_MemoryTextFile.h
similarity index 100%
rename from linapple-pie/src/Util_MemoryTextFile.h
rename to src/Util_MemoryTextFile.h
diff --git a/linapple-pie/src/Video.cpp b/src/Video.cpp
similarity index 100%
rename from linapple-pie/src/Video.cpp
rename to src/Video.cpp
diff --git a/linapple-pie/src/Video.h b/src/Video.h
similarity index 100%
rename from linapple-pie/src/Video.h
rename to src/Video.h
diff --git a/linapple-pie/src/charset40.xpm b/src/charset40.xpm
similarity index 100%
rename from linapple-pie/src/charset40.xpm
rename to src/charset40.xpm
diff --git a/linapple-pie/src/font.xpm b/src/font.xpm
similarity index 100%
rename from linapple-pie/src/font.xpm
rename to src/font.xpm
diff --git a/linapple-pie/src/ftpparse.cpp b/src/ftpparse.cpp
similarity index 100%
rename from linapple-pie/src/ftpparse.cpp
rename to src/ftpparse.cpp
diff --git a/linapple-pie/src/ftpparse.h b/src/ftpparse.h
similarity index 100%
rename from linapple-pie/src/ftpparse.h
rename to src/ftpparse.h
diff --git a/linapple-pie/src/icon.xpm b/src/icon.xpm
similarity index 100%
rename from linapple-pie/src/icon.xpm
rename to src/icon.xpm
diff --git a/linapple-pie/src/list.h b/src/list.h
similarity index 100%
rename from linapple-pie/src/list.h
rename to src/list.h
diff --git a/linapple-pie/src/resource.h b/src/resource.h
similarity index 100%
rename from linapple-pie/src/resource.h
rename to src/resource.h
diff --git a/linapple-pie/src/splash.xpm b/src/splash.xpm
similarity index 100%
rename from linapple-pie/src/splash.xpm
rename to src/splash.xpm
diff --git a/linapple-pie/src/stdafx.h b/src/stdafx.h
similarity index 100%
rename from linapple-pie/src/stdafx.h
rename to src/stdafx.h
diff --git a/linapple-pie/src/stretch.cpp b/src/stretch.cpp
similarity index 100%
rename from linapple-pie/src/stretch.cpp
rename to src/stretch.cpp
diff --git a/linapple-pie/src/stretch.h b/src/stretch.h
similarity index 100%
rename from linapple-pie/src/stretch.h
rename to src/stretch.h
diff --git a/linapple-pie/src/wincompat.h b/src/wincompat.h
similarity index 100%
rename from linapple-pie/src/wincompat.h
rename to src/wincompat.h
diff --git a/linapple-pie/src/wwrapper.cpp b/src/wwrapper.cpp
similarity index 100%
rename from linapple-pie/src/wwrapper.cpp
rename to src/wwrapper.cpp
diff --git a/linapple-pie/src/wwrapper.h b/src/wwrapper.h
similarity index 100%
rename from linapple-pie/src/wwrapper.h
rename to src/wwrapper.h