diff --git a/source/sced/NaviCam.cpp b/source/sced/NaviCam.cpp
index 8ec953fdfc..01f5d1ac69 100755
--- a/source/sced/NaviCam.cpp
+++ b/source/sced/NaviCam.cpp
@@ -1,23 +1,9 @@
-#include "stdafx.h"
 #include "NaviCam.h"
 #include "EditorData.h"
 #include <stdarg.h>
 
 CNaviCam g_NaviCam;
 
-static void DbgText(char* str, ...)
-{
-	char buf[1024];
-
-	va_list args;      
-	va_start(args, str);     
-	vsprintf(buf, str, args);     
-	va_end(args); 
-
-	OutputDebugString(buf);
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////
 // CNaviCam constructor
 CNaviCam::CNaviCam() : m_CameraZoom(10)
diff --git a/source/sced/ScEd.dsp b/source/sced/ScEd.dsp
index fa72121eb7..9ed71a6944 100755
--- a/source/sced/ScEd.dsp
+++ b/source/sced/ScEd.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 nafxcw.lib pslib.lib opengl32.lib glu32.lib ws2_32.lib version.lib xerces-c_2.lib /nologo /entry:"entry" /subsystem:windows /map /machine:I386 /out:"D:\0ad\binaries\system\ScEd.exe" /libpath:"..\libs" /fixed:no
+# ADD LINK32 nafxcw.lib opengl32.lib glu32.lib ws2_32.lib version.lib xerces-c_2.lib /nologo /entry:"entry" /subsystem:windows /map /machine:I386 /out:"D:\0ad\binaries\system\ScEd.exe" /libpath:"..\libs" /fixed:no
 # SUBTRACT LINK32 /pdb:none /debug
 
 !ELSEIF  "$(CFG)" == "ScEd - Win32 Debug"
diff --git a/source/sced/StdAfx.cpp b/source/sced/StdAfx.cpp
deleted file mode 100755
index ff29ae8c41..0000000000
--- a/source/sced/StdAfx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-//	ScEd.pch will be the pre-compiled header
-//	stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-
-
diff --git a/source/sced/stdout.txt b/source/sced/stdout.txt
deleted file mode 100755
index e69de29bb2..0000000000
diff --git a/source/sced/BrushShapeEditorDlgBar.cpp b/source/sced/ui/BrushShapeEditorDlgBar.cpp
similarity index 100%
rename from source/sced/BrushShapeEditorDlgBar.cpp
rename to source/sced/ui/BrushShapeEditorDlgBar.cpp
diff --git a/source/sced/BrushShapeEditorDlgBar.h b/source/sced/ui/BrushShapeEditorDlgBar.h
similarity index 100%
rename from source/sced/BrushShapeEditorDlgBar.h
rename to source/sced/ui/BrushShapeEditorDlgBar.h
diff --git a/source/sced/ColorButton.cpp b/source/sced/ui/ColorButton.cpp
similarity index 100%
rename from source/sced/ColorButton.cpp
rename to source/sced/ui/ColorButton.cpp
diff --git a/source/sced/ColorButton.h b/source/sced/ui/ColorButton.h
similarity index 100%
rename from source/sced/ColorButton.h
rename to source/sced/ui/ColorButton.h
diff --git a/source/sced/DirectionButton.cpp b/source/sced/ui/DirectionButton.cpp
similarity index 100%
rename from source/sced/DirectionButton.cpp
rename to source/sced/ui/DirectionButton.cpp
diff --git a/source/sced/DirectionButton.h b/source/sced/ui/DirectionButton.h
similarity index 100%
rename from source/sced/DirectionButton.h
rename to source/sced/ui/DirectionButton.h
diff --git a/source/sced/ElevToolsDlgBar.cpp b/source/sced/ui/ElevToolsDlgBar.cpp
similarity index 100%
rename from source/sced/ElevToolsDlgBar.cpp
rename to source/sced/ui/ElevToolsDlgBar.cpp
diff --git a/source/sced/ElevToolsDlgBar.h b/source/sced/ui/ElevToolsDlgBar.h
similarity index 100%
rename from source/sced/ElevToolsDlgBar.h
rename to source/sced/ui/ElevToolsDlgBar.h
diff --git a/source/sced/ElevationButton.cpp b/source/sced/ui/ElevationButton.cpp
similarity index 100%
rename from source/sced/ElevationButton.cpp
rename to source/sced/ui/ElevationButton.cpp
diff --git a/source/sced/ElevationButton.h b/source/sced/ui/ElevationButton.h
similarity index 100%
rename from source/sced/ElevationButton.h
rename to source/sced/ui/ElevationButton.h
diff --git a/source/sced/ImageListCtrl.cpp b/source/sced/ui/ImageListCtrl.cpp
similarity index 100%
rename from source/sced/ImageListCtrl.cpp
rename to source/sced/ui/ImageListCtrl.cpp
diff --git a/source/sced/ImageListCtrl.h b/source/sced/ui/ImageListCtrl.h
similarity index 100%
rename from source/sced/ImageListCtrl.h
rename to source/sced/ui/ImageListCtrl.h
diff --git a/source/sced/LightSettingsDlg.cpp b/source/sced/ui/LightSettingsDlg.cpp
similarity index 100%
rename from source/sced/LightSettingsDlg.cpp
rename to source/sced/ui/LightSettingsDlg.cpp
diff --git a/source/sced/LightSettingsDlg.h b/source/sced/ui/LightSettingsDlg.h
similarity index 100%
rename from source/sced/LightSettingsDlg.h
rename to source/sced/ui/LightSettingsDlg.h
diff --git a/source/sced/MainFrameDlgBar.cpp b/source/sced/ui/MainFrameDlgBar.cpp
similarity index 100%
rename from source/sced/MainFrameDlgBar.cpp
rename to source/sced/ui/MainFrameDlgBar.cpp
diff --git a/source/sced/MainFrameDlgBar.h b/source/sced/ui/MainFrameDlgBar.h
similarity index 100%
rename from source/sced/MainFrameDlgBar.h
rename to source/sced/ui/MainFrameDlgBar.h
diff --git a/source/sced/MainFrm.cpp b/source/sced/ui/MainFrm.cpp
similarity index 100%
rename from source/sced/MainFrm.cpp
rename to source/sced/ui/MainFrm.cpp
diff --git a/source/sced/MainFrm.h b/source/sced/ui/MainFrm.h
similarity index 100%
rename from source/sced/MainFrm.h
rename to source/sced/ui/MainFrm.h
diff --git a/source/sced/MapSizeDlg.cpp b/source/sced/ui/MapSizeDlg.cpp
similarity index 100%
rename from source/sced/MapSizeDlg.cpp
rename to source/sced/ui/MapSizeDlg.cpp
diff --git a/source/sced/MapSizeDlg.h b/source/sced/ui/MapSizeDlg.h
similarity index 100%
rename from source/sced/MapSizeDlg.h
rename to source/sced/ui/MapSizeDlg.h
diff --git a/source/sced/NavigatePropPage.cpp b/source/sced/ui/NavigatePropPage.cpp
similarity index 100%
rename from source/sced/NavigatePropPage.cpp
rename to source/sced/ui/NavigatePropPage.cpp
diff --git a/source/sced/NavigatePropPage.h b/source/sced/ui/NavigatePropPage.h
similarity index 100%
rename from source/sced/NavigatePropPage.h
rename to source/sced/ui/NavigatePropPage.h
diff --git a/source/sced/OptionsDlg.cpp b/source/sced/ui/OptionsDlg.cpp
similarity index 100%
rename from source/sced/OptionsDlg.cpp
rename to source/sced/ui/OptionsDlg.cpp
diff --git a/source/sced/OptionsDlg.h b/source/sced/ui/OptionsDlg.h
similarity index 100%
rename from source/sced/OptionsDlg.h
rename to source/sced/ui/OptionsDlg.h
diff --git a/source/sced/OptionsPropSheet.cpp b/source/sced/ui/OptionsPropSheet.cpp
similarity index 100%
rename from source/sced/OptionsPropSheet.cpp
rename to source/sced/ui/OptionsPropSheet.cpp
diff --git a/source/sced/OptionsPropSheet.h b/source/sced/ui/OptionsPropSheet.h
similarity index 100%
rename from source/sced/OptionsPropSheet.h
rename to source/sced/ui/OptionsPropSheet.h
diff --git a/source/sced/ScEd.cpp b/source/sced/ui/ScEd.cpp
similarity index 100%
rename from source/sced/ScEd.cpp
rename to source/sced/ui/ScEd.cpp
diff --git a/source/sced/ScEd.h b/source/sced/ui/ScEd.h
similarity index 100%
rename from source/sced/ScEd.h
rename to source/sced/ui/ScEd.h
diff --git a/source/sced/ScEd.rc b/source/sced/ui/ScEd.rc
similarity index 100%
rename from source/sced/ScEd.rc
rename to source/sced/ui/ScEd.rc
diff --git a/source/sced/ScEdDoc.cpp b/source/sced/ui/ScEdDoc.cpp
similarity index 100%
rename from source/sced/ScEdDoc.cpp
rename to source/sced/ui/ScEdDoc.cpp
diff --git a/source/sced/ScEdDoc.h b/source/sced/ui/ScEdDoc.h
similarity index 100%
rename from source/sced/ScEdDoc.h
rename to source/sced/ui/ScEdDoc.h
diff --git a/source/sced/ScEdView.cpp b/source/sced/ui/ScEdView.cpp
similarity index 99%
rename from source/sced/ScEdView.cpp
rename to source/sced/ui/ScEdView.cpp
index 4e1c69faa3..b1680a7518 100755
--- a/source/sced/ScEdView.cpp
+++ b/source/sced/ui/ScEdView.cpp
@@ -206,12 +206,12 @@ bool CScEdView::SetupPixelFormat(HDC dc)
 		PFD_TYPE_RGBA,					// RGBA type
 		bpp==16 ? 16 : 24,				// 16/24 bit color depth
 		0, 0, 0, 0, 0, 0,				// color bits ignored
-		bpp==16 ? 0 : 8,				// 16/24 bit color depth
+		bpp==16 ? 0 : 8,				// alpha bits
 		0,								// shift bit ignored
 		0,								// no accumulation buffer
 		0, 0, 0, 0, 					// accum bits ignored
 		24,								// 24-bit z-buffer	
-		8,								// 8-bit stencil buffer
+		0,								// 8-bit stencil buffer
 		0,								// no auxiliary buffer
 		PFD_MAIN_PLANE,					// main layer
 		0,								// reserved
diff --git a/source/sced/ScEdView.h b/source/sced/ui/ScEdView.h
similarity index 100%
rename from source/sced/ScEdView.h
rename to source/sced/ui/ScEdView.h
diff --git a/source/sced/ShadowsPropPage.cpp b/source/sced/ui/ShadowsPropPage.cpp
similarity index 100%
rename from source/sced/ShadowsPropPage.cpp
rename to source/sced/ui/ShadowsPropPage.cpp
diff --git a/source/sced/ShadowsPropPage.h b/source/sced/ui/ShadowsPropPage.h
similarity index 100%
rename from source/sced/ShadowsPropPage.h
rename to source/sced/ui/ShadowsPropPage.h
diff --git a/source/sced/SimpleEdit.cpp b/source/sced/ui/SimpleEdit.cpp
similarity index 100%
rename from source/sced/SimpleEdit.cpp
rename to source/sced/ui/SimpleEdit.cpp
diff --git a/source/sced/SimpleEdit.h b/source/sced/ui/SimpleEdit.h
similarity index 100%
rename from source/sced/SimpleEdit.h
rename to source/sced/ui/SimpleEdit.h
diff --git a/source/sced/StdAfx.h b/source/sced/ui/StdAfx.h
similarity index 100%
rename from source/sced/StdAfx.h
rename to source/sced/ui/StdAfx.h
diff --git a/source/sced/TexToolsDlgBar.cpp b/source/sced/ui/TexToolsDlgBar.cpp
similarity index 100%
rename from source/sced/TexToolsDlgBar.cpp
rename to source/sced/ui/TexToolsDlgBar.cpp
diff --git a/source/sced/TexToolsDlgBar.h b/source/sced/ui/TexToolsDlgBar.h
similarity index 100%
rename from source/sced/TexToolsDlgBar.h
rename to source/sced/ui/TexToolsDlgBar.h
diff --git a/source/sced/UIGlobals.cpp b/source/sced/ui/UIGlobals.cpp
similarity index 100%
rename from source/sced/UIGlobals.cpp
rename to source/sced/ui/UIGlobals.cpp
diff --git a/source/sced/UIGlobals.h b/source/sced/ui/UIGlobals.h
similarity index 100%
rename from source/sced/UIGlobals.h
rename to source/sced/ui/UIGlobals.h
diff --git a/source/sced/UnitPropertiesAnimationsTab.cpp b/source/sced/ui/UnitPropertiesAnimationsTab.cpp
similarity index 100%
rename from source/sced/UnitPropertiesAnimationsTab.cpp
rename to source/sced/ui/UnitPropertiesAnimationsTab.cpp
diff --git a/source/sced/UnitPropertiesAnimationsTab.h b/source/sced/ui/UnitPropertiesAnimationsTab.h
similarity index 100%
rename from source/sced/UnitPropertiesAnimationsTab.h
rename to source/sced/ui/UnitPropertiesAnimationsTab.h
diff --git a/source/sced/UnitPropertiesDlgBar.cpp b/source/sced/ui/UnitPropertiesDlgBar.cpp
similarity index 100%
rename from source/sced/UnitPropertiesDlgBar.cpp
rename to source/sced/ui/UnitPropertiesDlgBar.cpp
diff --git a/source/sced/UnitPropertiesDlgBar.h b/source/sced/ui/UnitPropertiesDlgBar.h
similarity index 100%
rename from source/sced/UnitPropertiesDlgBar.h
rename to source/sced/ui/UnitPropertiesDlgBar.h
diff --git a/source/sced/UnitPropertiesTabCtrl.cpp b/source/sced/ui/UnitPropertiesTabCtrl.cpp
similarity index 100%
rename from source/sced/UnitPropertiesTabCtrl.cpp
rename to source/sced/ui/UnitPropertiesTabCtrl.cpp
diff --git a/source/sced/UnitPropertiesTabCtrl.h b/source/sced/ui/UnitPropertiesTabCtrl.h
similarity index 100%
rename from source/sced/UnitPropertiesTabCtrl.h
rename to source/sced/ui/UnitPropertiesTabCtrl.h
diff --git a/source/sced/UnitPropertiesTexturesTab.cpp b/source/sced/ui/UnitPropertiesTexturesTab.cpp
similarity index 100%
rename from source/sced/UnitPropertiesTexturesTab.cpp
rename to source/sced/ui/UnitPropertiesTexturesTab.cpp
diff --git a/source/sced/UnitPropertiesTexturesTab.h b/source/sced/ui/UnitPropertiesTexturesTab.h
similarity index 100%
rename from source/sced/UnitPropertiesTexturesTab.h
rename to source/sced/ui/UnitPropertiesTexturesTab.h
diff --git a/source/sced/UnitToolsDlgBar.cpp b/source/sced/ui/UnitToolsDlgBar.cpp
similarity index 100%
rename from source/sced/UnitToolsDlgBar.cpp
rename to source/sced/ui/UnitToolsDlgBar.cpp
diff --git a/source/sced/UnitToolsDlgBar.h b/source/sced/ui/UnitToolsDlgBar.h
similarity index 100%
rename from source/sced/UnitToolsDlgBar.h
rename to source/sced/ui/UnitToolsDlgBar.h
diff --git a/source/sced/WebLinkButton.cpp b/source/sced/ui/WebLinkButton.cpp
similarity index 100%
rename from source/sced/WebLinkButton.cpp
rename to source/sced/ui/WebLinkButton.cpp
diff --git a/source/sced/WebLinkButton.h b/source/sced/ui/WebLinkButton.h
similarity index 100%
rename from source/sced/WebLinkButton.h
rename to source/sced/ui/WebLinkButton.h
diff --git a/source/sced/resource.h b/source/sced/ui/resource.h
similarity index 100%
rename from source/sced/resource.h
rename to source/sced/ui/resource.h