fix: separate some modules from common_types
#1084
+452
−492
Merged
common_types
#1084