Restructured the app a bit