Restructured the app files