10 files changed, 23 insertions, 19 deletions
diff --git a/plugins/BASS_interface/Bass_interface.vcxproj b/plugins/BASS_interface/Bass_interface.vcxproj
index fe463ff257..157d4b5122 100644
--- a/plugins/BASS_interface/Bass_interface.vcxproj
+++ b/plugins/BASS_interface/Bass_interface.vcxproj
@@ -89,6 +89,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
@@ -110,6 +111,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
@@ -138,6 +140,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
@@ -166,21 +169,22 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="bass.h" />
-    <ClInclude Include="bass_interface.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\bass.h" />
+    <ClInclude Include="src\bass_interface.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="bass.rc" />
-    <ResourceCompile Include="Version.rc" />
+    <ResourceCompile Include="res\bass.rc" />
+    <ResourceCompile Include="res\Version.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="src\Main.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/BASS_interface/Bass_interface.vcxproj.filters b/plugins/BASS_interface/Bass_interface.vcxproj.filters
index 025a1f421b..9549add1f3 100644
--- a/plugins/BASS_interface/Bass_interface.vcxproj.filters
+++ b/plugins/BASS_interface/Bass_interface.vcxproj.filters
@@ -15,29 +15,29 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="bass.h">
+    <ClInclude Include="src\bass.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="bass_interface.h">
+    <ClInclude Include="src\bass_interface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="bass.rc">
+    <ResourceCompile Include="res\bass.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="Version.rc">
+    <ResourceCompile Include="res\Version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Main.cpp">
+    <ClCompile Include="src\Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/plugins/BASS_interface/bass_interface-translation.txt b/plugins/BASS_interface/docs/bass_interface-translation.txt
index e83a3e56af..e83a3e56af 100644
--- a/plugins/BASS_interface/bass_interface-translation.txt
+++ b/plugins/BASS_interface/docs/bass_interface-translation.txt
diff --git a/plugins/BASS_interface/Bass.rc b/plugins/BASS_interface/res/Bass.rc
index 31ca4098d3..98b6780742 100644
--- a/plugins/BASS_interface/Bass.rc
+++ b/plugins/BASS_interface/res/Bass.rc
@@ -2,7 +2,7 @@
 //
 #include <windows.h>
 #include <commctrl.h>
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -28,8 +28,8 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_BASSSoundOnOffUp		ICON           "res/BASSSoundOnOffUp.ico"
-IDI_BASSSoundOnOffDown		ICON           "res/BASSSoundOnOffDown.ico"
+IDI_BASSSoundOnOffUp		ICON           "BASSSoundOnOffUp.ico"
+IDI_BASSSoundOnOffDown		ICON           "BASSSoundOnOffDown.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -78,7 +78,7 @@ END
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\src\resource.h\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/plugins/BASS_interface/Version.rc b/plugins/BASS_interface/res/Version.rc
index e637f0cb33..700fecb1fc 100644
--- a/plugins/BASS_interface/Version.rc
+++ b/plugins/BASS_interface/res/Version.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
 
 #ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/BASS_interface/Bass.h b/plugins/BASS_interface/src/Bass.h
index cf0a66cf2b..cf0a66cf2b 100644
--- a/plugins/BASS_interface/Bass.h
+++ b/plugins/BASS_interface/src/Bass.h
diff --git a/plugins/BASS_interface/Bass_interface.h b/plugins/BASS_interface/src/Bass_interface.h
index 75585eb693..75585eb693 100644
--- a/plugins/BASS_interface/Bass_interface.h
+++ b/plugins/BASS_interface/src/Bass_interface.h
diff --git a/plugins/BASS_interface/Main.cpp b/plugins/BASS_interface/src/Main.cpp
index 46e1b050e9..46e1b050e9 100644
--- a/plugins/BASS_interface/Main.cpp
+++ b/plugins/BASS_interface/src/Main.cpp
diff --git a/plugins/BASS_interface/Resource.h b/plugins/BASS_interface/src/Resource.h
index fb35fa7855..fb35fa7855 100644
--- a/plugins/BASS_interface/Resource.h
+++ b/plugins/BASS_interface/src/Resource.h
diff --git a/plugins/BASS_interface/Version.h b/plugins/BASS_interface/src/Version.h
index 99c6ecc868..99c6ecc868 100644
--- a/plugins/BASS_interface/Version.h
+++ b/plugins/BASS_interface/src/Version.h