diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index 1968cb262b..f3f921efd4 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -16,15 +16,15 @@ SharedLibrary appserver :
 	CursorData.cpp
 	CursorHandler.cpp
 	Decorator.cpp
-	DisplayDriver.cpp
-	DisplayDriverImpl.cpp
-	DisplaySupport.cpp
+	drawing/DisplayDriver.cpp
+	drawing/DisplayDriverImpl.cpp
+	drawing/DisplaySupport.cpp
 	FontFamily.cpp
 	GraphicsBuffer.cpp
 	IPoint.cpp
 	LayerData.cpp
-	PatternHandler.cpp
-	PixelRenderer.cpp
+	drawing/PatternHandler.cpp
+	drawing/PixelRenderer.cpp
 	RectUtils.cpp
 	RGBColor.cpp
 	ServerBitmap.cpp
@@ -50,20 +50,20 @@ Server app_server :
 
 	# Manager Classes
 	AppServer.cpp
-	BitmapDriver.cpp
 	CursorManager.cpp
 	Desktop.cpp
 	ServerApp.cpp
 	ServerWindow.cpp
 
-	# Display Classes
+	# DisplayDriver Classes
 	# Clipper.cpp
-	AccelerantDriver.cpp
-
+	drawing/AccelerantDriver.cpp
+	drawing/BitmapDriver.cpp
+	drawing/ViewDriver.cpp
+	drawing/DirectDriver.cpp
 	# We'll just remove this from the build for a little while...
-	#ScreenDriver.cpp
-	ViewDriver.cpp
-	DirectDriver.cpp
+	#drawing/ScreenDriver.cpp
+
 	DefaultDecorator.cpp
 	Layer.cpp
 	RootLayer.cpp
diff --git a/src/servers/app/AccelerantDriver.cpp b/src/servers/app/drawing/AccelerantDriver.cpp
similarity index 100%
rename from src/servers/app/AccelerantDriver.cpp
rename to src/servers/app/drawing/AccelerantDriver.cpp
diff --git a/src/servers/app/AccelerantDriver.h b/src/servers/app/drawing/AccelerantDriver.h
similarity index 100%
rename from src/servers/app/AccelerantDriver.h
rename to src/servers/app/drawing/AccelerantDriver.h
diff --git a/src/servers/app/BitmapDriver.cpp b/src/servers/app/drawing/BitmapDriver.cpp
similarity index 100%
rename from src/servers/app/BitmapDriver.cpp
rename to src/servers/app/drawing/BitmapDriver.cpp
diff --git a/src/servers/app/BitmapDriver.h b/src/servers/app/drawing/BitmapDriver.h
similarity index 100%
rename from src/servers/app/BitmapDriver.h
rename to src/servers/app/drawing/BitmapDriver.h
diff --git a/src/servers/app/DirectDriver.cpp b/src/servers/app/drawing/DirectDriver.cpp
similarity index 100%
rename from src/servers/app/DirectDriver.cpp
rename to src/servers/app/drawing/DirectDriver.cpp
diff --git a/src/servers/app/DirectDriver.h b/src/servers/app/drawing/DirectDriver.h
similarity index 100%
rename from src/servers/app/DirectDriver.h
rename to src/servers/app/drawing/DirectDriver.h
diff --git a/src/servers/app/DisplayDriver.cpp b/src/servers/app/drawing/DisplayDriver.cpp
similarity index 100%
rename from src/servers/app/DisplayDriver.cpp
rename to src/servers/app/drawing/DisplayDriver.cpp
diff --git a/src/servers/app/DisplayDriverImpl.cpp b/src/servers/app/drawing/DisplayDriverImpl.cpp
similarity index 100%
rename from src/servers/app/DisplayDriverImpl.cpp
rename to src/servers/app/drawing/DisplayDriverImpl.cpp
diff --git a/src/servers/app/DisplaySupport.cpp b/src/servers/app/drawing/DisplaySupport.cpp
similarity index 100%
rename from src/servers/app/DisplaySupport.cpp
rename to src/servers/app/drawing/DisplaySupport.cpp
diff --git a/src/servers/app/PatternHandler.cpp b/src/servers/app/drawing/PatternHandler.cpp
similarity index 100%
rename from src/servers/app/PatternHandler.cpp
rename to src/servers/app/drawing/PatternHandler.cpp
diff --git a/src/servers/app/PixelRenderer.cpp b/src/servers/app/drawing/PixelRenderer.cpp
similarity index 100%
rename from src/servers/app/PixelRenderer.cpp
rename to src/servers/app/drawing/PixelRenderer.cpp
diff --git a/src/servers/app/ScreenDriver.cpp b/src/servers/app/drawing/ScreenDriver.cpp
similarity index 100%
rename from src/servers/app/ScreenDriver.cpp
rename to src/servers/app/drawing/ScreenDriver.cpp
diff --git a/src/servers/app/ScreenDriver.h b/src/servers/app/drawing/ScreenDriver.h
similarity index 100%
rename from src/servers/app/ScreenDriver.h
rename to src/servers/app/drawing/ScreenDriver.h
diff --git a/src/servers/app/ViewDriver.cpp b/src/servers/app/drawing/ViewDriver.cpp
similarity index 100%
rename from src/servers/app/ViewDriver.cpp
rename to src/servers/app/drawing/ViewDriver.cpp
diff --git a/src/servers/app/ViewDriver.h b/src/servers/app/drawing/ViewDriver.h
similarity index 100%
rename from src/servers/app/ViewDriver.h
rename to src/servers/app/drawing/ViewDriver.h