Move files around into a better app structure