Assets structure changes
Add normalize and fix ilegal nesting