restructuring of the app