Started refactor of clustering models