diff --git a/includes/definitions/ddnos.yaml b/includes/definitions/ddnos.yaml
index 0d25b2271e..02f914585a 100644
--- a/includes/definitions/ddnos.yaml
+++ b/includes/definitions/ddnos.yaml
@@ -2,6 +2,7 @@ os: ddnos
 text: 'DDN Storage'
 type: storage
 icon: ddn
+mib_dir: ddn
 over:
     - { graph: device_bits, text: 'Device Traffic' }
     - { graph: device_processor, text: 'Processor Usage' }
diff --git a/includes/definitions/radwin.yaml b/includes/definitions/radwin.yaml
index aacc9be15e..d315d2b206 100644
--- a/includes/definitions/radwin.yaml
+++ b/includes/definitions/radwin.yaml
@@ -1,6 +1,7 @@
 os: radwin
 text: RADWIN
 type: wireless
+mib_dir: radwin
 icon: radwin
 over:
     - { graph: device_bits, text: 'Device Traffic' }
diff --git a/mibs/TELESYN-ATI-TC b/mibs/allied/TELESYN-ATI-TC
similarity index 100%
rename from mibs/TELESYN-ATI-TC
rename to mibs/allied/TELESYN-ATI-TC
diff --git a/mibs/allied/mib_info.txt b/mibs/allied/mib_info.txt
deleted file mode 100644
index 84ea683ca6..0000000000
--- a/mibs/allied/mib_info.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This folder contains MIBs for legacy Allied Telesis products. 
-
-This includes:
-- Alliedware
--- AT-x-MIB files
-- Alliedware Plus version 2
--- AtiEdgeSwitch-MIB
--- AtiL2-MIB
--- AtiStackInfo-MIB
--- AtiSwitch-MIB
-
-Alliedware Plus version 5.x.x mibs can be found under "mibs/awplus"
\ No newline at end of file
diff --git a/mibs/DataAire-dap4-al-MIB b/mibs/dataaire/DataAire-dap4-al-MIB
similarity index 100%
rename from mibs/DataAire-dap4-al-MIB
rename to mibs/dataaire/DataAire-dap4-al-MIB
diff --git a/mibs/SFA-INFO b/mibs/ddn/SFA-INFO
similarity index 100%
rename from mibs/SFA-INFO
rename to mibs/ddn/SFA-INFO
diff --git a/mibs/MIB-DELL-10892 b/mibs/dell/MIB-Dell-10892
similarity index 100%
rename from mibs/MIB-DELL-10892
rename to mibs/dell/MIB-Dell-10892
diff --git a/mibs/RADWIN-MIB-WINLINK1000 b/mibs/radwin/RADWIN-MIB-WINLINK1000
similarity index 100%
rename from mibs/RADWIN-MIB-WINLINK1000
rename to mibs/radwin/RADWIN-MIB-WINLINK1000
diff --git a/mibs/SYNSO-UPSMIB b/mibs/synso/SYNSO-UPSMIB
similarity index 100%
rename from mibs/SYNSO-UPSMIB
rename to mibs/synso/SYNSO-UPSMIB