diff --git a/make-win.bat b/make-win.bat
index be79e0f..947a3a8 100644
--- a/make-win.bat
+++ b/make-win.bat
@@ -17,7 +17,7 @@
 md bin
 md lib
 msdev source\SoundTouch\SoundTouch.dsw /MAKE ALL
-msdev source\SoundStretch\SoundStretch.dsw /MAKE "SoundStretch - Win32 Release"
+msdev source\SoundStretch\SoundStretch.dsw /MAKE ALL
 
 goto end
 
diff --git a/source/SoundStretch/soundstretch.dsp b/source/SoundStretch/soundstretch.dsp
index 4e6dcc1..81b2dfa 100644
--- a/source/SoundStretch/soundstretch.dsp
+++ b/source/SoundStretch/soundstretch.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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" /I "..\bpm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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"
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
 # 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 bpm.lib /nologo /subsystem:console /profile /map /debug /machine:I386 /libpath:"..\..\..\lib"
+# 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\ 
+PostBuild_Cmds=copy           Release\soundstretch.exe           ..\..\bin\ 
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "soundstretch - Win32 Debug"
@@ -71,7 +71,7 @@ PostBuild_Cmds=copy          Release\soundstretch.exe          ..\..\..\bin\
 # 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" /I "..\bpm" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /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"
@@ -80,11 +80,11 @@ BSC32=bscmake.exe
 # 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 bpmD.lib /nologo /subsystem:console /map /debug /machine:I386 /nodefaultlib:"libc" /out:"Debug/soundstretchD.exe" /pdbtype:sept /libpath:"..\..\..\lib"
+# 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\ 
+PostBuild_Cmds=copy           Debug\soundstretchD.exe           ..\..\bin\ 
 # End Special Build Tool
 
 !ENDIF 
diff --git a/source/SoundStretch/soundstretch.dsw b/source/SoundStretch/soundstretch.dsw
index 67530c1..36ced4b 100644
--- a/source/SoundStretch/soundstretch.dsw
+++ b/source/SoundStretch/soundstretch.dsw
@@ -1,23 +1,9 @@
 Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-#
-# $Id$
 
 ###############################################################################
 
-Project: "SoundTouch"=..\..\SoundTouch\SoundTouch.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "bpm"=..\bpm\bpm.dsp - Package Owner=<4>
+Project: "SoundTouch"=..\SoundTouch\SoundTouch.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -40,9 +26,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name SoundTouch
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name bpm
-    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/source/SoundTouch/SoundTouch.dsp b/source/SoundTouch/SoundTouch.dsp
index bcffc69..add29c6 100644
--- a/source/SoundTouch/SoundTouch.dsp
+++ b/source/SoundTouch/SoundTouch.dsp
@@ -52,7 +52,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy           .\Release\SoundTouch.lib           ..\..\lib\ 
+PostBuild_Cmds=copy            .\Release\SoundTouch.lib            ..\..\lib\ 
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "SoundTouch - Win32 Debug"
@@ -79,7 +79,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo /out:"Debug\SoundTouchD.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy           .\Debug\SoundTouchD.lib           ..\..\lib\ 
+PostBuild_Cmds=copy            .\Debug\SoundTouchD.lib            ..\..\lib\ 
 # End Special Build Tool
 
 !ENDIF 
@@ -91,6 +91,18 @@ PostBuild_Cmds=copy           .\Debug\SoundTouchD.lib           ..\..\lib\
 # 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