Restructured application