Clean up and reorganize existing editor code

[playmer]

Nick did this over last year and early this year. This refactor is now complete and waiting futher bugfixes on other features in it's feature branch.