diff --git a/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604.yml b/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604.yml
similarity index 100%
rename from mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604.yml
rename to mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604.yml
diff --git a/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604_BB.svg b/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604_BB.svg
similarity index 100%
rename from mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604_BB.svg
rename to mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604/HT_150R_SiPPP_L500_100OHM_DUMMY_QY_202604_BB.svg
diff --git a/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_SiPPP_L500_100OHM_QY_202604/HT_150R_SiPPP_L500_100OHM_QY_202604.yml b/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_SiPPP_L500_100OHM_QY_202604/HT_150R_SiPPP_L500_100OHM_QY_202604.yml
similarity index 100%
rename from mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_SiPPP_L500_100OHM_QY_202604/HT_150R_SiPPP_L500_100OHM_QY_202604.yml
rename to mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_SiPPP_L500_100OHM_QY_202604/HT_150R_SiPPP_L500_100OHM_QY_202604.yml
diff --git a/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_SiPPP_L500_100OHM_QY_202604/HT_150R_SiPPP_L500_100OHM_QY_202604_BB.svg b/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_SiPPP_L500_100OHM_QY_202604/HT_150R_SiPPP_L500_100OHM_QY_202604_BB.svg
similarity index 100%
rename from mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_SiPPP_L500_100OHM_QY_202604/HT_150R_SiPPP_L500_100OHM_QY_202604_BB.svg
rename to mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_SiPPP_L500_100OHM_QY_202604/HT_150R_SiPPP_L500_100OHM_QY_202604_BB.svg
diff --git a/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_TiN_L200_200OHM_QY_202604/HT_150R_TiN_L200_200OHM_QY_202604.yml b/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_TiN_L200_200OHM_QY_202604/HT_150R_TiN_L200_200OHM_QY_202604.yml
similarity index 100%
rename from mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_TiN_L200_200OHM_QY_202604/HT_150R_TiN_L200_200OHM_QY_202604.yml
rename to mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_TiN_L200_200OHM_QY_202604/HT_150R_TiN_L200_200OHM_QY_202604.yml
diff --git a/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_TiN_L200_200OHM_QY_202604/HT_150R_TiN_L200_200OHM_QY_202604_BB.svg b/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_TiN_L200_200OHM_QY_202604/HT_150R_TiN_L200_200OHM_QY_202604_BB.svg
similarity index 100%
rename from mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_TiN_L200_200OHM_QY_202604/HT_150R_TiN_L200_200OHM_QY_202604_BB.svg
rename to mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_TiN_L200_200OHM_QY_202604/HT_150R_TiN_L200_200OHM_QY_202604_BB.svg
diff --git a/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604.yml b/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604.yml
similarity index 100%
rename from mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604.yml
rename to mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604.yml
diff --git a/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604_BB.svg b/mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604_BB.svg
similarity index 100%
rename from mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/heaters/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604_BB.svg
rename to mxpic/PDKs/Silterra/EMO1_2ML_CU_Al_RDL/primitives/waveguides/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604/HT_150R_TiN_L500_200OHM_DUMMY_QY_202604_BB.svg