Removed mutating setters, cleaned up hierarchy. Bumped to 2.1-SNAPSHOT