Refactored app structure to introduce newly designed structures