Moved world objects to separate files