Fix namespacing for new app structure