diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index 4a4e300e12..43687fe8fc 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -31,7 +31,7 @@ local font_src =
 	;
 
 UseBuildFeatureHeaders freetype ;
-Includes [ FGristFiles AlphaMask.cpp AppServer.cpp BitmapManager.cpp
+Includes [ FGristFiles AppServer.cpp BitmapManager.cpp
 	ClientMemoryAllocator.cpp Desktop.cpp DesktopSettings.cpp
 	DrawState.cpp DrawingContext.cpp ServerApp.cpp ServerBitmap.cpp
 	ServerCursor.cpp ServerFont.cpp ServerPicture.cpp ServerWindow.cpp
@@ -46,11 +46,9 @@ if $(TARGET_ARCH) != x86_64 {
 }
 
 Server app_server :
-	AlphaMask.cpp
 	Angle.cpp
 	AppServer.cpp
 	#BitfieldRegion.cpp
-	BitmapDrawingEngine.cpp
 	BitmapManager.cpp
 	ClientMemoryAllocator.cpp
 	CursorData.cpp
diff --git a/src/servers/app/AlphaMask.cpp b/src/servers/app/drawing/AlphaMask.cpp
similarity index 100%
rename from src/servers/app/AlphaMask.cpp
rename to src/servers/app/drawing/AlphaMask.cpp
diff --git a/src/servers/app/AlphaMask.h b/src/servers/app/drawing/AlphaMask.h
similarity index 100%
rename from src/servers/app/AlphaMask.h
rename to src/servers/app/drawing/AlphaMask.h
diff --git a/src/servers/app/BitmapDrawingEngine.cpp b/src/servers/app/drawing/BitmapDrawingEngine.cpp
similarity index 100%
rename from src/servers/app/BitmapDrawingEngine.cpp
rename to src/servers/app/drawing/BitmapDrawingEngine.cpp
diff --git a/src/servers/app/BitmapDrawingEngine.h b/src/servers/app/drawing/BitmapDrawingEngine.h
similarity index 100%
rename from src/servers/app/BitmapDrawingEngine.h
rename to src/servers/app/drawing/BitmapDrawingEngine.h
diff --git a/src/servers/app/drawing/Jamfile b/src/servers/app/drawing/Jamfile
index e35f187885..0893dfb118 100644
--- a/src/servers/app/drawing/Jamfile
+++ b/src/servers/app/drawing/Jamfile
@@ -12,11 +12,13 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ;
 UseBuildFeatureHeaders freetype ;
 
-Includes [ FGristFiles DrawingEngine.cpp ]
+Includes [ FGristFiles AlphaMask.cpp DrawingEngine.cpp ]
 	: [ BuildFeatureAttribute freetype : headers ] ;
 
 StaticLibrary libasdrawing.a :
+	AlphaMask.cpp
 	BitmapBuffer.cpp
+	BitmapDrawingEngine.cpp
 	drawing_support.cpp
 	DrawingEngine.cpp
 	MallocBuffer.cpp
diff --git a/src/servers/app/agg_clipped_alpha_mask.h b/src/servers/app/drawing/Painter/agg_clipped_alpha_mask.h
similarity index 100%
rename from src/servers/app/agg_clipped_alpha_mask.h
rename to src/servers/app/drawing/Painter/agg_clipped_alpha_mask.h
diff --git a/src/servers/app/agg_scanline_storage_subpix.h b/src/servers/app/drawing/Painter/agg_scanline_storage_subpix.h
similarity index 100%
rename from src/servers/app/agg_scanline_storage_subpix.h
rename to src/servers/app/drawing/Painter/agg_scanline_storage_subpix.h
diff --git a/src/servers/app/agg_scanline_u_subpix.h b/src/servers/app/drawing/Painter/agg_scanline_u_subpix.h
similarity index 100%
rename from src/servers/app/agg_scanline_u_subpix.h
rename to src/servers/app/drawing/Painter/agg_scanline_u_subpix.h