diff --git a/modules.defs b/modules.defs
index 056d4e9..1e6b26a 100644
--- a/modules.defs
+++ b/modules.defs
@@ -46,16 +46,6 @@
     '//protocols/isis/isisio:onos-protocols-isis-isisio',
 
     '//drivers/utilities:onos-drivers-utilities',
-    '//drivers/bti:onos-drivers-bti-oar',
-    '//drivers/ciena:onos-drivers-ciena-oar',
-    '//drivers/cisco:onos-drivers-cisco-oar',
-    '//drivers/default:onos-drivers-default-oar',
-    '//drivers/fujitsu:onos-drivers-fujitsu-oar',
-    '//drivers/lumentum:onos-drivers-lumentum-oar',
-    '//drivers/netconf:onos-drivers-netconf-oar',
-    '//drivers/ovsdb:onos-drivers-ovsdb-oar',
-    '//drivers/optical:onos-drivers-optical-oar',
-    '//drivers/arista:onos-drivers-arista-oar',
 
     '//providers/netconf/device:onos-providers-netconf-device',
     '//providers/openflow/device:onos-providers-openflow-device',
@@ -77,7 +67,15 @@
 ONOS_DRIVERS = [
     # Drivers
     '//drivers/default:onos-drivers-default-oar',
+    '//drivers/arista:onos-drivers-arista-oar',
+    '//drivers/bti:onos-drivers-bti-oar',
+    '//drivers/ciena:onos-drivers-ciena-oar',
+    '//drivers/cisco:onos-drivers-cisco-oar',
     '//drivers/corsa:onos-drivers-corsa-oar',
+    '//drivers/fujitsu:onos-drivers-fujitsu-oar',
+    '//drivers/lumentum:onos-drivers-lumentum-oar',
+    '//drivers/netconf:onos-drivers-netconf-oar',
+    '//drivers/optical:onos-drivers-optical-oar',
     '//drivers/ovsdb:onos-drivers-ovsdb-oar',
 ]