Restructured application, take 2