reworking app structure