Added more colvars modifications, directory