Refactor app to new namespacing