diff --git a/connector/connector_battery_18650.yaml b/connector/battery_18650.yaml
similarity index 100%
rename from connector/connector_battery_18650.yaml
rename to connector/battery_18650.yaml
diff --git a/connector/connector_battery_cr2032.yaml b/connector/battery_cr2032.yaml
similarity index 100%
rename from connector/connector_battery_cr2032.yaml
rename to connector/battery_cr2032.yaml
diff --git a/connector/connector_battery_cr2450.yaml b/connector/battery_cr2450.yaml
similarity index 100%
rename from connector/connector_battery_cr2450.yaml
rename to connector/battery_cr2450.yaml
diff --git a/connector/connector_idc-2.54-90d.yaml b/connector/idc-2.54-90d.yaml
similarity index 100%
rename from connector/connector_idc-2.54-90d.yaml
rename to connector/idc-2.54-90d.yaml
diff --git a/connector/connector_idc-2.54-edge.yaml b/connector/idc-2.54-edge.yaml
similarity index 100%
rename from connector/connector_idc-2.54-edge.yaml
rename to connector/idc-2.54-edge.yaml
diff --git a/connector/connector_idc-2.54.yaml b/connector/idc-2.54.yaml
similarity index 100%
rename from connector/connector_idc-2.54.yaml
rename to connector/idc-2.54.yaml
diff --git a/connector/connector_lightning_iphone5.yaml b/connector/lightning_iphone5.yaml
similarity index 100%
rename from connector/connector_lightning_iphone5.yaml
rename to connector/lightning_iphone5.yaml
diff --git a/connector/connector_molex_530470210.yaml b/connector/molex_530470210.yaml
similarity index 100%
rename from connector/connector_molex_530470210.yaml
rename to connector/molex_530470210.yaml
diff --git a/connector/connector_usb-a-2.0-plug_molex_48037-2200.yaml b/connector/usb-a-2.0-plug_molex_48037-2200.yaml
similarity index 100%
rename from connector/connector_usb-a-2.0-plug_molex_48037-2200.yaml
rename to connector/usb-a-2.0-plug_molex_48037-2200.yaml
diff --git a/connector/connector_usb-a-3.0_fci_10117835.yaml b/connector/usb-a-3.0_fci_10117835.yaml
similarity index 100%
rename from connector/connector_usb-a-3.0_fci_10117835.yaml
rename to connector/usb-a-3.0_fci_10117835.yaml
diff --git a/connector/connector_usb-b-3.0_amphenol_gsb4211.yaml b/connector/usb-b-3.0_amphenol_gsb4211.yaml
similarity index 100%
rename from connector/connector_usb-b-3.0_amphenol_gsb4211.yaml
rename to connector/usb-b-3.0_amphenol_gsb4211.yaml
diff --git a/connector/connector_usb-c_hro_type-c-31-m-04.yaml b/connector/usb-c_hro_type-c-31-m-04.yaml
similarity index 100%
rename from connector/connector_usb-c_hro_type-c-31-m-04.yaml
rename to connector/usb-c_hro_type-c-31-m-04.yaml
diff --git a/connector/connector_usb-c_hro_type-c-31-m-12.yaml b/connector/usb-c_hro_type-c-31-m-12.yaml
similarity index 100%
rename from connector/connector_usb-c_hro_type-c-31-m-12.yaml
rename to connector/usb-c_hro_type-c-31-m-12.yaml
diff --git a/connector/connector_usb-c_xkb_u261-24xn-4bs60.yaml b/connector/usb-c_xkb_u261-24xn-4bs60.yaml
similarity index 100%
rename from connector/connector_usb-c_xkb_u261-24xn-4bs60.yaml
rename to connector/usb-c_xkb_u261-24xn-4bs60.yaml
diff --git a/connector/connector_usb-c_xkb_u262-24xn-4bv60.yaml b/connector/usb-c_xkb_u262-24xn-4bv60.yaml
similarity index 100%
rename from connector/connector_usb-c_xkb_u262-24xn-4bv60.yaml
rename to connector/usb-c_xkb_u262-24xn-4bv60.yaml
diff --git a/connector/connector_usb-micro-b-2.0_ali_32910334970.yaml b/connector/usb-micro-b-2.0_ali_32910334970.yaml
similarity index 100%
rename from connector/connector_usb-micro-b-2.0_ali_32910334970.yaml
rename to connector/usb-micro-b-2.0_ali_32910334970.yaml
diff --git a/connector/connector_usb-micro-b-3.0_gct_usb3110.yaml b/connector/usb-micro-b-3.0_gct_usb3110.yaml
similarity index 100%
rename from connector/connector_usb-micro-b-3.0_gct_usb3110.yaml
rename to connector/usb-micro-b-3.0_gct_usb3110.yaml
diff --git a/connector/connector_usb-mini-b_edac_690-005-299-043.yaml b/connector/usb-mini-b_edac_690-005-299-043.yaml
similarity index 100%
rename from connector/connector_usb-mini-b_edac_690-005-299-043.yaml
rename to connector/usb-mini-b_edac_690-005-299-043.yaml
diff --git a/connector/connector_xh-2.54-2p.yaml b/connector/xh-2.54-2p.yaml
similarity index 100%
rename from connector/connector_xh-2.54-2p.yaml
rename to connector/xh-2.54-2p.yaml
diff --git a/diode/diode_tvs_st_usblc6-2.yaml b/diode/tvs_st_usblc6-2.yaml
similarity index 100%
rename from diode/diode_tvs_st_usblc6-2.yaml
rename to diode/tvs_st_usblc6-2.yaml
diff --git a/diode/diode_tvs_st_usblc6-4.yaml b/diode/tvs_st_usblc6-4.yaml
similarity index 100%
rename from diode/diode_tvs_st_usblc6-4.yaml
rename to diode/tvs_st_usblc6-4.yaml
diff --git a/display/display_lcd_i2cadapter.yaml b/display/lcd_i2cadapter.yaml
similarity index 100%
rename from display/display_lcd_i2cadapter.yaml
rename to display/lcd_i2cadapter.yaml
diff --git a/display/display_lcd_lcm1602.yaml b/display/lcd_lcm1602.yaml
similarity index 100%
rename from display/display_lcd_lcm1602.yaml
rename to display/lcd_lcm1602.yaml
diff --git a/display/display_oled_0.96in.yaml b/display/oled_0.96in.yaml
similarity index 100%
rename from display/display_oled_0.96in.yaml
rename to display/oled_0.96in.yaml
diff --git a/ic/ic_flash_winbond_w25q32bv.yaml b/ic/flash_winbond_w25q32bv.yaml
similarity index 100%
rename from ic/ic_flash_winbond_w25q32bv.yaml
rename to ic/flash_winbond_w25q32bv.yaml
diff --git a/ic/ic_io-expander_nxp_pcf8574.yaml b/ic/io-expander_nxp_pcf8574.yaml
similarity index 100%
rename from ic/ic_io-expander_nxp_pcf8574.yaml
rename to ic/io-expander_nxp_pcf8574.yaml
diff --git a/ic/ic_level-shifter_nxp_74alvc164245.yaml b/ic/level-shifter_nxp_74alvc164245.yaml
similarity index 100%
rename from ic/ic_level-shifter_nxp_74alvc164245.yaml
rename to ic/level-shifter_nxp_74alvc164245.yaml
diff --git a/ic/ic_multiplexer_ti_cd74hc4067.yaml b/ic/multiplexer_ti_cd74hc4067.yaml
similarity index 100%
rename from ic/ic_multiplexer_ti_cd74hc4067.yaml
rename to ic/multiplexer_ti_cd74hc4067.yaml
diff --git a/ic/ic_shift-register_nxp_74hc595.yaml b/ic/shift-register_nxp_74hc595.yaml
similarity index 100%
rename from ic/ic_shift-register_nxp_74hc595.yaml
rename to ic/shift-register_nxp_74hc595.yaml
diff --git a/ic/ic_usb-c_on_fusb302.yaml b/ic/usb-c_on_fusb302.yaml
similarity index 100%
rename from ic/ic_usb-c_on_fusb302.yaml
rename to ic/usb-c_on_fusb302.yaml
diff --git a/mcu/ic_mcu_cypress_cy8c54lp.yaml b/mcu/cypress_cy8c54lp.yaml
similarity index 100%
rename from mcu/ic_mcu_cypress_cy8c54lp.yaml
rename to mcu/cypress_cy8c54lp.yaml
diff --git a/mcu/ic_mcu_st_stm32f103xb-detailed.yaml b/mcu/st_stm32f103xb-detailed.yaml
similarity index 100%
rename from mcu/ic_mcu_st_stm32f103xb-detailed.yaml
rename to mcu/st_stm32f103xb-detailed.yaml
diff --git a/mcu/ic_mcu_st_stm32f103xb.yaml b/mcu/st_stm32f103xb.yaml
similarity index 100%
rename from mcu/ic_mcu_st_stm32f103xb.yaml
rename to mcu/st_stm32f103xb.yaml
diff --git a/mcu/ic_mcu_st_stm32f103xc.yaml b/mcu/st_stm32f103xc.yaml
similarity index 100%
rename from mcu/ic_mcu_st_stm32f103xc.yaml
rename to mcu/st_stm32f103xc.yaml
diff --git a/mcu/ic_mcu_st_stm32f401xc.yaml b/mcu/st_stm32f401xc.yaml
similarity index 100%
rename from mcu/ic_mcu_st_stm32f401xc.yaml
rename to mcu/st_stm32f401xc.yaml
diff --git a/mcu/ic_mcu_st_stm8s003x3-detailed.yaml b/mcu/st_stm8s003x3-detailed.yaml
similarity index 100%
rename from mcu/ic_mcu_st_stm8s003x3-detailed.yaml
rename to mcu/st_stm8s003x3-detailed.yaml
diff --git a/mcu/ic_mcu_st_stm8s003x3.yaml b/mcu/st_stm8s003x3.yaml
similarity index 100%
rename from mcu/ic_mcu_st_stm8s003x3.yaml
rename to mcu/st_stm8s003x3.yaml
diff --git a/mechanical/mechanical_button_6mm.yaml b/mechanical/button_6mm.yaml
similarity index 100%
rename from mechanical/mechanical_button_6mm.yaml
rename to mechanical/button_6mm.yaml
diff --git a/transistor/transistor_nmos_bss138.yaml b/transistor/nmos_bss138.yaml
similarity index 100%
rename from transistor/transistor_nmos_bss138.yaml
rename to transistor/nmos_bss138.yaml
diff --git a/transistor/transistor_pmos_nxp_bss84.yaml b/transistor/pmos_nxp_bss84.yaml
similarity index 100%
rename from transistor/transistor_pmos_nxp_bss84.yaml
rename to transistor/pmos_nxp_bss84.yaml
diff --git a/vreg/vreg_ldo_ams1117.yaml b/vreg/ldo_ams1117.yaml
similarity index 100%
rename from vreg/vreg_ldo_ams1117.yaml
rename to vreg/ldo_ams1117.yaml
diff --git a/vreg/vreg_ldo_microchip_mic5504.yaml b/vreg/ldo_microchip_mic5504.yaml
similarity index 100%
rename from vreg/vreg_ldo_microchip_mic5504.yaml
rename to vreg/ldo_microchip_mic5504.yaml
diff --git a/vreg/vreg_ldo_microne_me6211.yaml b/vreg/ldo_microne_me6211.yaml
similarity index 100%
rename from vreg/vreg_ldo_microne_me6211.yaml
rename to vreg/ldo_microne_me6211.yaml
diff --git a/vreg/vreg_ldo_torex_xc6206.yaml b/vreg/ldo_torex_xc6206.yaml
similarity index 100%
rename from vreg/vreg_ldo_torex_xc6206.yaml
rename to vreg/ldo_torex_xc6206.yaml
diff --git a/vreg/vreg_pmic_tpower_tp4056.yaml b/vreg/lipo-charger_tpower_tp4056.yaml
similarity index 100%
rename from vreg/vreg_pmic_tpower_tp4056.yaml
rename to vreg/lipo-charger_tpower_tp4056.yaml