Updates for new app structure
Updates
Merging