Reorganizing the project to add multiple target apps