Massive reorganization and trimming

In anticipation of a better system.
Collapse some more

[none]