diff --git a/.gitignore b/.gitignore
index e1aca36c..df462a45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,24 @@
 .*
 !/.gitignore
 *.user
-*.suo
-*.vspscc
 *.o
 *.a
+
+# VS stuff
+ipch
+.vs
+*.opensdf
+*.pdb
+*.sdf
+*.suo
+*.v11.suo
+*.v12.suo
+*.vspscc
 *.VC.db
 *.VC.VC.opendb
+
 Debug
 Release
-ipch
 /ext_libs/Debug
 /ext_libs/Release
 /ext_libs/*.exp
@@ -26,4 +35,6 @@ ipch
 /winamp/Debug
 /winamp/Release
 /winamp/*.dll
-/xmp-vgmstream/*.dll
+/xmplay/Debug
+/xmplay/Release
+/xmplay/*.dll
diff --git a/Makefile b/Makefile
index 1f65e014..42f33692 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ sourceball:
 	rm -rf vgmstream-`./version.sh`
 
 mingwbin: mingw_test mingw_winamp mingw_xmplay
-	zip -FS -j "vgmstream-`./version.sh`-test.zip" COPYING readme.txt test/test.exe winamp/in_vgmstream.dll xmp-vgmstream/xmp-vgmstream.dll ext_libs/*.dll
+	zip -FS -j "vgmstream-`./version.sh`-test.zip" COPYING readme.txt test/test.exe winamp/in_vgmstream.dll xmplay/xmp-vgmstream.dll ext_libs/*.dll
 
 mingw_test:
 	$(MAKE) -C test -f Makefile.mingw test.exe
@@ -23,7 +23,7 @@ mingw_winamp:
 	$(MAKE) -C winamp in_vgmstream.dll
 
 mingw_xmplay:
-	$(MAKE) -C xmp-vgmstream xmp-vgmstream.dll
+	$(MAKE) -C xmplay xmp-vgmstream.dll
 
 clean:
 	rm -f vgmstream-*.zip
@@ -31,5 +31,5 @@ clean:
 	$(MAKE) -C test clean
 	$(MAKE) -C test -f Makefile.mingw clean
 	$(MAKE) -C winamp clean
-	$(MAKE) -C xmp-vgmstream clean
+	$(MAKE) -C xmplay clean
 	$(MAKE) -C ext_libs -f Makefile.mingw clean
diff --git a/vgmstream_full.sln b/vgmstream_full.sln
index 844441fb..61eb94d1 100644
--- a/vgmstream_full.sln
+++ b/vgmstream_full.sln
@@ -29,7 +29,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foobar2000_component_client
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pfc", "..\foobar\pfc\pfc.vcxproj", "{EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmp-vgmstream", "xmp-vgmstream\xmp-vgmstream.vcxproj", "{49AF76F7-CBA0-4486-9DDF-51F30DF45F33}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmp-vgmstream", "xmplay\xmp-vgmstream.vcxproj", "{49AF76F7-CBA0-4486-9DDF-51F30DF45F33}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/xmp-vgmstream/.gitignore b/xmp-vgmstream/.gitignore
deleted file mode 100644
index 83365a0e..00000000
--- a/xmp-vgmstream/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# intellisense crap
-ipch
-
-# more intellisense crap
-xmp-vgmstream.sdf
-xmp-vgmstream.opensdf
-xmp-vgmstream.suo
-xmp-vgmstream.v11.suo
-xmp-vgmstream.v12.suo
-
-# output directories
-Debug
-Release
-
-# and some debugging symbol crap
-*.pdb
-
-# new for Visual Studio 2015
-.vs
-*.VC.db
-
-# auto generated
-version.h
\ No newline at end of file
diff --git a/xmp-vgmstream/Makefile b/xmplay/Makefile
similarity index 100%
rename from xmp-vgmstream/Makefile
rename to xmplay/Makefile
diff --git a/xmp-vgmstream/xmp-vgmstream.vcxproj b/xmplay/xmp-vgmstream.vcxproj
similarity index 100%
rename from xmp-vgmstream/xmp-vgmstream.vcxproj
rename to xmplay/xmp-vgmstream.vcxproj
diff --git a/xmp-vgmstream/xmp-vgmstream.vcxproj.filters b/xmplay/xmp-vgmstream.vcxproj.filters
similarity index 100%
rename from xmp-vgmstream/xmp-vgmstream.vcxproj.filters
rename to xmplay/xmp-vgmstream.vcxproj.filters
diff --git a/xmp-vgmstream/xmp_vgmstream.c b/xmplay/xmp_vgmstream.c
similarity index 100%
rename from xmp-vgmstream/xmp_vgmstream.c
rename to xmplay/xmp_vgmstream.c
diff --git a/xmp-vgmstream/xmpfunc.h b/xmplay/xmpfunc.h
similarity index 100%
rename from xmp-vgmstream/xmpfunc.h
rename to xmplay/xmpfunc.h
diff --git a/xmp-vgmstream/xmpin.def b/xmplay/xmpin.def
similarity index 100%
rename from xmp-vgmstream/xmpin.def
rename to xmplay/xmpin.def
diff --git a/xmp-vgmstream/xmpin.h b/xmplay/xmpin.h
similarity index 100%
rename from xmp-vgmstream/xmpin.h
rename to xmplay/xmpin.h