made refactoring of app structure