Updated structure to match new app structure - take 1
Take 2