Updated app structure, added routes