Master Merge

app-restructure is a silly thing to have on the public-facing repo. master will be the main branch.