diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 3e8593b800..d9463da8e6 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -375,17 +375,7 @@ $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
 // Calix E7
 $os = 'calix';
-$config['os'][$os]['text']             = 'Calix E7';
-$config['os'][$os]['type']             = 'network';
-$config['os'][$os]['ifname']           = 1;
-$config['os'][$os]['empty_ifdescr']    = 1;
-$config['os'][$os]['icon']             = 'calix';
-$config['os'][$os]['over'][0]['graph'] = 'device_bits';
-$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
-
-// Calix E5
-$os = 'calix-e5';
-$config['os'][$os]['text']             = 'Calix E5';
+$config['os'][$os]['text']             = 'Calix';
 $config['os'][$os]['type']             = 'network';
 $config['os'][$os]['ifname']           = 1;
 $config['os'][$os]['empty_ifdescr']    = 1;
diff --git a/includes/discovery/os/calix.inc.php b/includes/discovery/os/calix.inc.php
index aa7511ca83..d636f79d78 100644
--- a/includes/discovery/os/calix.inc.php
+++ b/includes/discovery/os/calix.inc.php
@@ -6,7 +6,7 @@ if (!$os) {
     if (strstr($sysObjectId, '.6066.1.44')) {
         $os = 'calix';
     }
-    if (strstr($sysObjectId, '.6321.1.2.3')) {
-        $os = 'calix-e5';
+    if (strstr($sysObjectId, '.6321.1.2.3')) { // E5-1xx
+        $os = 'calix';
     }
 }
diff --git a/includes/discovery/sensors/temperatures/calix-e5.inc.php b/includes/discovery/sensors/temperatures/calix.inc.php
similarity index 90%
rename from includes/discovery/sensors/temperatures/calix-e5.inc.php
rename to includes/discovery/sensors/temperatures/calix.inc.php
index 4678fb6881..2651d384d4 100644
--- a/includes/discovery/sensors/temperatures/calix-e5.inc.php
+++ b/includes/discovery/sensors/temperatures/calix.inc.php
@@ -13,11 +13,11 @@
  */
 
 
-if ($device['os'] == 'calix-e5') {
+if (strstr($sysObjectId, '.6321.1.2.3')) { // E5-1xx Series
     echo 'Calix E5: ';
 
     if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.4') !== false) { // E5-121
-        $oids = snmp_walk($device, 'iesSysTempCurValue', '-Osqn', 'E5-121-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix-e5');
+        $oids = snmp_walk($device, 'iesSysTempCurValue', '-Osqn', 'E5-121-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
         $oids = trim($oids);
         $oids = str_replace('.1.3.6.1.4.1.6321.1.2.3.4.98.2.3.1.2.', '', $oids);
         foreach (explode("\n", $oids) as $data) {
@@ -31,13 +31,13 @@ if ($device['os'] == 'calix-e5') {
                 $descr = str_replace('"', '', $descr);
                 $current = $temperature;
 
-                discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix-e5', $descr, '1', '1', null, null, null, null, $current);
+                discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current);
             }
         }
     }
 
     if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.3') !== false) { // E5-120
-        $oids = snmp_walk($device, 'iesSysTempCurValue', '-Osqn', 'E5-120-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix-e5');
+        $oids = snmp_walk($device, 'iesSysTempCurValue', '-Osqn', 'E5-120-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
         $oids = trim($oids);
         $oids = str_replace('.1.3.6.1.4.1.6321.1.2.3.3.98.2.3.1.2.', '', $oids);
         foreach (explode("\n", $oids) as $data) {
@@ -51,14 +51,14 @@ if ($device['os'] == 'calix-e5') {
                 $descr = str_replace('"', '', $descr);
                 $current = $temperature;
 
-                discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix-e5', $descr, '1', '1', null, null, null, null, $current);
+                discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current);
             }
         }
     }
 
 
     if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.2') !== false) { // E5-111
-        $oids = snmp_walk($device, 'iesSysTempCurValue', '-Osqn', 'E5-111-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix-e5');
+        $oids = snmp_walk($device, 'iesSysTempCurValue', '-Osqn', 'E5-111-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
         $oids = trim($oids);
         $oids = str_replace('.1.3.6.1.4.1.6321.1.2.3.2.98.2.3.1.2.', '', $oids);
         foreach (explode("\n", $oids) as $data) {
@@ -72,13 +72,13 @@ if ($device['os'] == 'calix-e5') {
                 $descr = str_replace('"', '', $descr);
                 $current = $temperature;
 
-                discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix-e5', $descr, '1', '1', null, null, null, null, $current);
+                discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current);
             }
         }
     }
 
     if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.1') !== false) { // E5-110
-        $oids = snmp_walk($device, 'iesSysTempCurValue', '-Osqn', 'E5-110-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix-e5');
+        $oids = snmp_walk($device, 'iesSysTempCurValue', '-Osqn', 'E5-110-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
         $oids = trim($oids);
         $oids = str_replace('.1.3.6.1.4.1.6321.1.2.3.1.98.2.3.1.2.', '', $oids);
         foreach (explode("\n", $oids) as $data) {
@@ -92,7 +92,7 @@ if ($device['os'] == 'calix-e5') {
                 $descr = str_replace('"', '', $descr);
                 $current = $temperature;
 
-                discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix-e5', $descr, '1', '1', null, null, null, null, $current);
+                discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current);
             }
         }
     }
diff --git a/includes/polling/os/calix.inc.php b/includes/polling/os/calix.inc.php
index 638d139418..80af61258e 100644
--- a/includes/polling/os/calix.inc.php
+++ b/includes/polling/os/calix.inc.php
@@ -1,4 +1,73 @@
 <?php
+
+/*
+ * E5-1xx portion of LibreNMS Calix OS Polling module
+ *
+ * Copyright (c) 2016 Chris A. Evans <thecityofguanyu@outlook.com>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+
+
+if (strstr($sysObjectId, '.6321.1.2.3')) { // E5-1xx Series
+
+    if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.4') !== false) { // E5-121
+
+        $version = snmp_get($device, 'iesSlotModuleFWVersion.0.0', '-Oqv', '+E5-121-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $hardware = snmp_get($device, 'iesSlotModuleDescr.0.0', '-Ovqs', '+E5-121-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $serial   = snmp_get($device, 'iesChassisSerialNumber.0', '-OQv', '+E5-121-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $features       = '';
+
+        $version = str_replace('"', '', $version);
+        $serial = str_replace('"', '', $serial);
+        $hardware = str_replace('"', '', $hardware);
+
+    }
+
+    if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.3') !== false) { // E5-120
+
+        $version = snmp_get($device, 'iesSlotModuleFWVersion.0.0', '-Oqv', '+E5-120-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $hardware = snmp_get($device, 'iesSlotModuleDescr.0.0', '-Ovqs', '+E5-120-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $serial   = snmp_get($device, 'iesChassisSerialNumber.0', '-OQv', '+E5-120-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $features       = '';
+
+        $version = str_replace('"', '', $version);
+        $serial = str_replace('"', '', $serial);
+        $hardware = str_replace('"', '', $hardware);
+
+    }
+
+    if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.2') !== false) { // E5-111
+
+        $version = snmp_get($device, 'iesSlotModuleFWVersion.0.0', '-Oqv', '+E5-111-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $hardware = snmp_get($device, 'iesSlotModuleDescr.0.0', '-Ovqs', '+E5-111-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $serial   = snmp_get($device, 'iesChassisSerialNumber.0', '-OQv', '+E5-111-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $features       = '';
+
+        $version = str_replace('"', '', $version);
+        $serial = str_replace('"', '', $serial);
+        $hardware = str_replace('"', '', $hardware);
+
+    }
+
+    if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.1') !== false) { // E5-110
+
+        $version = snmp_get($device, 'iesSlotModuleFWVersion.0.0', '-Oqv', '+E5-110-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $hardware = snmp_get($device, 'iesSlotModuleDescr.0.0', '-Ovqs', '+E5-110-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $serial   = snmp_get($device, 'iesChassisSerialNumber.0', '-OQv', '+E5-110-IESCOMMON-MIB', '+'.$config['install_dir'].'/mibs/calix');
+        $features       = '';
+
+        $version = str_replace('"', '', $version);
+        $serial = str_replace('"', '', $serial);
+        $hardware = str_replace('"', '', $hardware);
+    }
+}
+
 // Device might not have a card 1 (or even card2 if it is an E7-20)
 $version = strtok(snmp_walk($device, "e7CardSoftwareVersion.1", "-OQv", "E7-Calix-MIB"), PHP_EOL);
 $hardware = "Calix " . $poll_device['sysDescr'];
diff --git a/mibs/calix-e5/E5-110-AESCOMMON-MIB.mib b/mibs/calix/E5-110-AESCOMMON-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-110-AESCOMMON-MIB.mib
rename to mibs/calix/E5-110-AESCOMMON-MIB.mib
diff --git a/mibs/calix-e5/E5-110-AS-ATM-MIB.mib b/mibs/calix/E5-110-AS-ATM-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-110-AS-ATM-MIB.mib
rename to mibs/calix/E5-110-AS-ATM-MIB.mib
diff --git a/mibs/calix-e5/E5-110-IESCOMMON-MIB.mib b/mibs/calix/E5-110-IESCOMMON-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-110-IESCOMMON-MIB.mib
rename to mibs/calix/E5-110-IESCOMMON-MIB.mib
diff --git a/mibs/calix-e5/E5-110-MIB.mib b/mibs/calix/E5-110-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-110-MIB.mib
rename to mibs/calix/E5-110-MIB.mib
diff --git a/mibs/calix-e5/E5-110-TRAPS-MIB.mib b/mibs/calix/E5-110-TRAPS-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-110-TRAPS-MIB.mib
rename to mibs/calix/E5-110-TRAPS-MIB.mib
diff --git a/mibs/calix-e5/E5-111 alarm.xls b/mibs/calix/E5-111 alarm.xls
similarity index 100%
rename from mibs/calix-e5/E5-111 alarm.xls
rename to mibs/calix/E5-111 alarm.xls
diff --git a/mibs/calix-e5/E5-111-AESCOMMON-MIB.mib b/mibs/calix/E5-111-AESCOMMON-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-111-AESCOMMON-MIB.mib
rename to mibs/calix/E5-111-AESCOMMON-MIB.mib
diff --git a/mibs/calix-e5/E5-111-AS-ATM-MIB.mib b/mibs/calix/E5-111-AS-ATM-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-111-AS-ATM-MIB.mib
rename to mibs/calix/E5-111-AS-ATM-MIB.mib
diff --git a/mibs/calix-e5/E5-111-IESCOMMON-MIB.mib b/mibs/calix/E5-111-IESCOMMON-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-111-IESCOMMON-MIB.mib
rename to mibs/calix/E5-111-IESCOMMON-MIB.mib
diff --git a/mibs/calix-e5/E5-111-MIB.mib b/mibs/calix/E5-111-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-111-MIB.mib
rename to mibs/calix/E5-111-MIB.mib
diff --git a/mibs/calix-e5/E5-111-TRAPS-MIB.mib b/mibs/calix/E5-111-TRAPS-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-111-TRAPS-MIB.mib
rename to mibs/calix/E5-111-TRAPS-MIB.mib
diff --git a/mibs/calix-e5/E5-120-AS-ATM-MIB.mib b/mibs/calix/E5-120-AS-ATM-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-120-AS-ATM-MIB.mib
rename to mibs/calix/E5-120-AS-ATM-MIB.mib
diff --git a/mibs/calix-e5/E5-120-IESCOMMON-MIB.mib b/mibs/calix/E5-120-IESCOMMON-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-120-IESCOMMON-MIB.mib
rename to mibs/calix/E5-120-IESCOMMON-MIB.mib
diff --git a/mibs/calix-e5/E5-120-MIB.mib b/mibs/calix/E5-120-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-120-MIB.mib
rename to mibs/calix/E5-120-MIB.mib
diff --git a/mibs/calix-e5/E5-120-TRAPS-MIB.mib b/mibs/calix/E5-120-TRAPS-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-120-TRAPS-MIB.mib
rename to mibs/calix/E5-120-TRAPS-MIB.mib
diff --git a/mibs/calix-e5/E5-121-AS-ATM-MIB.mib b/mibs/calix/E5-121-AS-ATM-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-121-AS-ATM-MIB.mib
rename to mibs/calix/E5-121-AS-ATM-MIB.mib
diff --git a/mibs/calix-e5/E5-121-IESCOMMON-MIB.mib b/mibs/calix/E5-121-IESCOMMON-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-121-IESCOMMON-MIB.mib
rename to mibs/calix/E5-121-IESCOMMON-MIB.mib
diff --git a/mibs/calix-e5/E5-121-MIB.mib b/mibs/calix/E5-121-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-121-MIB.mib
rename to mibs/calix/E5-121-MIB.mib
diff --git a/mibs/calix-e5/E5-121-TRAPS-MIB.mib b/mibs/calix/E5-121-TRAPS-MIB.mib
similarity index 100%
rename from mibs/calix-e5/E5-121-TRAPS-MIB.mib
rename to mibs/calix/E5-121-TRAPS-MIB.mib
diff --git a/mibs/calix-e5/HCNUM-TC[rfc2856].mib b/mibs/calix/HCNUM-TC[rfc2856].mib
similarity index 100%
rename from mibs/calix-e5/HCNUM-TC[rfc2856].mib
rename to mibs/calix/HCNUM-TC[rfc2856].mib
diff --git a/mibs/calix-e5/MIB_ALARM_E5-110_implementation_table.xls b/mibs/calix/MIB_ALARM_E5-110_implementation_table.xls
similarity index 100%
rename from mibs/calix-e5/MIB_ALARM_E5-110_implementation_table.xls
rename to mibs/calix/MIB_ALARM_E5-110_implementation_table.xls
diff --git a/mibs/calix-e5/MIB_ALARM_E5-111_implementation_table.xls b/mibs/calix/MIB_ALARM_E5-111_implementation_table.xls
similarity index 100%
rename from mibs/calix-e5/MIB_ALARM_E5-111_implementation_table.xls
rename to mibs/calix/MIB_ALARM_E5-111_implementation_table.xls
diff --git a/mibs/calix-e5/MIB_ALARM_E5-121_implementation_table.xls b/mibs/calix/MIB_ALARM_E5-121_implementation_table.xls
similarity index 100%
rename from mibs/calix-e5/MIB_ALARM_E5-121_implementation_table.xls
rename to mibs/calix/MIB_ALARM_E5-121_implementation_table.xls
diff --git a/mibs/calix-e5/RFC-3728.mib b/mibs/calix/RFC-3728.mib
similarity index 100%
rename from mibs/calix-e5/RFC-3728.mib
rename to mibs/calix/RFC-3728.mib
diff --git a/mibs/calix-e5/RFC3705-MIB.mib b/mibs/calix/RFC3705-MIB.mib
similarity index 100%
rename from mibs/calix-e5/RFC3705-MIB.mib
rename to mibs/calix/RFC3705-MIB.mib