Continued rearchitecturing

Kept going re-architectruring code... Still have a bit of work to do
tomorrow.