Started moving World related classes to a module