Some drastic changes to build a clean and better game engine