[clustering.rock] Class refactoring (issue #129)