Corrected app for new structure