Removing unused stuff
Moving stuff around, typos
Relation + diagram scaffolds