Restructured the application