update namespaces and refactored assets