fix type output bug, restructure old type folder