diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/bin/eeprom.py b/device/arista/x86_64-arista_7050_qx32/plugins/eeprom.py
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/bin/eeprom.py
rename to device/arista/x86_64-arista_7050_qx32/plugins/eeprom.py
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/bin/sfputil.py b/device/arista/x86_64-arista_7050_qx32/plugins/sfputil.py
similarity index 100%
rename from device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/bin/sfputil.py
rename to device/arista/x86_64-arista_7050_qx32/plugins/sfputil.py
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/bin/eeprom.py b/device/dell/x86_64-dell_s6000_s1220-r0/plugins/eeprom.py
similarity index 100%
rename from device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/bin/eeprom.py
rename to device/dell/x86_64-dell_s6000_s1220-r0/plugins/eeprom.py
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/bin/sfputil.py b/device/dell/x86_64-dell_s6000_s1220-r0/plugins/sfputil.py
similarity index 100%
rename from device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/bin/sfputil.py
rename to device/dell/x86_64-dell_s6000_s1220-r0/plugins/sfputil.py
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/bin/sfputil.py b/device/dell/x86_64-dell_z9100_c2538-r0/plugins/sfputil.py
similarity index 100%
rename from device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/bin/sfputil.py
rename to device/dell/x86_64-dell_z9100_c2538-r0/plugins/sfputil.py
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/bin/eeprom.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/eeprom.py
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/bin/eeprom.py
rename to device/mellanox/x86_64-mlnx_msn2700-r0/plugins/eeprom.py
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/bin/sfputil.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
similarity index 100%
rename from device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/bin/sfputil.py
rename to device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py