Removed mutating setters, cleaned up hierarchy. Bumped to 2.1-SNAPSHOT
First attempt at symlink changes

Mostly based on a patch by Zuhayr Khan, minor changes & additions by me.
Getting closer