restructuring of application