Integrating old code into new app structure.