App Restructure

I obviously have no idea what I'm doing.