Better resource structure
Renamed dynamic resources
Imported resources