Updated app structure
Updated main controller