[Develop_1] app structure was refactored