Massive refactoring of WorldController