Formatting app structure
Got the app working in new structure and added requirements