Move units into mdtraj