Renames, shuffling code around galore
Some simplifications
Massive structural (what pun?) changes