<Anuj> refactoring the app structure