diff --git a/includes/discovery/vlans.inc.php b/includes/discovery/vlans.inc.php
index a81793df4d..dda66d1f15 100644
--- a/includes/discovery/vlans.inc.php
+++ b/includes/discovery/vlans.inc.php
@@ -12,8 +12,8 @@ foreach($vlans_db_raw as $vlan_db)
 /// Create an empty array to record what VLANs we discover this session.
 $device['vlans'] = array();
 
-include("includes/discovery/q-bridge-mib.inc.php");
-include("includes/discovery/cisco-vlans.inc.php");
+include("includes/discovery/vlans/q-bridge-mib.inc.php");
+include("includes/discovery/vlans/cisco-vtp.inc.php");
 
 /// Fetch switchport <> VLAN relationships. This is DIRTY.
 foreach ($device['vlans'] as $domain_id => $vlans)
diff --git a/includes/discovery/cisco-vlans.inc.php b/includes/discovery/vlans/cisco-vtp.inc.php
similarity index 100%
rename from includes/discovery/cisco-vlans.inc.php
rename to includes/discovery/vlans/cisco-vtp.inc.php
diff --git a/includes/discovery/q-bridge-mib.inc.php b/includes/discovery/vlans/q-bridge-mib.inc.php
similarity index 100%
rename from includes/discovery/q-bridge-mib.inc.php
rename to includes/discovery/vlans/q-bridge-mib.inc.php