Changed structure to allow for addons/expansions in the future