atom.h, residue.h added