Add default settings, refactor class views
Bump to 2.1.0