diff --git a/qrenderdoc/Widgets/RDDoubleSpinBox.cpp b/qrenderdoc/Widgets/Extended/RDDoubleSpinBox.cpp
similarity index 100%
rename from qrenderdoc/Widgets/RDDoubleSpinBox.cpp
rename to qrenderdoc/Widgets/Extended/RDDoubleSpinBox.cpp
diff --git a/qrenderdoc/Widgets/RDDoubleSpinBox.h b/qrenderdoc/Widgets/Extended/RDDoubleSpinBox.h
similarity index 100%
rename from qrenderdoc/Widgets/RDDoubleSpinBox.h
rename to qrenderdoc/Widgets/Extended/RDDoubleSpinBox.h
diff --git a/qrenderdoc/Widgets/RDLabel.cpp b/qrenderdoc/Widgets/Extended/RDLabel.cpp
similarity index 100%
rename from qrenderdoc/Widgets/RDLabel.cpp
rename to qrenderdoc/Widgets/Extended/RDLabel.cpp
diff --git a/qrenderdoc/Widgets/RDLabel.h b/qrenderdoc/Widgets/Extended/RDLabel.h
similarity index 100%
rename from qrenderdoc/Widgets/RDLabel.h
rename to qrenderdoc/Widgets/Extended/RDLabel.h
diff --git a/qrenderdoc/Widgets/RDLineEdit.cpp b/qrenderdoc/Widgets/Extended/RDLineEdit.cpp
similarity index 100%
rename from qrenderdoc/Widgets/RDLineEdit.cpp
rename to qrenderdoc/Widgets/Extended/RDLineEdit.cpp
diff --git a/qrenderdoc/Widgets/RDLineEdit.h b/qrenderdoc/Widgets/Extended/RDLineEdit.h
similarity index 100%
rename from qrenderdoc/Widgets/RDLineEdit.h
rename to qrenderdoc/Widgets/Extended/RDLineEdit.h
diff --git a/qrenderdoc/Widgets/RDListView.cpp b/qrenderdoc/Widgets/Extended/RDListView.cpp
similarity index 100%
rename from qrenderdoc/Widgets/RDListView.cpp
rename to qrenderdoc/Widgets/Extended/RDListView.cpp
diff --git a/qrenderdoc/Widgets/RDListView.h b/qrenderdoc/Widgets/Extended/RDListView.h
similarity index 100%
rename from qrenderdoc/Widgets/RDListView.h
rename to qrenderdoc/Widgets/Extended/RDListView.h
diff --git a/qrenderdoc/Widgets/ResourcePreview.ui b/qrenderdoc/Widgets/ResourcePreview.ui
index 346359923..54933542c 100644
--- a/qrenderdoc/Widgets/ResourcePreview.ui
+++ b/qrenderdoc/Widgets/ResourcePreview.ui
@@ -145,7 +145,7 @@
   <customwidget>
    <class>RDLabel</class>
    <extends>QLabel</extends>
-   <header>Widgets/RDLabel.h</header>
+   <header>Widgets/Extended/RDLabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/qrenderdoc/Widgets/TextureGoto.cpp b/qrenderdoc/Widgets/TextureGoto.cpp
index 228631fe8..1a7bef0c5 100644
--- a/qrenderdoc/Widgets/TextureGoto.cpp
+++ b/qrenderdoc/Widgets/TextureGoto.cpp
@@ -28,7 +28,7 @@
 #include <QFocusEvent>
 #include <QGridLayout>
 #include <QLabel>
-#include "Widgets/RDDoubleSpinBox.h"
+#include "Widgets/Extended/RDDoubleSpinBox.h"
 
 TextureGoto::TextureGoto(QWidget *parent, std::function<void(QPoint)> callback) : QDialog(parent)
 {
diff --git a/qrenderdoc/Windows/AboutDialog.cpp b/qrenderdoc/Windows/Dialogs/AboutDialog.cpp
similarity index 100%
rename from qrenderdoc/Windows/AboutDialog.cpp
rename to qrenderdoc/Windows/Dialogs/AboutDialog.cpp
diff --git a/qrenderdoc/Windows/AboutDialog.h b/qrenderdoc/Windows/Dialogs/AboutDialog.h
similarity index 100%
rename from qrenderdoc/Windows/AboutDialog.h
rename to qrenderdoc/Windows/Dialogs/AboutDialog.h
diff --git a/qrenderdoc/Windows/AboutDialog.ui b/qrenderdoc/Windows/Dialogs/AboutDialog.ui
similarity index 100%
rename from qrenderdoc/Windows/AboutDialog.ui
rename to qrenderdoc/Windows/Dialogs/AboutDialog.ui
diff --git a/qrenderdoc/Windows/EventBrowser.ui b/qrenderdoc/Windows/EventBrowser.ui
index b6475d3aa..4029d9dd1 100644
--- a/qrenderdoc/Windows/EventBrowser.ui
+++ b/qrenderdoc/Windows/EventBrowser.ui
@@ -549,7 +549,7 @@
   <customwidget>
    <class>RDLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>Widgets/RDLineEdit.h</header>
+   <header>Widgets/Extended/RDLineEdit.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp
index 6005fe3d3..fe4d41fc3 100644
--- a/qrenderdoc/Windows/MainWindow.cpp
+++ b/qrenderdoc/Windows/MainWindow.cpp
@@ -27,7 +27,7 @@
 #include <QFileInfo>
 #include <QJsonDocument>
 #include "Code/CaptureContext.h"
-#include "Windows/AboutDialog.h"
+#include "Windows/Dialogs/AboutDialog.h"
 #include "EventBrowser.h"
 #include "TextureViewer.h"
 #include "ui_MainWindow.h"
diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui
index 78516bfd9..7cfe48cf1 100644
--- a/qrenderdoc/Windows/TextureViewer.ui
+++ b/qrenderdoc/Windows/TextureViewer.ui
@@ -1245,12 +1245,12 @@
   <customwidget>
    <class>RDLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>Widgets/RDLineEdit.h</header>
+   <header>Widgets/Extended/RDLineEdit.h</header>
   </customwidget>
   <customwidget>
    <class>RDListView</class>
    <extends>QListView</extends>
-   <header>Widgets/RDListView.h</header>
+   <header>Widgets/Extended/RDListView.h</header>
   </customwidget>
   <customwidget>
    <class>RangeHistogram</class>
diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro
index 731fac1ab..70a915272 100644
--- a/qrenderdoc/qrenderdoc.pro
+++ b/qrenderdoc/qrenderdoc.pro
@@ -79,55 +79,55 @@ win32 {
 	DEFINES += RENDERDOC_PLATFORM_POSIX RENDERDOC_PLATFORM_LINUX RENDERDOC_WINDOWING_XLIB RENDERDOC_WINDOWING_XCB
 }
 
-SOURCES += Code/qrenderdoc.cpp \
+SOURCES += 3rdparty/toolwindowmanager/ToolWindowManager.cpp \
+    3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp \
+    3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp \
+    3rdparty/flowlayout/FlowLayout.cpp \
+    Code/qrenderdoc.cpp \
+    Code/RenderManager.cpp \
+    Code/CommonPipelineState.cpp \
+    Code/PersistantConfig.cpp \
+    Code/CaptureContext.cpp \
+    Windows/Dialogs/AboutDialog.cpp \
     Windows/MainWindow.cpp \
     Windows/EventBrowser.cpp \
     Windows/TextureViewer.cpp \
-    Windows/AboutDialog.cpp \
+    Widgets/Extended/RDLineEdit.cpp \
+    Widgets/Extended/RDLabel.cpp \
+    Widgets/Extended/RDDoubleSpinBox.cpp \
+    Widgets/Extended/RDListView.cpp \
     Widgets/CustomPaintWidget.cpp \
-    3rdparty/toolwindowmanager/ToolWindowManager.cpp \
-    3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp \
-    3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp \
-    Code/RenderManager.cpp \
-    Code/PersistantConfig.cpp \
-    Code/CaptureContext.cpp \
-    Widgets/RDLineEdit.cpp \
-    3rdparty/flowlayout/FlowLayout.cpp \
     Widgets/ResourcePreview.cpp \
-    Widgets/RDLabel.cpp \
     Widgets/ThumbnailStrip.cpp \
-    Code/CommonPipelineState.cpp \
     Widgets/TextureGoto.cpp \
-    Widgets/RDDoubleSpinBox.cpp \
-    Widgets/RDListView.cpp \
     Widgets/RangeHistogram.cpp
 
-HEADERS  += Windows/MainWindow.h \
-    Windows/EventBrowser.h \
-    Windows/TextureViewer.h \
-    Windows/AboutDialog.h \
-    Widgets/CustomPaintWidget.h \
-    3rdparty/toolwindowmanager/ToolWindowManager.h \
+HEADERS  += 3rdparty/toolwindowmanager/ToolWindowManager.h \
     3rdparty/toolwindowmanager/ToolWindowManagerArea.h \
     3rdparty/toolwindowmanager/ToolWindowManagerWrapper.h \
+    3rdparty/flowlayout/FlowLayout.h \
     Code/CaptureContext.h \
     Code/RenderManager.h \
     Code/PersistantConfig.h \
-    Widgets/RDLineEdit.h \
-    3rdparty/flowlayout/FlowLayout.h \
-    Widgets/ResourcePreview.h \
-    Widgets/RDLabel.h \
-    Widgets/ThumbnailStrip.h \
     Code/CommonPipelineState.h \
+    Windows/Dialogs/AboutDialog.h \
+    Windows/MainWindow.h \
+    Windows/EventBrowser.h \
+    Windows/TextureViewer.h \
+    Widgets/Extended/RDLineEdit.h \
+    Widgets/Extended/RDLabel.h \
+    Widgets/Extended/RDDoubleSpinBox.h \
+    Widgets/Extended/RDListView.h \
+    Widgets/CustomPaintWidget.h \
+    Widgets/ResourcePreview.h \
+    Widgets/ThumbnailStrip.h \
     Widgets/TextureGoto.h \
-    Widgets/RDDoubleSpinBox.h \
-    Widgets/RDListView.h \
     Widgets/RangeHistogram.h
 
-FORMS    += Windows/MainWindow.ui \
+FORMS    += Windows/Dialogs/AboutDialog.ui \
+    Windows/MainWindow.ui \
     Windows/EventBrowser.ui \
     Windows/TextureViewer.ui \
-    Windows/AboutDialog.ui \
     Widgets/ResourcePreview.ui \
     Widgets/ThumbnailStrip.ui
 
diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj
index fbdefcb3d..7ab05e9a6 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj
+++ b/qrenderdoc/qrenderdoc_local.vcxproj
@@ -297,20 +297,20 @@
     <ClCompile Include="generated\moc_ToolWindowManagerWrapper.cpp" />
     <ClCompile Include="generated\qrc_resources.cpp" />
     <ClCompile Include="Widgets\RangeHistogram.cpp" />
-    <ClCompile Include="Widgets\RDDoubleSpinBox.cpp" />
-    <ClCompile Include="Widgets\RDLabel.cpp" />
-    <ClCompile Include="Widgets\RDListView.cpp" />
+    <ClCompile Include="Widgets\Extended\RDDoubleSpinBox.cpp" />
+    <ClCompile Include="Widgets\Extended\RDLabel.cpp" />
+    <ClCompile Include="Widgets\Extended\RDListView.cpp" />
     <ClCompile Include="Widgets\ResourcePreview.cpp" />
     <ClCompile Include="Widgets\TextureGoto.cpp" />
     <ClCompile Include="Widgets\ThumbnailStrip.cpp" />
-    <ClCompile Include="Windows\AboutDialog.cpp" />
     <ClCompile Include="Code\CaptureContext.cpp" />
     <ClCompile Include="Widgets\CustomPaintWidget.cpp" />
+    <ClCompile Include="Windows\Dialogs\AboutDialog.cpp" />
     <ClCompile Include="Windows\EventBrowser.cpp" />
     <ClCompile Include="3rdparty\flowlayout\FlowLayout.cpp">
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
-    <ClCompile Include="Widgets\RDLineEdit.cpp" />
+    <ClCompile Include="Widgets\Extended\RDLineEdit.cpp" />
     <ClCompile Include="Windows\MainWindow.cpp" />
     <ClCompile Include="Code\RenderManager.cpp" />
     <ClCompile Include="Windows\TextureViewer.cpp" />
@@ -335,18 +335,18 @@
     <ClInclude Include="generated\ui_TextureViewer.h" />
     <ClInclude Include="generated\ui_ThumbnailStrip.h" />
     <ClInclude Include="Widgets\RangeHistogram.h" />
-    <ClInclude Include="Widgets\RDDoubleSpinBox.h" />
-    <ClInclude Include="Widgets\RDLabel.h" />
-    <ClInclude Include="Widgets\RDListView.h" />
+    <ClInclude Include="Widgets\Extended\RDDoubleSpinBox.h" />
+    <ClInclude Include="Widgets\Extended\RDLabel.h" />
+    <ClInclude Include="Widgets\Extended\RDListView.h" />
     <ClInclude Include="Widgets\ResourcePreview.h" />
     <ClInclude Include="Widgets\TextureGoto.h" />
     <ClInclude Include="Widgets\ThumbnailStrip.h" />
-    <ClInclude Include="Windows\AboutDialog.h" />
     <ClInclude Include="Code\CaptureContext.h" />
     <ClInclude Include="Widgets\CustomPaintWidget.h" />
+    <ClInclude Include="Windows\Dialogs\AboutDialog.h" />
     <ClInclude Include="Windows\EventBrowser.h" />
     <ClInclude Include="3rdparty\flowlayout\FlowLayout.h" />
-    <ClInclude Include="Widgets\RDLineEdit.h" />
+    <ClInclude Include="Widgets\Extended\RDLineEdit.h" />
     <ClInclude Include="Windows\MainWindow.h" />
     <ClInclude Include="Code\RenderManager.h" />
     <ClInclude Include="Windows\TextureViewer.h" />
@@ -357,7 +357,7 @@
   <ItemGroup>
     <None Include="Widgets\ResourcePreview.ui" />
     <None Include="Widgets\ThumbnailStrip.ui" />
-    <None Include="Windows\AboutDialog.ui" />
+    <None Include="Windows\Dialogs\AboutDialog.ui" />
     <None Include="Windows\EventBrowser.ui" />
     <None Include="Windows\MainWindow.ui" />
     <None Include="Windows\TextureViewer.ui" />
diff --git a/qrenderdoc/qrenderdoc_local.vcxproj.filters b/qrenderdoc/qrenderdoc_local.vcxproj.filters
index 91a4da68c..bfadf41af 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj.filters
+++ b/qrenderdoc/qrenderdoc_local.vcxproj.filters
@@ -88,9 +88,6 @@
     <ClCompile Include="Code\qrenderdoc.cpp">
       <Filter>Code</Filter>
     </ClCompile>
-    <ClCompile Include="Windows\AboutDialog.cpp">
-      <Filter>Windows\Dialogs</Filter>
-    </ClCompile>
     <ClCompile Include="Widgets\CustomPaintWidget.cpp">
       <Filter>Widgets</Filter>
     </ClCompile>
@@ -151,18 +148,21 @@
     <ClCompile Include="generated\moc_RangeHistogram.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="Widgets\RDDoubleSpinBox.cpp">
+    <ClCompile Include="Widgets\Extended\RDDoubleSpinBox.cpp">
       <Filter>Widgets\Extended</Filter>
     </ClCompile>
-    <ClCompile Include="Widgets\RDLabel.cpp">
+    <ClCompile Include="Widgets\Extended\RDLabel.cpp">
       <Filter>Widgets\Extended</Filter>
     </ClCompile>
-    <ClCompile Include="Widgets\RDLineEdit.cpp">
+    <ClCompile Include="Widgets\Extended\RDLineEdit.cpp">
       <Filter>Widgets\Extended</Filter>
     </ClCompile>
-    <ClCompile Include="Widgets\RDListView.cpp">
+    <ClCompile Include="Widgets\Extended\RDListView.cpp">
       <Filter>Widgets\Extended</Filter>
     </ClCompile>
+    <ClCompile Include="Windows\Dialogs\AboutDialog.cpp">
+      <Filter>Windows\Dialogs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="3rdparty\flowlayout\FlowLayout.h">
@@ -171,9 +171,6 @@
     <ClInclude Include="Code\RenderManager.h">
       <Filter>Code</Filter>
     </ClInclude>
-    <ClInclude Include="Windows\AboutDialog.h">
-      <Filter>Windows\Dialogs</Filter>
-    </ClInclude>
     <ClInclude Include="Widgets\CustomPaintWidget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
@@ -222,18 +219,21 @@
     <ClInclude Include="Widgets\RangeHistogram.h">
       <Filter>Widgets</Filter>
     </ClInclude>
-    <ClInclude Include="Widgets\RDDoubleSpinBox.h">
+    <ClInclude Include="Widgets\Extended\RDDoubleSpinBox.h">
       <Filter>Widgets\Extended</Filter>
     </ClInclude>
-    <ClInclude Include="Widgets\RDLabel.h">
+    <ClInclude Include="Widgets\Extended\RDLabel.h">
       <Filter>Widgets\Extended</Filter>
     </ClInclude>
-    <ClInclude Include="Widgets\RDLineEdit.h">
+    <ClInclude Include="Widgets\Extended\RDLineEdit.h">
       <Filter>Widgets\Extended</Filter>
     </ClInclude>
-    <ClInclude Include="Widgets\RDListView.h">
+    <ClInclude Include="Widgets\Extended\RDListView.h">
       <Filter>Widgets\Extended</Filter>
     </ClInclude>
+    <ClInclude Include="Windows\Dialogs\AboutDialog.h">
+      <Filter>Windows\Dialogs</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="resources.qrc">
@@ -413,9 +413,6 @@
     <None Include="Resources\zoom.png">
       <Filter>Resources\Files</Filter>
     </None>
-    <None Include="Windows\AboutDialog.ui">
-      <Filter>Windows\Dialogs</Filter>
-    </None>
     <None Include="Windows\EventBrowser.ui">
       <Filter>Windows</Filter>
     </None>