More clustering code files...