Moved some classes.

cleaned up some code.