Completed refactor of asset namespacing
Refactored code to use new asset namespacing