Categorized the majority of code we've spliced and diced.

Nothing significant has changed.