Refactoring and added unload World

I'm not sure if this works...