--- a/src/Engine.hh	Wed Jan 21 01:57:24 2009 +0200
+++ b/src/Engine.hh	Wed Jan 21 03:33:35 2009 +0200
@@ -5,7 +5,7 @@
 class Engine;
 
 #include "GameState.hh"
-#include "Graphics.hh"
+#include "Graphics/Graphics.hh"
 #include "Network/Server.hh"
 #include "Network/Client.hh"
 
@@ -20,11 +20,8 @@
         Terrain *terrain;
         GameState *game_state;
 
-        /** Set if setupGraphics has been called */
-        const GraphicsConfig *graphics_config;
-        
         // Graphics/Input
-        Graphics *graphics;
+        graphics::Graphics *graphics;
 
         // network server/client
         NetworkServer *net_server;
@@ -56,7 +53,7 @@
         /**
          * Enable graphics
          */
-        void setupGraphics (const GraphicsConfig &config);
+        void setupGraphics (const graphics::DisplayConfig &config);
         
         /**
          * Setup server, must call setupGame first