More refactoring of namespaces and moving classes around now that most of the editor has been completed it's final form is appearing.