Fix exception type
Initial work on pluggable modules
More copyright updates
Bump version