Started laying out the new app structure