Organization

Moved some things around.  Yay!