Stable/1.0.x

Refactoring as part of CLAVIN v1.0 release.