Some of the core functions interact with the remote "world" API. Move them all into the same package.