Refactored data to own files, added some world data