Restructured the APP