Rework application structure