Restructured the application tree