diff --git a/.gitignore b/.gitignore
index 372aee60095..498e454a4d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,5 @@ build/linux/work/
 build/linux/dist/*.tar.gz
 build/linux/*.tgz
 test-bin
-*.iml
+*.iml
+*.rar
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/VolumeController.cpp b/hardware/zpuino/zpu/libraries/RetroCade/VolumeController.cpp
deleted file mode 100644
index 12a1ddcd89f..00000000000
--- a/hardware/zpuino/zpu/libraries/RetroCade/VolumeController.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "VolumeController.h"
-
-VolumeController_class::VolumeController_class(int slot)
-{
-    base=IO_SLOT(slot);
-}
-
-void VolumeController_class::set(int input, int left, int right)
-{
-    left&=0xff;
-    right&=0xff;
-    input&=7;
-    REGISTER( base, input ) = left;
-    REGISTER( base, input + 32 ) = right;
-}
-
-
-VolumeController_class VolumeController;
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/VolumeController.h b/hardware/zpuino/zpu/libraries/RetroCade/VolumeController.h
deleted file mode 100644
index cbed9514c9e..00000000000
--- a/hardware/zpuino/zpu/libraries/RetroCade/VolumeController.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <Arduino.h>
-
-class VolumeController_class
-{
-public:
-    VolumeController_class(int slot=12);
-
-    void set(int input, int left, int right);
-
-private:
-    unsigned base;
-};
-
-extern VolumeController_class VolumeController;
-
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track1.mod b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track1.mod
deleted file mode 100644
index f5e75eabe28..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track1.mod and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track2.mod b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track2.mod
deleted file mode 100644
index fb4cd9ed2ed..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track2.mod and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track3.mod b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track3.mod
deleted file mode 100644
index 92c17e6d186..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track3.mod and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track4.mod b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track4.mod
deleted file mode 100644
index dc300712075..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track4.mod and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track4.ymd b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track4.ymd
deleted file mode 100644
index 7ccd37041a4..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track4.ymd and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track5.mod b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track5.mod
deleted file mode 100644
index ecfe0b9aadd..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track5.mod and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track5.ymd b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track5.ymd
deleted file mode 100644
index e838e533040..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track5.ymd and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track6.mod b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track6.mod
deleted file mode 100644
index ad4a1d3165c..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track6.mod and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track6.ymd b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track6.ymd
deleted file mode 100644
index e7d07e88843..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track6.ymd and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track7.mod b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track7.mod
deleted file mode 100644
index 5e52008c2a5..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track7.mod and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track7.ymd b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track7.ymd
deleted file mode 100644
index 05455b9338e..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track7.ymd and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track8.mod b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track8.mod
deleted file mode 100644
index f3d54cdb998..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track8.mod and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track8.ymd b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track8.ymd
deleted file mode 100644
index ef0ac747fc5..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track8.ymd and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track9.mod b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track9.mod
deleted file mode 100644
index 4649bd58c67..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track9.mod and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track9.ymd b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track9.ymd
deleted file mode 100644
index 9a1900d7bbc..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track9.ymd and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/testsmallfs/track1.mod b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/testsmallfs/track1.mod
deleted file mode 100644
index 50bb8b176a1..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/testsmallfs/track1.mod and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/testsmallfs/track4.mod b/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/testsmallfs/track4.mod
deleted file mode 100644
index 50bb8b176a1..00000000000
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/testsmallfs/track4.mod and /dev/null differ
diff --git a/hardware/zpuino/zpu/libraries/SIDPlayer/examples/SIDPlayer/smallfs/music.sid b/hardware/zpuino/zpu/libraries/SIDPlayer/examples/SIDPlayer/smallfs/music.sid
index dd905126bbb..5df7740cdff 100644
Binary files a/hardware/zpuino/zpu/libraries/SIDPlayer/examples/SIDPlayer/smallfs/music.sid and b/hardware/zpuino/zpu/libraries/SIDPlayer/examples/SIDPlayer/smallfs/music.sid differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/retrocade_defs.h b/hardware/zpuino/zpu/libraries/YMPlayer/retrocade_defs.h
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/retrocade_defs.h
rename to hardware/zpuino/zpu/libraries/YMPlayer/retrocade_defs.h
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/RetroCade.cpp b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/RetroCade.cpp
similarity index 99%
rename from hardware/zpuino/zpu/libraries/RetroCade/RetroCade.cpp
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/RetroCade.cpp
index 6e3fc1757c9..c0e9d1438c7 100644
--- a/hardware/zpuino/zpu/libraries/RetroCade/RetroCade.cpp
+++ b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/RetroCade.cpp
@@ -260,7 +260,7 @@ void RETROCADE::handleJoystick()
         lcd.setCursor(0,0);
         lcd.print("RetroCade Synth");          
         lcd.setCursor(0,1);
-        lcd.print("Version: 1.02");          
+        lcd.print("Version: 1.1");          
         break;        
       default:
         //return;
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/RetroCade.h b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/RetroCade.h
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/RetroCade.h
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/RetroCade.h
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/RetroCade_Sketch.ino b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/RetroCade_Sketch.ino
similarity index 97%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/RetroCade_Sketch.ino
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/RetroCade_Sketch.ino
index 6b916b78157..2c9c4a019e3 100644
--- a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/RetroCade_Sketch.ino
+++ b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/RetroCade_Sketch.ino
@@ -21,6 +21,10 @@ http://www.gadgetfactory.net
 License: GPL
 
 ChangeLog:
+9/26/2013       Version 1.1
+        -Added SID Analog Filters!!!!!!!!  Thanks to Alvie for writing the VHDL code.
+        -Added SidPlayer library to process SID files from smallFS and SD Cards. Thanks to Alvie for porting to the ZPUino.
+
 1/9/2013        Version 1.02
         -NoteOff fix from Lee O'D
 
@@ -86,7 +90,7 @@ ChangeLog:
 #include "SmallFS.h"
 #include <LiquidCrystal.h>
 #include <SD.h>
-#include "VolumeController.h"
+//#include "VolumeController.h"
 #include "ymplayer.h"
 #include "modplayer.h"
 #include "ramFS.h"
@@ -112,9 +116,9 @@ void setup(){
   Serial.begin(115200);
   Serial1.begin(31250);
 
-  for (input=0; input<8; input++) {
-      VolumeController.set(input, 255, 255);
-  }
+//  for (input=0; input<8; input++) {
+//      VolumeController.set(input, 255, 255);
+//  }
   //Setup pins for RetroCade MegaWing
   retrocade.setupMegaWing(); 
   
@@ -383,4 +387,4 @@ void loop(){
   retrocade.handleJoystick(); 
   retrocade.sidplayer.audiofill();  
 }
-
+
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/binary.h b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/binary.h
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/binary.h
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/binary.h
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/hihat.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/hihat.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/hihat.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/hihat.mod
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/kick.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/kick.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/kick.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/kick.mod
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track1.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track1.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track1.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track1.mod
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track1.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track1.sid
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track1.sid
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track1.sid
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track1.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track1.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track1.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track1.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track2.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track2.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track2.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track2.mod
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track2.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track2.sid
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track2.sid
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track2.sid
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track2.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track2.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track2.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track2.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track3.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track3.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track3.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track3.mod
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track3.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track3.sid
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track3.sid
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track3.sid
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track3.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track3.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track3.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-mid/track3.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/hihat.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/hihat.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/hihat.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/hihat.mod
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/kick.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/kick.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/kick.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/kick.mod
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track1.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track1.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track1.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track1.mod
diff --git a/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track1.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track1.sid
new file mode 100644
index 00000000000..dc1fe7b2bba
Binary files /dev/null and b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track1.sid differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track1.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track1.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track1.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track1.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track2.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track2.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track2.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track2.mod
diff --git a/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track2.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track2.sid
new file mode 100644
index 00000000000..dfab5513638
Binary files /dev/null and b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track2.sid differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track2.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track2.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track2.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track2.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track3.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track3.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track3.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track3.mod
diff --git a/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track3.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track3.sid
new file mode 100644
index 00000000000..ffd2f620cbc
Binary files /dev/null and b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track3.sid differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track3.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track3.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs-production/track3.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track3.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track4.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track4.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track4.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track4.mod
diff --git a/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track4.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track4.sid
new file mode 100644
index 00000000000..c2660374ae2
Binary files /dev/null and b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track4.sid differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track4.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track4.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track4.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track4.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track5.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track5.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track5.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track5.mod
diff --git a/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track5.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track5.sid
new file mode 100644
index 00000000000..50921a2e56d
Binary files /dev/null and b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track5.sid differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track5.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track5.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track5.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track5.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track6.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track6.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track6.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track6.mod
diff --git a/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track6.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track6.sid
new file mode 100644
index 00000000000..05b52bf6a25
Binary files /dev/null and b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track6.sid differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track6.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track6.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track6.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track6.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track7.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track7.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track7.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track7.mod
diff --git a/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track7.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track7.sid
new file mode 100644
index 00000000000..0f3961c5af2
Binary files /dev/null and b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track7.sid differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track7.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track7.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track7.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track7.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track8.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track8.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track8.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track8.mod
diff --git a/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track8.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track8.sid
new file mode 100644
index 00000000000..f227277d42a
Binary files /dev/null and b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track8.sid differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track8.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track8.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track8.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track8.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track9.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track9.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track9.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track9.mod
diff --git a/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track9.sid b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track9.sid
new file mode 100644
index 00000000000..a76894d56c5
Binary files /dev/null and b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track9.sid differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track9.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track9.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/productionsmallfs/track9.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs-production/track9.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/hihat.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/hihat.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/hihat.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/hihat.mod
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/kick.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/kick.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/kick.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/kick.mod
diff --git a/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track1.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track1.mod
new file mode 100644
index 00000000000..d92d328a281
Binary files /dev/null and b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track1.mod differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track1.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track1.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track1.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track1.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/testsmallfs/track2.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track2.mod
similarity index 98%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/testsmallfs/track2.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track2.mod
index 50bb8b176a1..18cf5ccec4f 100644
Binary files a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/testsmallfs/track2.mod and b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track2.mod differ
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track2.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track2.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track2.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track2.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/testsmallfs/track3.mod b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track3.mod
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/testsmallfs/track3.mod
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track3.mod
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track3.ymd b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track3.ymd
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/examples/RetroCade_Sketch/smallfs/track3.ymd
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/smallfs/track3.ymd
diff --git a/hardware/zpuino/zpu/libraries/RetroCade/spaceinvaders.h b/hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/spaceinvaders.h
similarity index 100%
rename from hardware/zpuino/zpu/libraries/RetroCade/spaceinvaders.h
rename to hardware/zpuino/zpu/libraries/ZPUino_Examples/examples/RetroCade_Sketch/spaceinvaders.h
diff --git a/hardware/zpuino/zpu/libraries/modplayer/modplayer.cpp b/hardware/zpuino/zpu/libraries/modplayer/modplayer.cpp
index 0d3aa68fd04..b0a9e0551d0 100644
--- a/hardware/zpuino/zpu/libraries/modplayer/modplayer.cpp
+++ b/hardware/zpuino/zpu/libraries/modplayer/modplayer.cpp
@@ -11,7 +11,7 @@
 #include "modplayer.h"
 #include <SD.h>
 #include "ptplay.h"
-#include "RetroCade.h"
+//#include "RetroCade.h"
 
 #define DEBUG
 
diff --git a/hardware/zpuino/zpu/libraries/modplayer/retrocade_defs.h b/hardware/zpuino/zpu/libraries/modplayer/retrocade_defs.h
new file mode 100644
index 00000000000..fa144092b56
--- /dev/null
+++ b/hardware/zpuino/zpu/libraries/modplayer/retrocade_defs.h
@@ -0,0 +1,9 @@
+#ifndef LIB_RETROCADEDEFS_H_
+#define LIB_RETROCADEDEFS_H_
+
+enum kFileType {
+	SmallFSType               = 0,  
+	SDFSType                  = 1,  
+};
+
+#endif // LIB_RETROCADEDEFS_H_