--- a/world.py	Sat Mar 24 09:59:46 2012 +0100
+++ b/world.py	Tue Mar 27 13:41:20 2012 +0200
@@ -1,28 +1,19 @@
-from parpg.bGrease.world import *
-from parpg.bGrease.component import Component
+from bGrease.grease_fife.world import World
+from bGrease.component import Component
 
-from parpg.mode import FifeMode
+from bGrease.grease_fife.mode import Mode
 from parpg import components
 from parpg.components.fifeagent import commands
 from parpg.systems import ScriptingSystem
 from parpg.entities.action import ACTIONS
 
-class World(FifeMode, BaseWorld):
+class PARPGWorld(World):
 
     def __init__(self):
-        FifeMode.__init__(self)
-        BaseWorld.__init__(self)
+        World.__init__(self)
         
     def configure(self):
         """Configure the game world's components, systems and renderers"""
         for name, component in components.components.iteritems():
             setattr(self.components, name, component)
         self.systems.scripting = ScriptingSystem(commands, ACTIONS)
-    
-    def pump(self, dt):
-        for component in self.components:
-            if hasattr(component, "step"):
-                component.step(dt)
-        for system in self.systems:
-            if hasattr(system, "step"):
-                system.step(dt)
\ No newline at end of file