Rename clustering/ to cluster/ just because?