changed structure to allow for resource reloading
Merge