New organizational structure to reflect the Mythos service.
I know we had things separated before, but now it is much more integrated.  Honestly, I haven't changed any of the code that made it intertwined, the only thing i changed is allowing it to be overridden.