Further restructuring of the app