Moved some classes out of public namespace. Changed ship shape.