Moved some classes around into appropriate projects