Complete rewrite of the molecule types.