Restructured the apps and stuff.