Cleaning up app structure