diff --git a/desmume/src/xbox360/Desmume.suo b/desmume/src/xbox/Desmume.suo
similarity index 100%
rename from desmume/src/xbox360/Desmume.suo
rename to desmume/src/xbox/Desmume.suo
diff --git a/desmume/src/xbox360/Desmume360.sln b/desmume/src/xbox/Desmume360.sln
similarity index 100%
rename from desmume/src/xbox360/Desmume360.sln
rename to desmume/src/xbox/Desmume360.sln
diff --git a/desmume/src/xbox360/Desmume360.suo b/desmume/src/xbox/Desmume360.suo
similarity index 100%
rename from desmume/src/xbox360/Desmume360.suo
rename to desmume/src/xbox/Desmume360.suo
diff --git a/desmume/src/xbox360/Desmume360.vcproj b/desmume/src/xbox/Desmume360.vcproj
similarity index 100%
rename from desmume/src/xbox360/Desmume360.vcproj
rename to desmume/src/xbox/Desmume360.vcproj
diff --git a/desmume/src/xbox360/Dsemume360.cpp b/desmume/src/xbox/Dsemume360.cpp
similarity index 100%
rename from desmume/src/xbox360/Dsemume360.cpp
rename to desmume/src/xbox/Dsemume360.cpp
diff --git a/desmume/src/xbox360/ZLIB/ADLER32.C b/desmume/src/xbox/ZLIB/ADLER32.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/ADLER32.C
rename to desmume/src/xbox/ZLIB/ADLER32.C
diff --git a/desmume/src/xbox360/ZLIB/COMPRESS.C b/desmume/src/xbox/ZLIB/COMPRESS.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/COMPRESS.C
rename to desmume/src/xbox/ZLIB/COMPRESS.C
diff --git a/desmume/src/xbox360/ZLIB/CRC32.C b/desmume/src/xbox/ZLIB/CRC32.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/CRC32.C
rename to desmume/src/xbox/ZLIB/CRC32.C
diff --git a/desmume/src/xbox360/ZLIB/DEFLATE.C b/desmume/src/xbox/ZLIB/DEFLATE.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/DEFLATE.C
rename to desmume/src/xbox/ZLIB/DEFLATE.C
diff --git a/desmume/src/xbox360/ZLIB/DEFLATE.H b/desmume/src/xbox/ZLIB/DEFLATE.H
similarity index 100%
rename from desmume/src/xbox360/ZLIB/DEFLATE.H
rename to desmume/src/xbox/ZLIB/DEFLATE.H
diff --git a/desmume/src/xbox360/ZLIB/GZIO.C b/desmume/src/xbox/ZLIB/GZIO.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/GZIO.C
rename to desmume/src/xbox/ZLIB/GZIO.C
diff --git a/desmume/src/xbox360/ZLIB/INFBLOCK.C b/desmume/src/xbox/ZLIB/INFBLOCK.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFBLOCK.C
rename to desmume/src/xbox/ZLIB/INFBLOCK.C
diff --git a/desmume/src/xbox360/ZLIB/INFBLOCK.H b/desmume/src/xbox/ZLIB/INFBLOCK.H
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFBLOCK.H
rename to desmume/src/xbox/ZLIB/INFBLOCK.H
diff --git a/desmume/src/xbox360/ZLIB/INFCODES.C b/desmume/src/xbox/ZLIB/INFCODES.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFCODES.C
rename to desmume/src/xbox/ZLIB/INFCODES.C
diff --git a/desmume/src/xbox360/ZLIB/INFCODES.H b/desmume/src/xbox/ZLIB/INFCODES.H
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFCODES.H
rename to desmume/src/xbox/ZLIB/INFCODES.H
diff --git a/desmume/src/xbox360/ZLIB/INFFAST.C b/desmume/src/xbox/ZLIB/INFFAST.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFFAST.C
rename to desmume/src/xbox/ZLIB/INFFAST.C
diff --git a/desmume/src/xbox360/ZLIB/INFFAST.H b/desmume/src/xbox/ZLIB/INFFAST.H
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFFAST.H
rename to desmume/src/xbox/ZLIB/INFFAST.H
diff --git a/desmume/src/xbox360/ZLIB/INFFIXED.H b/desmume/src/xbox/ZLIB/INFFIXED.H
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFFIXED.H
rename to desmume/src/xbox/ZLIB/INFFIXED.H
diff --git a/desmume/src/xbox360/ZLIB/INFLATE.C b/desmume/src/xbox/ZLIB/INFLATE.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFLATE.C
rename to desmume/src/xbox/ZLIB/INFLATE.C
diff --git a/desmume/src/xbox360/ZLIB/INFTREES.C b/desmume/src/xbox/ZLIB/INFTREES.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFTREES.C
rename to desmume/src/xbox/ZLIB/INFTREES.C
diff --git a/desmume/src/xbox360/ZLIB/INFTREES.H b/desmume/src/xbox/ZLIB/INFTREES.H
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFTREES.H
rename to desmume/src/xbox/ZLIB/INFTREES.H
diff --git a/desmume/src/xbox360/ZLIB/INFUTIL.C b/desmume/src/xbox/ZLIB/INFUTIL.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFUTIL.C
rename to desmume/src/xbox/ZLIB/INFUTIL.C
diff --git a/desmume/src/xbox360/ZLIB/INFUTIL.H b/desmume/src/xbox/ZLIB/INFUTIL.H
similarity index 100%
rename from desmume/src/xbox360/ZLIB/INFUTIL.H
rename to desmume/src/xbox/ZLIB/INFUTIL.H
diff --git a/desmume/src/xbox360/ZLIB/TREES.C b/desmume/src/xbox/ZLIB/TREES.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/TREES.C
rename to desmume/src/xbox/ZLIB/TREES.C
diff --git a/desmume/src/xbox360/ZLIB/TREES.H b/desmume/src/xbox/ZLIB/TREES.H
similarity index 100%
rename from desmume/src/xbox360/ZLIB/TREES.H
rename to desmume/src/xbox/ZLIB/TREES.H
diff --git a/desmume/src/xbox360/ZLIB/UNCOMPR.C b/desmume/src/xbox/ZLIB/UNCOMPR.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/UNCOMPR.C
rename to desmume/src/xbox/ZLIB/UNCOMPR.C
diff --git a/desmume/src/xbox360/ZLIB/ZCONF.H b/desmume/src/xbox/ZLIB/ZCONF.H
similarity index 100%
rename from desmume/src/xbox360/ZLIB/ZCONF.H
rename to desmume/src/xbox/ZLIB/ZCONF.H
diff --git a/desmume/src/xbox360/ZLIB/ZLIB.H b/desmume/src/xbox/ZLIB/ZLIB.H
similarity index 100%
rename from desmume/src/xbox360/ZLIB/ZLIB.H
rename to desmume/src/xbox/ZLIB/ZLIB.H
diff --git a/desmume/src/xbox360/ZLIB/ZUTIL.C b/desmume/src/xbox/ZLIB/ZUTIL.C
similarity index 100%
rename from desmume/src/xbox360/ZLIB/ZUTIL.C
rename to desmume/src/xbox/ZLIB/ZUTIL.C
diff --git a/desmume/src/xbox360/ZLIB/ZUTIL.H b/desmume/src/xbox/ZLIB/ZUTIL.H
similarity index 100%
rename from desmume/src/xbox360/ZLIB/ZUTIL.H
rename to desmume/src/xbox/ZLIB/ZUTIL.H