Revert "refactor"

This reverts commit af3989cd65c3e98a3b40f32893da407ce53b0261.

Revert "8.12-before"

This reverts commit d1f9e31f3c53d6c95ce5285fb1c07f6c91039010.
before-8.13
refactor
replace type code with module extension