Add RelationType.
Make constructors more robust
Move Type subclasses under type/