Working with a restructured application