small app structure improvements