Updating app structure for testing
Updating app structure for testing pt 2