types2: reorganize