pruning up app structure