Restructured the app to split up the two projects