Added some organization to the chaos.

Loosly, lots of classes have been moved as deamed apropriate. Since everything appears to work the same, we are now commiting.