Change tree structure
Merge branch 'assets_namespaces'