diff --git a/obs/CMakeLists.txt b/obs/CMakeLists.txt
index 1ca54dfb5..45f4af316 100644
--- a/obs/CMakeLists.txt
+++ b/obs/CMakeLists.txt
@@ -34,7 +34,7 @@ add_executable(obs
 	window-subclass.cpp
 	wx-wrappers.cpp
 	obs-app.cpp
-	OBSWindows.cpp)
+	forms/OBSWindows.cpp)
 
 if(APPLE)
 	set_target_properties(obs PROPERTIES
diff --git a/obs/OBSWindows.cpp b/obs/forms/OBSWindows.cpp
similarity index 100%
rename from obs/OBSWindows.cpp
rename to obs/forms/OBSWindows.cpp
diff --git a/obs/OBSWindows.fbp b/obs/forms/OBSWindows.fbp
similarity index 100%
rename from obs/OBSWindows.fbp
rename to obs/forms/OBSWindows.fbp
diff --git a/obs/OBSWindows.h b/obs/forms/OBSWindows.h
similarity index 100%
rename from obs/OBSWindows.h
rename to obs/forms/OBSWindows.h
diff --git a/obs/images/add.ico b/obs/forms/images/add.ico
similarity index 100%
rename from obs/images/add.ico
rename to obs/forms/images/add.ico
diff --git a/obs/images/delete.ico b/obs/forms/images/delete.ico
similarity index 100%
rename from obs/images/delete.ico
rename to obs/forms/images/delete.ico
diff --git a/obs/images/document-properties-2.png b/obs/forms/images/document-properties-2.png
similarity index 100%
rename from obs/images/document-properties-2.png
rename to obs/forms/images/document-properties-2.png
diff --git a/obs/images/down.ico b/obs/forms/images/down.ico
similarity index 100%
rename from obs/images/down.ico
rename to obs/forms/images/down.ico
diff --git a/obs/images/editscene.ico b/obs/forms/images/editscene.ico
similarity index 100%
rename from obs/images/editscene.ico
rename to obs/forms/images/editscene.ico
diff --git a/obs/images/htmledit_icon22_properties.gif b/obs/forms/images/htmledit_icon22_properties.gif
similarity index 100%
rename from obs/images/htmledit_icon22_properties.gif
rename to obs/forms/images/htmledit_icon22_properties.gif
diff --git a/obs/images/list_add.png b/obs/forms/images/list_add.png
similarity index 100%
rename from obs/images/list_add.png
rename to obs/forms/images/list_add.png
diff --git a/obs/images/list_remove.png b/obs/forms/images/list_remove.png
similarity index 100%
rename from obs/images/list_remove.png
rename to obs/forms/images/list_remove.png
diff --git a/obs/images/live.ico b/obs/forms/images/live.ico
similarity index 100%
rename from obs/images/live.ico
rename to obs/forms/images/live.ico
diff --git a/obs/images/sound.ico b/obs/forms/images/sound.ico
similarity index 100%
rename from obs/images/sound.ico
rename to obs/forms/images/sound.ico
diff --git a/obs/images/sound_muted.ico b/obs/forms/images/sound_muted.ico
similarity index 100%
rename from obs/images/sound_muted.ico
rename to obs/forms/images/sound_muted.ico
diff --git a/obs/images/up.ico b/obs/forms/images/up.ico
similarity index 100%
rename from obs/images/up.ico
rename to obs/forms/images/up.ico
diff --git a/obs/res/delete.ico.h b/obs/forms/res/delete.ico.h
similarity index 100%
rename from obs/res/delete.ico.h
rename to obs/forms/res/delete.ico.h
diff --git a/obs/res/down.ico.h b/obs/forms/res/down.ico.h
similarity index 100%
rename from obs/res/down.ico.h
rename to obs/forms/res/down.ico.h
diff --git a/obs/res/htmledit_icon22_properties.gif.h b/obs/forms/res/htmledit_icon22_properties.gif.h
similarity index 100%
rename from obs/res/htmledit_icon22_properties.gif.h
rename to obs/forms/res/htmledit_icon22_properties.gif.h
diff --git a/obs/res/list_add.png.h b/obs/forms/res/list_add.png.h
similarity index 100%
rename from obs/res/list_add.png.h
rename to obs/forms/res/list_add.png.h
diff --git a/obs/res/up.ico.h b/obs/forms/res/up.ico.h
similarity index 100%
rename from obs/res/up.ico.h
rename to obs/forms/res/up.ico.h
diff --git a/obs/makefile.am b/obs/makefile.am
index 978493cf5..918d12735 100644
--- a/obs/makefile.am
+++ b/obs/makefile.am
@@ -16,4 +16,4 @@ obs_SOURCES = window-obs-basic.cpp \
 	      window-subclass.cpp \
 	      obs-app.cpp \
 	      wx-wrappers.cpp \
-	      OBSWindows.cpp
+	      forms/OBSWindows.cpp
diff --git a/obs/window-obs-basic.hpp b/obs/window-obs-basic.hpp
index 2b41acbd3..b514c9363 100644
--- a/obs/window-obs-basic.hpp
+++ b/obs/window-obs-basic.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "OBSWindows.h"
+#include "forms/OBSWindows.h"
 
 class OBSBasic : public OBSBasicBase {
 protected:
diff --git a/vs/2010/OBS/OBS.vcxproj b/vs/2010/OBS/OBS.vcxproj
index dd566eeaa..c73e1eb3b 100644
--- a/vs/2010/OBS/OBS.vcxproj
+++ b/vs/2010/OBS/OBS.vcxproj
@@ -167,16 +167,16 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\obs\forms\OBSWindows.cpp" />
     <ClCompile Include="..\..\..\obs\obs-app.cpp" />
-    <ClCompile Include="..\..\..\obs\OBSWindows.cpp" />
     <ClCompile Include="..\..\..\obs\window-obs-basic.cpp" />
     <ClCompile Include="..\..\..\obs\window-subclass.cpp" />
     <ClCompile Include="..\..\..\obs\wx-wrappers.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\obs\forms\OBSWindows.h" />
     <ClInclude Include="..\..\..\obs\obs-app.hpp" />
     <ClInclude Include="..\..\..\obs\obs-wrappers.hpp" />
-    <ClInclude Include="..\..\..\obs\OBSWindows.h" />
     <ClInclude Include="..\..\..\obs\window-obs-basic.hpp" />
     <ClInclude Include="..\..\..\obs\window-subclass.hpp" />
     <ClInclude Include="..\..\..\obs\wx-wrappers.hpp" />
diff --git a/vs/2010/OBS/OBS.vcxproj.filters b/vs/2010/OBS/OBS.vcxproj.filters
index f1bba6d5b..fd091fb00 100644
--- a/vs/2010/OBS/OBS.vcxproj.filters
+++ b/vs/2010/OBS/OBS.vcxproj.filters
@@ -13,11 +13,11 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="wx forms">
+      <UniqueIdentifier>{f75b760c-c01b-4e94-a989-ec8158e234c5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\obs\OBSWindows.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\obs\window-obs-basic.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -30,11 +30,11 @@
     <ClCompile Include="..\..\..\obs\wx-wrappers.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\obs\forms\OBSWindows.cpp">
+      <Filter>wx forms</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\obs\OBSWindows.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\obs\window-obs-basic.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -50,5 +50,8 @@
     <ClInclude Include="..\..\..\obs\wx-wrappers.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\obs\forms\OBSWindows.h">
+      <Filter>wx forms</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file