Massive structure refactor.  Make IDE setup hell, but greatly improves maintainability.