Code/ForceField and Code/GraphMol/ForceFieldHelpers to the respective UFF subfolders since from now on UFF will not be the only available force field anymore. I updated the relevant CMakeLists.txt files accordingly. Paolo