diff --git a/.gitignore b/.gitignore
index a565f0138a..a21b48fdd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 archives/
+bin/
diff --git a/data/.vegastrike/aera.m3u b/data/.vegastrike/aera.m3u
index 1278e476d2..123c541b48 100644
--- a/data/.vegastrike/aera.m3u
+++ b/data/.vegastrike/aera.m3u
@@ -1,2 +1,2 @@
 #EXTM3U
-../music/aerapeace.ogg
\ No newline at end of file
+../music/aerapeace.ogg
diff --git a/music/music/AUTHORS b/data/music/AUTHORS
similarity index 100%
rename from music/music/AUTHORS
rename to data/music/AUTHORS
diff --git a/music/music/AyMambo.ogg b/data/music/AyMambo.ogg
similarity index 100%
rename from music/music/AyMambo.ogg
rename to data/music/AyMambo.ogg
diff --git a/music/music/BlackLlama.ogg b/data/music/BlackLlama.ogg
similarity index 100%
rename from music/music/BlackLlama.ogg
rename to data/music/BlackLlama.ogg
diff --git a/music/music/Bliss.ogg b/data/music/Bliss.ogg
similarity index 100%
rename from music/music/Bliss.ogg
rename to data/music/Bliss.ogg
diff --git a/music/music/COPYING b/data/music/COPYING
similarity index 100%
rename from music/music/COPYING
rename to data/music/COPYING
diff --git a/music/music/DepressionChamber.ogg b/data/music/DepressionChamber.ogg
similarity index 100%
rename from music/music/DepressionChamber.ogg
rename to data/music/DepressionChamber.ogg
diff --git a/music/music/DockingProcedures.ogg b/data/music/DockingProcedures.ogg
similarity index 100%
rename from music/music/DockingProcedures.ogg
rename to data/music/DockingProcedures.ogg
diff --git a/music/music/InnerChild.ogg b/data/music/InnerChild.ogg
similarity index 100%
rename from music/music/InnerChild.ogg
rename to data/music/InnerChild.ogg
diff --git a/music/music/LICENSE.STANDALONE b/data/music/LICENSE.STANDALONE
similarity index 100%
rename from music/music/LICENSE.STANDALONE
rename to data/music/LICENSE.STANDALONE
diff --git a/music/music/Machina.ogg b/data/music/Machina.ogg
similarity index 100%
rename from music/music/Machina.ogg
rename to data/music/Machina.ogg
diff --git a/music/music/MezzaMessa.ogg b/data/music/MezzaMessa.ogg
similarity index 100%
rename from music/music/MezzaMessa.ogg
rename to data/music/MezzaMessa.ogg
diff --git a/music/music/SonOfSandFleaRemix.ogg b/data/music/SonOfSandFleaRemix.ogg
similarity index 100%
rename from music/music/SonOfSandFleaRemix.ogg
rename to data/music/SonOfSandFleaRemix.ogg
diff --git a/music/music/Trapped.ogg b/data/music/Trapped.ogg
similarity index 100%
rename from music/music/Trapped.ogg
rename to data/music/Trapped.ogg
diff --git a/music/music/aerapeace.ogg b/data/music/aerapeace.ogg
similarity index 100%
rename from music/music/aerapeace.ogg
rename to data/music/aerapeace.ogg
diff --git a/music/music/aerathemebattle.ogg b/data/music/aerathemebattle.ogg
similarity index 100%
rename from music/music/aerathemebattle.ogg
rename to data/music/aerathemebattle.ogg
diff --git a/music/music/agriculture.ogg b/data/music/agriculture.ogg
similarity index 100%
rename from music/music/agriculture.ogg
rename to data/music/agriculture.ogg
diff --git a/music/music/agriculture_p.ogg b/data/music/agriculture_p.ogg
similarity index 100%
rename from music/music/agriculture_p.ogg
rename to data/music/agriculture_p.ogg
diff --git a/music/music/alienrockalectro.ogg b/data/music/alienrockalectro.ogg
similarity index 100%
rename from music/music/alienrockalectro.ogg
rename to data/music/alienrockalectro.ogg
diff --git a/music/music/alienrockalectro2.ogg b/data/music/alienrockalectro2.ogg
similarity index 100%
rename from music/music/alienrockalectro2.ogg
rename to data/music/alienrockalectro2.ogg
diff --git a/music/music/asteroids.ogg b/data/music/asteroids.ogg
similarity index 100%
rename from music/music/asteroids.ogg
rename to data/music/asteroids.ogg
diff --git a/music/music/battle1.ogg b/data/music/battle1.ogg
similarity index 100%
rename from music/music/battle1.ogg
rename to data/music/battle1.ogg
diff --git a/music/music/battle2.ogg b/data/music/battle2.ogg
similarity index 100%
rename from music/music/battle2.ogg
rename to data/music/battle2.ogg
diff --git a/music/music/battle3electro.ogg b/data/music/battle3electro.ogg
similarity index 100%
rename from music/music/battle3electro.ogg
rename to data/music/battle3electro.ogg
diff --git a/music/music/battle4showdown.ogg b/data/music/battle4showdown.ogg
similarity index 100%
rename from music/music/battle4showdown.ogg
rename to data/music/battle4showdown.ogg
diff --git a/music/music/battle5.ogg b/data/music/battle5.ogg
similarity index 100%
rename from music/music/battle5.ogg
rename to data/music/battle5.ogg
diff --git a/music/music/battle5_p.ogg b/data/music/battle5_p.ogg
similarity index 100%
rename from music/music/battle5_p.ogg
rename to data/music/battle5_p.ogg
diff --git a/music/music/cosmostation.ogg b/data/music/cosmostation.ogg
similarity index 100%
rename from music/music/cosmostation.ogg
rename to data/music/cosmostation.ogg
diff --git a/music/music/cosmostation_crowded.ogg b/data/music/cosmostation_crowded.ogg
similarity index 100%
rename from music/music/cosmostation_crowded.ogg
rename to data/music/cosmostation_crowded.ogg
diff --git a/music/music/funeral.ogg b/data/music/funeral.ogg
similarity index 100%
rename from music/music/funeral.ogg
rename to data/music/funeral.ogg
diff --git a/music/music/galacticbattle.ogg b/data/music/galacticbattle.ogg
similarity index 100%
rename from music/music/galacticbattle.ogg
rename to data/music/galacticbattle.ogg
diff --git a/music/music/industrialmixed.ogg b/data/music/industrialmixed.ogg
similarity index 100%
rename from music/music/industrialmixed.ogg
rename to data/music/industrialmixed.ogg
diff --git a/music/music/isobattle.ogg b/data/music/isobattle.ogg
similarity index 100%
rename from music/music/isobattle.ogg
rename to data/music/isobattle.ogg
diff --git a/music/music/isopeace.ogg b/data/music/isopeace.ogg
similarity index 100%
rename from music/music/isopeace.ogg
rename to data/music/isopeace.ogg
diff --git a/music/music/launch2.ogg b/data/music/launch2.ogg
similarity index 100%
rename from music/music/launch2.ogg
rename to data/music/launch2.ogg
diff --git a/music/music/launch3chatstart.ogg b/data/music/launch3chatstart.ogg
similarity index 100%
rename from music/music/launch3chatstart.ogg
rename to data/music/launch3chatstart.ogg
diff --git a/music/music/launchjoke.ogg b/data/music/launchjoke.ogg
similarity index 100%
rename from music/music/launchjoke.ogg
rename to data/music/launchjoke.ogg
diff --git a/music/music/liftoff.ogg b/data/music/liftoff.ogg
similarity index 100%
rename from music/music/liftoff.ogg
rename to data/music/liftoff.ogg
diff --git a/music/music/lightslease_p.ogg b/data/music/lightslease_p.ogg
similarity index 100%
rename from music/music/lightslease_p.ogg
rename to data/music/lightslease_p.ogg
diff --git a/music/music/loss1.ogg b/data/music/loss1.ogg
similarity index 100%
rename from music/music/loss1.ogg
rename to data/music/loss1.ogg
diff --git a/music/music/militarybase_p.ogg b/data/music/militarybase_p.ogg
similarity index 100%
rename from music/music/militarybase_p.ogg
rename to data/music/militarybase_p.ogg
diff --git a/music/music/mission.ogg b/data/music/mission.ogg
similarity index 100%
rename from music/music/mission.ogg
rename to data/music/mission.ogg
diff --git a/music/music/news1.ogg b/data/music/news1.ogg
similarity index 100%
rename from music/music/news1.ogg
rename to data/music/news1.ogg
diff --git a/music/music/ocean.ogg b/data/music/ocean.ogg
similarity index 100%
rename from music/music/ocean.ogg
rename to data/music/ocean.ogg
diff --git a/music/music/peace1.ogg b/data/music/peace1.ogg
similarity index 100%
rename from music/music/peace1.ogg
rename to data/music/peace1.ogg
diff --git a/music/music/peace2.ogg b/data/music/peace2.ogg
similarity index 100%
rename from music/music/peace2.ogg
rename to data/music/peace2.ogg
diff --git a/music/music/peace3.ogg b/data/music/peace3.ogg
similarity index 100%
rename from music/music/peace3.ogg
rename to data/music/peace3.ogg
diff --git a/music/music/peace4.ogg b/data/music/peace4.ogg
similarity index 100%
rename from music/music/peace4.ogg
rename to data/music/peace4.ogg
diff --git a/music/music/peace5.ogg b/data/music/peace5.ogg
similarity index 100%
rename from music/music/peace5.ogg
rename to data/music/peace5.ogg
diff --git a/music/music/peace5_p.ogg b/data/music/peace5_p.ogg
similarity index 100%
rename from music/music/peace5_p.ogg
rename to data/music/peace5_p.ogg
diff --git a/music/music/peace6.ogg b/data/music/peace6.ogg
similarity index 100%
rename from music/music/peace6.ogg
rename to data/music/peace6.ogg
diff --git a/music/music/peace6_p.ogg b/data/music/peace6_p.ogg
similarity index 100%
rename from music/music/peace6_p.ogg
rename to data/music/peace6_p.ogg
diff --git a/music/music/peace7.ogg b/data/music/peace7.ogg
similarity index 100%
rename from music/music/peace7.ogg
rename to data/music/peace7.ogg
diff --git a/music/music/snow.ogg b/data/music/snow.ogg
similarity index 100%
rename from music/music/snow.ogg
rename to data/music/snow.ogg
diff --git a/music/music/steel_p.ogg b/data/music/steel_p.ogg
similarity index 100%
rename from music/music/steel_p.ogg
rename to data/music/steel_p.ogg
diff --git a/music/music/terranbattle.ogg b/data/music/terranbattle.ogg
similarity index 100%
rename from music/music/terranbattle.ogg
rename to data/music/terranbattle.ogg
diff --git a/music/music/terranpeace.ogg b/data/music/terranpeace.ogg
similarity index 100%
rename from music/music/terranpeace.ogg
rename to data/music/terranpeace.ogg
diff --git a/music/music/terranpeace2.ogg b/data/music/terranpeace2.ogg
similarity index 100%
rename from music/music/terranpeace2.ogg
rename to data/music/terranpeace2.ogg
diff --git a/music/music/university_p.ogg b/data/music/university_p.ogg
similarity index 100%
rename from music/music/university_p.ogg
rename to data/music/university_p.ogg
diff --git a/music/music/vegastrike-music.spec b/data/music/vegastrike-music.spec
similarity index 100%
rename from music/music/vegastrike-music.spec
rename to data/music/vegastrike-music.spec
diff --git a/music/music/victory.ogg b/data/music/victory.ogg
similarity index 100%
rename from music/music/victory.ogg
rename to data/music/victory.ogg
diff --git a/music/music/victory2.ogg b/data/music/victory2.ogg
similarity index 100%
rename from music/music/victory2.ogg
rename to data/music/victory2.ogg
diff --git a/music/music/victory_p.ogg b/data/music/victory_p.ogg
similarity index 100%
rename from music/music/victory_p.ogg
rename to data/music/victory_p.ogg
diff --git a/engine/src/cmd/music.cpp b/engine/src/cmd/music.cpp
index 1db8a3ac42..317ea371e3 100644
--- a/engine/src/cmd/music.cpp
+++ b/engine/src/cmd/music.cpp
@@ -448,7 +448,9 @@ readerThread(
             if (foundcache) {
                 *me->music_load_info = wherecache->second;
                 me->freeWav = false;
-            }
+            } else if ( !AUDLoadSoundFile( songname, 
+						me->music_load_info, true))
+			{ VSFileSystem::vs_dprintf(1, "Failed to load music file \"%s\"", songname);}
         }
         if (me->freeWav && docacheme) {
             me->freeWav = false;
diff --git a/engine/src/common/common.cpp b/engine/src/common/common.cpp
index a43fddc434..a508fa2261 100644
--- a/engine/src/common/common.cpp
+++ b/engine/src/common/common.cpp
@@ -31,6 +31,7 @@ const char *datadirs[] = {
     ".",
     "../data",
     "../../data",
+    "../../../data",
 //Added for MacOS X
     "../Resources/data",
 #ifdef DATA_DIR