diff --git a/COPYING.TXT b/COPYING.TXT
index 5b2161b..bbd24e6 100644
--- a/COPYING.TXT
+++ b/COPYING.TXT
@@ -455,4 +455,4 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/configure-file-README.txt b/configure-file-README.txt
deleted file mode 100644
index d2b4e37..0000000
--- a/configure-file-README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Starting from SoundTouch 1.6.0, the "configure" file is removed from the source code package due to autoconf/automake version conflicts.
-
-Instead, generate the "configure" file using local tools by invoking "./bootstrap" script, then configure & compile as usual.
diff --git a/make-win.bat b/make-win.bat
index acda6c2..384fd16 100644
--- a/make-win.bat
+++ b/make-win.bat
@@ -7,23 +7,6 @@
 @REM Copyright (c) Olli Parviainen
 @REM
 
-@rem ****************************
-@rem try first for VS6.0 support
-
-@if "%MsDevDir%"=="" goto nomsdevdir
-
-md bin
-md lib
-msdev source\SoundTouch\SoundTouch.dsw /MAKE ALL
-msdev source\SoundStretch\SoundStretch.dsw /MAKE ALL
-
-goto end
-
-:nomsdevdir
-
-@rem **********************************
-@rem try with devenv for VS2003 support
-
 @if "%DevEnvDir%"=="" goto nodevdir
 
 md bin
diff --git a/soundtouch-1.4.pc.in b/soundtouch-1.4.pc.in
deleted file mode 100644
index ac6eaec..0000000
--- a/soundtouch-1.4.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is obsoleted but provided for backwards compatibility 
-# with legacy package environments
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: SoundTouch
-Description: SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or files
-Version: @VERSION@
-Libs: -L${libdir} -lSoundTouch
-Cflags: -I${includedir}/soundtouch  
-
diff --git a/source/SoundStretch/soundstretch.dsp b/source/SoundStretch/soundstretch.dsp
deleted file mode 100644
index 81b2dfa..0000000
--- a/source/SoundStretch/soundstretch.dsp
+++ /dev/null
@@ -1,137 +0,0 @@
-# Microsoft Developer Studio Project File - Name="soundstretch" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=soundstretch - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "soundstretch.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "soundstretch.mak" CFG="soundstretch - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "soundstretch - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "soundstretch - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "soundstretch - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Zi /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x40b /d "NDEBUG"
-# ADD RSC /l 0x40b /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 SoundTouch.lib /nologo /subsystem:console /profile /map /debug /machine:I386 /libpath:"..\..\lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy           Release\soundstretch.exe           ..\..\bin\ 
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "soundstretch - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Zp16 /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x40b /d "_DEBUG"
-# ADD RSC /l 0x40b /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 SoundTouchD.lib /nologo /subsystem:console /map /debug /machine:I386 /nodefaultlib:"libc" /out:"Debug/soundstretchD.exe" /pdbtype:sept /libpath:"..\..\lib"
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy           Debug\soundstretchD.exe           ..\..\bin\ 
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "soundstretch - Win32 Release"
-# Name "soundstretch - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\RunParameters.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\WavFile.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\RunParameters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\include\SoundTouch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\include\STTypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\WavFile.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/source/SoundStretch/soundstretch.dsw b/source/SoundStretch/soundstretch.dsw
deleted file mode 100644
index 36ced4b..0000000
--- a/source/SoundStretch/soundstretch.dsw
+++ /dev/null
@@ -1,44 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "SoundTouch"=..\SoundTouch\SoundTouch.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "soundstretch"=.\soundstretch.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name SoundTouch
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/source/SoundTouch/SoundTouch.dsp b/source/SoundTouch/SoundTouch.dsp
deleted file mode 100644
index add29c6..0000000
--- a/source/SoundTouch/SoundTouch.dsp
+++ /dev/null
@@ -1,188 +0,0 @@
-# Microsoft Developer Studio Project File - Name="SoundTouch" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=SoundTouch - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "SoundTouch.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "SoundTouch.mak" CFG="SoundTouch - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SoundTouch - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "SoundTouch - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "SoundTouch - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Zi /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x40b /d "NDEBUG"
-# ADD RSC /l 0x40b /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy            .\Release\SoundTouch.lib            ..\..\lib\ 
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "SoundTouch - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40b /d "_DEBUG"
-# ADD RSC /l 0x40b /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Debug\SoundTouchD.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy            .\Debug\SoundTouchD.lib            ..\..\lib\ 
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SoundTouch - Win32 Release"
-# Name "SoundTouch - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "bpm"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\BPMDetect.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\PeakFinder.cpp
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\3dnow_win.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\AAFilter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cpu_detect_x86_win.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FIFOSampleBuffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FIRFilter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmx_optimized.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\RateTransposer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\SoundTouch.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sse_optimized.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TDStretch.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\AAFilter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cpu_detect.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FIFOSampleBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FIFOSamplePipe.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\FIRFilter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\RateTransposer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\SoundTouch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\STTypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TDStretch.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/source/SoundTouch/SoundTouch.dsw b/source/SoundTouch/SoundTouch.dsw
deleted file mode 100644
index f2a0119..0000000
--- a/source/SoundTouch/SoundTouch.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-#
-###############################################################################
-
-Project: "SoundTouch"=.\SoundTouch.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-