integrate movement in worldlogic, remove lots of header dependencies
move cluster from Game to World