[IMP-dev] Moving atom and residue types