--- a/test/movingfigure/movingfigure.d	Sat Jul 19 17:27:34 2008 +0200
+++ b/test/movingfigure/movingfigure.d	Sat Jul 19 19:29:00 2008 +0200
@@ -25,23 +25,23 @@
 
 import myrrdin.consumers.tile;
 import myrrdin.renderer;
-import myrrdin.imagecache;
 import myrrdin.tilemap;
 import myrrdin.tileset;
 import myrrdin.xmlmap;
 import myrrdin.tools;
 import myrrdin.animatedsprite;
 import myrrdin.consumers.sprite;
-import myrrdin.movingfigure;
+import myrrdin.consumers.movingfigure;
+import myrrdin.director;
 
 int main(char[][] args) {
-    Cache cache = new Cache("gfx");
-    Tilemap map = parse_map(cache, read_file_contents("map-example.xml"));
-    Renderer render = new Renderer("Blubb", 600, 480, 32);
-    TileConsumer consumer = new TileConsumer(render, map);
-    map.set_view(render.app.getView());
+    CreateDirector("gfx", "Blubb", 600, 480, 32);
+    Tilemap map = parse_map(read_file_contents("map-example.xml"));
+    TileConsumer consumer = new TileConsumer(map);
+    map.set_view(Director.renderer.app.getView());
+    auto render = Director.renderer;
     render.add_consumer(consumer);
-    render.add_consumer(load_charset(render, cache, "f-", ".png", 10)); 
+    render.add_consumer(load_charset("f-", ".png", 10)); 
 
     render.mainloop();
     return 0;