--- a/source.list	Sun Jun 17 20:14:38 2007 +0000
+++ b/source.list	Sun Jun 17 20:30:28 2007 +0000
@@ -293,15 +293,20 @@
 ai/trolly/trolly.cpp
 
 # Blitters
+blitter/32bpp_base.cpp
+blitter/32bpp_base.hpp
 blitter/32bpp_simple.cpp
 blitter/32bpp_simple.hpp
+blitter/8bpp_base.cpp
+blitter/8bpp_base.hpp
 blitter/8bpp_debug.cpp
 blitter/8bpp_debug.hpp
 blitter/8bpp_optimized.cpp
 blitter/8bpp_optimized.hpp
 blitter/8bpp_simple.cpp
 blitter/8bpp_simple.hpp
-blitter/blitter.hpp
+blitter/base.hpp
+blitter/factory.hpp
 blitter/null.cpp
 blitter/null.hpp
 
@@ -314,15 +319,6 @@
 #end
 spriteloader/spriteloader.hpp
 
-# Renderer
-renderer/32bpp.cpp
-renderer/32bpp.hpp
-renderer/8bpp.cpp
-renderer/8bpp.hpp
-renderer/null.cpp
-renderer/null.hpp
-renderer/renderer.hpp
-
 # NewGRF
 newgrf.cpp
 newgrf_canal.cpp