Started breaking the module. Created a new Area class and heavily modified the affiliated classes in the world package.