Moved world into its own class