diff --git a/dibi/Nette/DibiNetteExtension.php b/dibi/bridges/Nette/DibiNette20Extension.php
similarity index 90%
rename from dibi/Nette/DibiNetteExtension.php
rename to dibi/bridges/Nette/DibiNette20Extension.php
index 90721065..87eb2470 100644
--- a/dibi/Nette/DibiNetteExtension.php
+++ b/dibi/bridges/Nette/DibiNette20Extension.php
@@ -12,13 +12,13 @@
 
 
 /**
- * Dibi extension for Nette Framework. Creates 'connection' service.
+ * Dibi extension for Nette Framework 2.0. Creates 'connection' service.
  *
  * @author     David Grudl
  * @package    dibi\nette
  * @phpversion 5.3
  */
-class DibiNetteExtension extends Nette\Config\CompilerExtension
+class DibiNette20Extension extends Nette\Config\CompilerExtension
 {
 
 	public function loadConfiguration()
diff --git a/dibi/Nette/DibiNettePanel.php b/dibi/bridges/Nette/DibiNettePanel.php
similarity index 100%
rename from dibi/Nette/DibiNettePanel.php
rename to dibi/bridges/Nette/DibiNettePanel.php
diff --git a/dibi/dibi.php b/dibi/dibi.php
index b012ad03..11d90e58 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -39,7 +39,7 @@ require_once dirname(__FILE__) . '/libs/DibiEvent.php';
 require_once dirname(__FILE__) . '/libs/DibiFileLogger.php';
 require_once dirname(__FILE__) . '/libs/DibiFirePhpLogger.php';
 if (interface_exists('Nette\Diagnostics\IBarPanel') || interface_exists('IBarPanel')) {
-	require_once dirname(__FILE__) . '/Nette/DibiNettePanel.php';
+	require_once dirname(__FILE__) . '/bridges/Nette/DibiNettePanel.php';
 }