diff --git a/includes/polling/altiga-ssl.inc.php b/includes/polling/altiga-ssl.inc.php
deleted file mode 100644
index e8ec9fe2ab..0000000000
--- a/includes/polling/altiga-ssl.inc.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-if ($device['os'] == 'asa' || $device['os'] == 'pix') {
-    echo "ALTIGA-MIB SSL VPN Statistics \n";
-
-    $tags = array();
-
-    $oids = array(
-        'alSslStatsTotalSessions',
-        'alSslStatsActiveSessions',
-        'alSslStatsMaxSessions',
-        'alSslStatsPreDecryptOctets',
-        'alSslStatsPostDecryptOctets',
-        'alSslStatsPreEncryptOctets',
-        'alSslStatsPostEncryptOctets',
-    );
-
-    $tags['rrd_def'] = array(
-        'DS:TotalSessions:COUNTER:600:U:100000',
-        'DS:ActiveSessions:GAUGE:600:0:U',
-        'DS:MaxSessions:GAUGE:600:0:U',
-        'DS:PreDecryptOctets:COUNTER:600:U:100000000000',
-        'DS:PostDecryptOctets:COUNTER:600:U:100000000000',
-        'DS:PreEncryptOctets:COUNTER:600:U:100000000000',
-        'DS:PostEncryptOctets:COUNTER:600:U:100000000000',
-    );
-
-    $data_array = snmpwalk_cache_oid($device, $proto, array(), 'ALTIGA-SSL-STATS-MIB');
-
-    $fields = array();
-
-    $got_value = false;
-    foreach ($oids as $oid) {
-        if (is_numeric($data_array[0][$oid])) {
-            $value = $data_array[0][$oid];
-            if ($value > 0) {
-                $got_value = true;
-            }
-        } else {
-            $value = '0';
-        }
-        $fields[$oid] = $value;
-    }
-
-    if ($got_value) {
-        data_update($device, 'altiga-ssl', $tags, $fields);
-    }
-
-    unset($tags, $fields, $oids, $data_array);
-}//end if
diff --git a/includes/polling/netstats.inc.php b/includes/polling/netstats.inc.php
index b6ba9c31aa..d50ca372dd 100644
--- a/includes/polling/netstats.inc.php
+++ b/includes/polling/netstats.inc.php
@@ -1,10 +1,10 @@
 <?php
 
-require 'netstats-ip.inc.php';
-require 'netstats-tcp.inc.php';
-require 'netstats-udp.inc.php';
-require 'netstats-icmp.inc.php';
-require 'netstats-snmp.inc.php';
-require 'netstats-ip_forward.inc.php';
+require 'netstats/netstats-ip.inc.php';
+require 'netstats/netstats-tcp.inc.php';
+require 'netstats/netstats-udp.inc.php';
+require 'netstats/netstats-icmp.inc.php';
+require 'netstats/netstats-snmp.inc.php';
+require 'netstats/netstats-ip_forward.inc.php';
 
 echo "\n";
diff --git a/includes/polling/netstats-icmp.inc.php b/includes/polling/netstats/netstats-icmp.inc.php
similarity index 100%
rename from includes/polling/netstats-icmp.inc.php
rename to includes/polling/netstats/netstats-icmp.inc.php
diff --git a/includes/polling/netstats-ip.inc.php b/includes/polling/netstats/netstats-ip.inc.php
similarity index 100%
rename from includes/polling/netstats-ip.inc.php
rename to includes/polling/netstats/netstats-ip.inc.php
diff --git a/includes/polling/netstats-ip_forward.inc.php b/includes/polling/netstats/netstats-ip_forward.inc.php
similarity index 100%
rename from includes/polling/netstats-ip_forward.inc.php
rename to includes/polling/netstats/netstats-ip_forward.inc.php
diff --git a/includes/polling/netstats-snmp.inc.php b/includes/polling/netstats/netstats-snmp.inc.php
similarity index 100%
rename from includes/polling/netstats-snmp.inc.php
rename to includes/polling/netstats/netstats-snmp.inc.php
diff --git a/includes/polling/netstats-tcp.inc.php b/includes/polling/netstats/netstats-tcp.inc.php
similarity index 100%
rename from includes/polling/netstats-tcp.inc.php
rename to includes/polling/netstats/netstats-tcp.inc.php
diff --git a/includes/polling/netstats-udp.inc.php b/includes/polling/netstats/netstats-udp.inc.php
similarity index 100%
rename from includes/polling/netstats-udp.inc.php
rename to includes/polling/netstats/netstats-udp.inc.php
diff --git a/includes/polling/netscaler-stats.inc.php b/includes/polling/os/misc/netscaler-stats.inc.php
similarity index 100%
rename from includes/polling/netscaler-stats.inc.php
rename to includes/polling/os/misc/netscaler-stats.inc.php
diff --git a/includes/polling/os/netscaler.inc.php b/includes/polling/os/netscaler.inc.php
index d1677471e7..103b721b12 100644
--- a/includes/polling/os/netscaler.inc.php
+++ b/includes/polling/os/netscaler.inc.php
@@ -10,4 +10,4 @@ list($version,$features) = explode(':', $version);
 list(,$version)          = explode(' ', $version);
 list($features)          = explode(',', trim($features));
 
-require 'includes/polling/netscaler-stats.inc.php';
+require 'includes/polling/os/misc/netscaler-stats.inc.php';
diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index aa5ac09bbe..98a4f40f1a 100644
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -679,22 +679,17 @@ foreach ($ports as $port) {
         // End Update PAgP
         // Do EtherLike-MIB
         if ($config['enable_ports_etherlike']) {
-            include 'port-etherlike.inc.php';
+            include 'ports/port-etherlike.inc.php';
         }
 
         // Do ADSL MIB
         if ($config['enable_ports_adsl']) {
-            include 'port-adsl.inc.php';
+            include 'ports/port-adsl.inc.php';
         }
 
         // Do PoE MIBs
         if ($config['enable_ports_poe']) {
-            include 'port-poe.inc.php';
-        }
-
-        // Do Alcatel Detailed Stats
-        if ($device['os'] == 'aos') {
-            include 'port-alcatel.inc.php';
+            include 'ports/port-poe.inc.php';
         }
 
         foreach ($port['update'] as $key => $val_check) {
diff --git a/includes/polling/port-adsl.inc.php b/includes/polling/ports/port-adsl.inc.php
similarity index 100%
rename from includes/polling/port-adsl.inc.php
rename to includes/polling/ports/port-adsl.inc.php
diff --git a/includes/polling/port-etherlike.inc.php b/includes/polling/ports/port-etherlike.inc.php
similarity index 100%
rename from includes/polling/port-etherlike.inc.php
rename to includes/polling/ports/port-etherlike.inc.php
diff --git a/includes/polling/port-poe.inc.php b/includes/polling/ports/port-poe.inc.php
similarity index 100%
rename from includes/polling/port-poe.inc.php
rename to includes/polling/ports/port-poe.inc.php
diff --git a/includes/polling/test.inc.php b/includes/polling/test.inc.php
deleted file mode 100644
index 3cfa2b173b..0000000000
--- a/includes/polling/test.inc.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-print_r(snmpwalk_cache_oid($device, 'system', array()));
-
-print_r(snmp_cache_oid('system', $device, array()));