Refactored World class from ground up

Also added Tests to fit all the requirements for TDD/SOLID development