diff --git a/.gitignore b/.gitignore
index a045990c60..6326a3284b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,7 @@ Devel
/ipch
/nsis/output/
-/3rdparty/SoundTouch/Win32
+/3rdparty/soundtouch/Win32
/3rdparty/bzip2/Win32
/3rdparty/libjpeg/Win32
/3rdparty/portaudio/portaudio-2.0.pc
diff --git a/3rdparty/SoundTouch/3dnow_win.cpp b/3rdparty/soundtouch/3dnow_win.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/3dnow_win.cpp
rename to 3rdparty/soundtouch/3dnow_win.cpp
diff --git a/3rdparty/SoundTouch/AAFilter.cpp b/3rdparty/soundtouch/AAFilter.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/AAFilter.cpp
rename to 3rdparty/soundtouch/AAFilter.cpp
diff --git a/3rdparty/SoundTouch/AAFilter.h b/3rdparty/soundtouch/AAFilter.h
similarity index 100%
rename from 3rdparty/SoundTouch/AAFilter.h
rename to 3rdparty/soundtouch/AAFilter.h
diff --git a/3rdparty/SoundTouch/BPMDetect.cpp b/3rdparty/soundtouch/BPMDetect.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/BPMDetect.cpp
rename to 3rdparty/soundtouch/BPMDetect.cpp
diff --git a/3rdparty/SoundTouch/BPMDetect.h b/3rdparty/soundtouch/BPMDetect.h
similarity index 100%
rename from 3rdparty/SoundTouch/BPMDetect.h
rename to 3rdparty/soundtouch/BPMDetect.h
diff --git a/3rdparty/SoundTouch/CMakeLists.txt b/3rdparty/soundtouch/CMakeLists.txt
similarity index 100%
rename from 3rdparty/SoundTouch/CMakeLists.txt
rename to 3rdparty/soundtouch/CMakeLists.txt
diff --git a/3rdparty/SoundTouch/FIFOSampleBuffer.cpp b/3rdparty/soundtouch/FIFOSampleBuffer.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/FIFOSampleBuffer.cpp
rename to 3rdparty/soundtouch/FIFOSampleBuffer.cpp
diff --git a/3rdparty/SoundTouch/FIFOSampleBuffer.h b/3rdparty/soundtouch/FIFOSampleBuffer.h
similarity index 100%
rename from 3rdparty/SoundTouch/FIFOSampleBuffer.h
rename to 3rdparty/soundtouch/FIFOSampleBuffer.h
diff --git a/3rdparty/SoundTouch/FIFOSamplePipe.h b/3rdparty/soundtouch/FIFOSamplePipe.h
similarity index 100%
rename from 3rdparty/SoundTouch/FIFOSamplePipe.h
rename to 3rdparty/soundtouch/FIFOSamplePipe.h
diff --git a/3rdparty/SoundTouch/FIRFilter.cpp b/3rdparty/soundtouch/FIRFilter.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/FIRFilter.cpp
rename to 3rdparty/soundtouch/FIRFilter.cpp
diff --git a/3rdparty/SoundTouch/FIRFilter.h b/3rdparty/soundtouch/FIRFilter.h
similarity index 100%
rename from 3rdparty/SoundTouch/FIRFilter.h
rename to 3rdparty/soundtouch/FIRFilter.h
diff --git a/3rdparty/SoundTouch/Makefile.am b/3rdparty/soundtouch/Makefile.am
similarity index 100%
rename from 3rdparty/SoundTouch/Makefile.am
rename to 3rdparty/soundtouch/Makefile.am
diff --git a/3rdparty/SoundTouch/PeakFinder.cpp b/3rdparty/soundtouch/PeakFinder.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/PeakFinder.cpp
rename to 3rdparty/soundtouch/PeakFinder.cpp
diff --git a/3rdparty/SoundTouch/PeakFinder.h b/3rdparty/soundtouch/PeakFinder.h
similarity index 100%
rename from 3rdparty/SoundTouch/PeakFinder.h
rename to 3rdparty/soundtouch/PeakFinder.h
diff --git a/3rdparty/SoundTouch/README.html b/3rdparty/soundtouch/README.html
similarity index 100%
rename from 3rdparty/SoundTouch/README.html
rename to 3rdparty/soundtouch/README.html
diff --git a/3rdparty/SoundTouch/RateTransposer.cpp b/3rdparty/soundtouch/RateTransposer.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/RateTransposer.cpp
rename to 3rdparty/soundtouch/RateTransposer.cpp
diff --git a/3rdparty/SoundTouch/RateTransposer.h b/3rdparty/soundtouch/RateTransposer.h
similarity index 100%
rename from 3rdparty/SoundTouch/RateTransposer.h
rename to 3rdparty/soundtouch/RateTransposer.h
diff --git a/3rdparty/SoundTouch/STTypes.h b/3rdparty/soundtouch/STTypes.h
similarity index 100%
rename from 3rdparty/SoundTouch/STTypes.h
rename to 3rdparty/soundtouch/STTypes.h
diff --git a/3rdparty/SoundTouch/SoundTouch.cpp b/3rdparty/soundtouch/SoundTouch.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/SoundTouch.cpp
rename to 3rdparty/soundtouch/SoundTouch.cpp
diff --git a/3rdparty/SoundTouch/SoundTouch.h b/3rdparty/soundtouch/SoundTouch.h
similarity index 100%
rename from 3rdparty/SoundTouch/SoundTouch.h
rename to 3rdparty/soundtouch/SoundTouch.h
diff --git a/3rdparty/SoundTouch/SoundTouch.vcxproj b/3rdparty/soundtouch/SoundTouch.vcxproj
similarity index 100%
rename from 3rdparty/SoundTouch/SoundTouch.vcxproj
rename to 3rdparty/soundtouch/SoundTouch.vcxproj
diff --git a/3rdparty/SoundTouch/SoundTouch.vcxproj.filters b/3rdparty/soundtouch/SoundTouch.vcxproj.filters
similarity index 100%
rename from 3rdparty/SoundTouch/SoundTouch.vcxproj.filters
rename to 3rdparty/soundtouch/SoundTouch.vcxproj.filters
diff --git a/3rdparty/SoundTouch/SoundTouch_vs2012.vcxproj b/3rdparty/soundtouch/SoundTouch_vs2012.vcxproj
similarity index 100%
rename from 3rdparty/SoundTouch/SoundTouch_vs2012.vcxproj
rename to 3rdparty/soundtouch/SoundTouch_vs2012.vcxproj
diff --git a/3rdparty/SoundTouch/SoundTouch_vs2012.vcxproj.filters b/3rdparty/soundtouch/SoundTouch_vs2012.vcxproj.filters
similarity index 100%
rename from 3rdparty/SoundTouch/SoundTouch_vs2012.vcxproj.filters
rename to 3rdparty/soundtouch/SoundTouch_vs2012.vcxproj.filters
diff --git a/3rdparty/SoundTouch/SoundTouch_vs2013.vcxproj b/3rdparty/soundtouch/SoundTouch_vs2013.vcxproj
similarity index 100%
rename from 3rdparty/SoundTouch/SoundTouch_vs2013.vcxproj
rename to 3rdparty/soundtouch/SoundTouch_vs2013.vcxproj
diff --git a/3rdparty/SoundTouch/SoundTouch_vs2013.vcxproj.filters b/3rdparty/soundtouch/SoundTouch_vs2013.vcxproj.filters
similarity index 100%
rename from 3rdparty/SoundTouch/SoundTouch_vs2013.vcxproj.filters
rename to 3rdparty/soundtouch/SoundTouch_vs2013.vcxproj.filters
diff --git a/3rdparty/SoundTouch/TDStretch.cpp b/3rdparty/soundtouch/TDStretch.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/TDStretch.cpp
rename to 3rdparty/soundtouch/TDStretch.cpp
diff --git a/3rdparty/SoundTouch/TDStretch.h b/3rdparty/soundtouch/TDStretch.h
similarity index 100%
rename from 3rdparty/SoundTouch/TDStretch.h
rename to 3rdparty/soundtouch/TDStretch.h
diff --git a/3rdparty/SoundTouch/WavFile.cpp b/3rdparty/soundtouch/WavFile.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/WavFile.cpp
rename to 3rdparty/soundtouch/WavFile.cpp
diff --git a/3rdparty/SoundTouch/WavFile.h b/3rdparty/soundtouch/WavFile.h
similarity index 100%
rename from 3rdparty/SoundTouch/WavFile.h
rename to 3rdparty/soundtouch/WavFile.h
diff --git a/3rdparty/SoundTouch/build.sh b/3rdparty/soundtouch/build.sh
similarity index 100%
rename from 3rdparty/SoundTouch/build.sh
rename to 3rdparty/soundtouch/build.sh
diff --git a/3rdparty/SoundTouch/configure.ac b/3rdparty/soundtouch/configure.ac
similarity index 100%
rename from 3rdparty/SoundTouch/configure.ac
rename to 3rdparty/soundtouch/configure.ac
diff --git a/3rdparty/SoundTouch/cpu_detect.h b/3rdparty/soundtouch/cpu_detect.h
similarity index 100%
rename from 3rdparty/SoundTouch/cpu_detect.h
rename to 3rdparty/soundtouch/cpu_detect.h
diff --git a/3rdparty/SoundTouch/cpu_detect_x86.cpp b/3rdparty/soundtouch/cpu_detect_x86.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/cpu_detect_x86.cpp
rename to 3rdparty/soundtouch/cpu_detect_x86.cpp
diff --git a/3rdparty/SoundTouch/cpu_detect_x86_gcc.cpp b/3rdparty/soundtouch/cpu_detect_x86_gcc.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/cpu_detect_x86_gcc.cpp
rename to 3rdparty/soundtouch/cpu_detect_x86_gcc.cpp
diff --git a/3rdparty/SoundTouch/cpu_detect_x86_win.cpp b/3rdparty/soundtouch/cpu_detect_x86_win.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/cpu_detect_x86_win.cpp
rename to 3rdparty/soundtouch/cpu_detect_x86_win.cpp
diff --git a/3rdparty/SoundTouch/depcomp b/3rdparty/soundtouch/depcomp
similarity index 100%
rename from 3rdparty/SoundTouch/depcomp
rename to 3rdparty/soundtouch/depcomp
diff --git a/3rdparty/SoundTouch/install-sh b/3rdparty/soundtouch/install-sh
similarity index 100%
rename from 3rdparty/SoundTouch/install-sh
rename to 3rdparty/soundtouch/install-sh
diff --git a/3rdparty/SoundTouch/missing b/3rdparty/soundtouch/missing
similarity index 100%
rename from 3rdparty/SoundTouch/missing
rename to 3rdparty/soundtouch/missing
diff --git a/3rdparty/SoundTouch/mmx_optimized.cpp b/3rdparty/soundtouch/mmx_optimized.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/mmx_optimized.cpp
rename to 3rdparty/soundtouch/mmx_optimized.cpp
diff --git a/3rdparty/SoundTouch/soundtouch_config.h b/3rdparty/soundtouch/soundtouch_config.h
similarity index 100%
rename from 3rdparty/SoundTouch/soundtouch_config.h
rename to 3rdparty/soundtouch/soundtouch_config.h
diff --git a/3rdparty/SoundTouch/sse_optimized.cpp b/3rdparty/soundtouch/sse_optimized.cpp
similarity index 100%
rename from 3rdparty/SoundTouch/sse_optimized.cpp
rename to 3rdparty/soundtouch/sse_optimized.cpp
diff --git a/3rdparty/soundtouch_linux_include/soundtouch b/3rdparty/soundtouch_linux_include/soundtouch
deleted file mode 120000
index 018b6b2aeb..0000000000
--- a/3rdparty/soundtouch_linux_include/soundtouch
+++ /dev/null
@@ -1 +0,0 @@
-../SoundTouch
\ No newline at end of file
diff --git a/pcsx2_suite_2010.sln b/pcsx2_suite_2010.sln
index ec7cc5d3d7..427c02ab68 100644
--- a/pcsx2_suite_2010.sln
+++ b/pcsx2_suite_2010.sln
@@ -46,7 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\sr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\SoundTouch\SoundTouch.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\soundtouch\SoundTouch.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}"
EndProject
diff --git a/pcsx2_suite_2012.sln b/pcsx2_suite_2012.sln
index b22e96a951..e8eb3c7dbd 100644
--- a/pcsx2_suite_2012.sln
+++ b/pcsx2_suite_2012.sln
@@ -46,7 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\sr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx_vs2012.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\SoundTouch\SoundTouch_vs2012.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\soundtouch\SoundTouch_vs2012.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib_vs2012.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}"
EndProject
diff --git a/pcsx2_suite_2013.sln b/pcsx2_suite_2013.sln
index bf2812031e..506a338ed6 100644
--- a/pcsx2_suite_2013.sln
+++ b/pcsx2_suite_2013.sln
@@ -46,7 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\sr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx_vs2013.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\SoundTouch\SoundTouch_vs2013.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\soundtouch\SoundTouch_vs2013.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib_vs2013.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}"
EndProject
diff --git a/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp b/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp
index 7e78ebaae3..f5763a9e3c 100644
--- a/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp
+++ b/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp
@@ -18,7 +18,7 @@
#include "Global.h"
#include "Dialogs.h"
-#include "SoundTouch/SoundTouch.h"
+#include "soundtouch/SoundTouch.h"
static int SequenceLenMS = 30;
static int SeekWindowMS = 20;
diff --git a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj
index 66ad2ad0f0..293cb8f551 100644
--- a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj
+++ b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj
@@ -455,7 +455,7 @@
{0a18a071-125e-442f-aff7-a3f68abecf99}
false
-
+
{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}
false
@@ -499,4 +499,4 @@
-
\ No newline at end of file
+
diff --git a/plugins/spu2-x/src/Windows/Spu2-X_vs2012.vcxproj b/plugins/spu2-x/src/Windows/Spu2-X_vs2012.vcxproj
index da8ca2b617..571afecc49 100644
--- a/plugins/spu2-x/src/Windows/Spu2-X_vs2012.vcxproj
+++ b/plugins/spu2-x/src/Windows/Spu2-X_vs2012.vcxproj
@@ -453,7 +453,7 @@
{0a18a071-125e-442f-aff7-a3f68abecf99}
false
-
+
{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}
false
@@ -497,4 +497,4 @@
-
\ No newline at end of file
+
diff --git a/plugins/spu2-x/src/Windows/Spu2-X_vs2013.vcxproj b/plugins/spu2-x/src/Windows/Spu2-X_vs2013.vcxproj
index 233f85772a..8babf42065 100644
--- a/plugins/spu2-x/src/Windows/Spu2-X_vs2013.vcxproj
+++ b/plugins/spu2-x/src/Windows/Spu2-X_vs2013.vcxproj
@@ -453,7 +453,7 @@
{0a18a071-125e-442f-aff7-a3f68abecf99}
false
-
+
{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}
false
@@ -497,4 +497,4 @@
-
\ No newline at end of file
+
diff --git a/plugins/zerospu2/build.sh b/plugins/zerospu2/build.sh
index 896ea0293b..edd39afeba 100644
--- a/plugins/zerospu2/build.sh
+++ b/plugins/zerospu2/build.sh
@@ -9,12 +9,12 @@ fi
if [ $# -gt 0 ] && [ $1 = "all" ]
then
-cd ../../3rdparty/SoundTouch/
+cd ../../3rdparty/soundtouch/
sh build.sh $@
cd $curdir
rm libSoundTouch.a
-cp ../../3rdparty/SoundTouch/libSoundTouch.a ./
+cp ../../3rdparty/soundtouch/libSoundTouch.a ./
echo -----------------
echo Building ZeroSPU2