App restructuring