Restructured the app structure
Updated site structure