Minor changes to app structure
#10 Implemented