Moved and cleaned up some stuff.