diff --git a/dibi/Nette/DibiNetteExtension.php b/dibi/Nette/DibiNetteExtension.php
index 200a6dda..a19f5803 100644
--- a/dibi/Nette/DibiNetteExtension.php
+++ b/dibi/Nette/DibiNetteExtension.php
@@ -15,6 +15,7 @@
  * Dibi extension for Nette Framework. Creates 'connection' service.
  *
  * @author     David Grudl
+ * @package    dibi\nette
  * @phpversion 5.3
  */
 class DibiNetteExtension extends Nette\Config\CompilerExtension
diff --git a/dibi/Nette/DibiNettePanel.php b/dibi/Nette/DibiNettePanel.php
index 70167504..d533b8d8 100644
--- a/dibi/Nette/DibiNettePanel.php
+++ b/dibi/Nette/DibiNettePanel.php
@@ -21,6 +21,7 @@ if (interface_exists('Nette\Diagnostics\IBarPanel')) {
  * Dibi panel for Nette\Diagnostics.
  *
  * @author     David Grudl
+ * @package    dibi\nette
  */
 class DibiNettePanel extends DibiObject implements IBarPanel
 {
diff --git a/dibi/dibi.php b/dibi/dibi.php
index 4f5f2dea..969a0511 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -66,6 +64,7 @@ class DibiVariable extends DibiDateTime
  * store connections info.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 class dibi
 {
diff --git a/dibi/drivers/firebird.php b/dibi/drivers/firebird.php
index 60198279..8c9cda2c 100644
--- a/dibi/drivers/firebird.php
+++ b/dibi/drivers/firebird.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/mssql.php b/dibi/drivers/mssql.php
index bacd1eff..3bb1ebda 100644
--- a/dibi/drivers/mssql.php
+++ b/dibi/drivers/mssql.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/mssql2005.php b/dibi/drivers/mssql2005.php
index d832fef6..b5da3008 100644
--- a/dibi/drivers/mssql2005.php
+++ b/dibi/drivers/mssql2005.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index b59ef4b1..0762c415 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/mysql.reflector.php b/dibi/drivers/mysql.reflector.php
index 107b1a6f..e4c18b53 100644
--- a/dibi/drivers/mysql.reflector.php
+++ b/dibi/drivers/mysql.reflector.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php
index 82991c5e..a469b660 100644
--- a/dibi/drivers/mysqli.php
+++ b/dibi/drivers/mysqli.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/odbc.php b/dibi/drivers/odbc.php
index 14e19d64..1d868f0b 100644
--- a/dibi/drivers/odbc.php
+++ b/dibi/drivers/odbc.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/oracle.php b/dibi/drivers/oracle.php
index a74b42f0..0b7e6778 100644
--- a/dibi/drivers/oracle.php
+++ b/dibi/drivers/oracle.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php
index 127cdeab..8c7b282b 100644
--- a/dibi/drivers/pdo.php
+++ b/dibi/drivers/pdo.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/postgre.php b/dibi/drivers/postgre.php
index 5733bdf0..445a603b 100644
--- a/dibi/drivers/postgre.php
+++ b/dibi/drivers/postgre.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/sqlite.php b/dibi/drivers/sqlite.php
index e4f2e804..d48ed4cb 100644
--- a/dibi/drivers/sqlite.php
+++ b/dibi/drivers/sqlite.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/sqlite.reflector.php b/dibi/drivers/sqlite.reflector.php
index 5313b158..9af4edf9 100644
--- a/dibi/drivers/sqlite.reflector.php
+++ b/dibi/drivers/sqlite.reflector.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/drivers/sqlite3.php b/dibi/drivers/sqlite3.php
index 2bc1ad72..2bf9f8ee 100644
--- a/dibi/drivers/sqlite3.php
+++ b/dibi/drivers/sqlite3.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\drivers
  */
 
 
diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php
index 74b956c1..80ae4751 100644
--- a/dibi/libs/DibiConnection.php
+++ b/dibi/libs/DibiConnection.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -17,6 +15,7 @@
  * dibi connection.
  *
  * @author     David Grudl
+ * @package    dibi
  *
  * @property-read bool $connected
  * @property-read mixed $config
diff --git a/dibi/libs/DibiDataSource.php b/dibi/libs/DibiDataSource.php
index 972f167b..1fe6ceb4 100644
--- a/dibi/libs/DibiDataSource.php
+++ b/dibi/libs/DibiDataSource.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -17,6 +15,7 @@
  * Default implementation of IDataSource for dibi.
  *
  * @author     David Grudl
+ * @package    dibi
  *
  * @property-read DibiConnection $connection
  * @property-read DibiResult $result
diff --git a/dibi/libs/DibiDatabaseInfo.php b/dibi/libs/DibiDatabaseInfo.php
index 9d3204aa..bca1930f 100644
--- a/dibi/libs/DibiDatabaseInfo.php
+++ b/dibi/libs/DibiDatabaseInfo.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\reflection
  */
 
 
@@ -17,6 +15,7 @@
  * Reflection metadata class for a database.
  *
  * @author     David Grudl
+ * @package    dibi\reflection
  *
  * @property-read string $name
  * @property-read array $tables
@@ -131,6 +130,7 @@ class DibiDatabaseInfo extends DibiObject
  * Reflection metadata class for a database table.
  *
  * @author     David Grudl
+ * @package    dibi\reflection
  *
  * @property-read string $name
  * @property-read bool $view
@@ -337,6 +337,7 @@ class DibiTableInfo extends DibiObject
  * Reflection metadata class for a result set.
  *
  * @author     David Grudl
+ * @package    dibi\reflection
  *
  * @property-read array $columns
  * @property-read array $columnNames
@@ -441,6 +442,7 @@ class DibiResultInfo extends DibiObject
  * Reflection metadata class for a table or result set column.
  *
  * @author     David Grudl
+ * @package    dibi\reflection
  *
  * @property-read string $name
  * @property-read string $fullName
@@ -647,6 +649,7 @@ class DibiColumnInfo extends DibiObject
  * Reflection metadata class for a foreign key.
  *
  * @author     David Grudl
+ * @package    dibi\reflection
  * @todo
  *
  * @property-read string $name
@@ -697,6 +700,7 @@ class DibiForeignKeyInfo extends DibiObject
  * Reflection metadata class for a index or primary key.
  *
  * @author     David Grudl
+ * @package    dibi\reflection
  *
  * @property-read string $name
  * @property-read array $columns
diff --git a/dibi/libs/DibiDateTime.php b/dibi/libs/DibiDateTime.php
index a06cfce3..c5ed4987 100644
--- a/dibi/libs/DibiDateTime.php
+++ b/dibi/libs/DibiDateTime.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -17,6 +15,7 @@
  * DateTime with serialization and timestamp support for PHP 5.2.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 class DibiDateTime extends DateTime
 {
diff --git a/dibi/libs/DibiEvent.php b/dibi/libs/DibiEvent.php
index 58678951..34716618 100644
--- a/dibi/libs/DibiEvent.php
+++ b/dibi/libs/DibiEvent.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -17,6 +15,7 @@
  * Profiler & logger event.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 class DibiEvent
 {
diff --git a/dibi/libs/DibiException.php b/dibi/libs/DibiException.php
index dd478def..309c8d26 100644
--- a/dibi/libs/DibiException.php
+++ b/dibi/libs/DibiException.php
@@ -7,24 +7,15 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi\exceptions
  */
 
 
 
-class DibiNotImplementedException extends LogicException
-{}
-
-class DibiNotSupportedException extends LogicException
-{}
-
-
-
 /**
  * dibi common exception.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 class DibiException extends Exception
 {
@@ -73,6 +64,7 @@ class DibiException extends Exception
  * database server exception.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 class DibiDriverException extends DibiException
 {
@@ -138,6 +130,7 @@ class DibiDriverException extends DibiException
  * PCRE exception.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 class DibiPcreException extends Exception {
 
@@ -154,3 +147,22 @@ class DibiPcreException extends Exception {
 		parent::__construct(str_replace('%msg', isset($messages[$code]) ? $messages[$code] : 'Unknown error', $message), $code);
 	}
 }
+
+
+
+/**
+ * @package    dibi
+ */
+class DibiNotImplementedException extends LogicException
+{}
+
+
+
+/**
+ * @package    dibi
+ */
+class DibiNotSupportedException extends LogicException
+{}
+
+
+
diff --git a/dibi/libs/DibiFileLogger.php b/dibi/libs/DibiFileLogger.php
index a3acc908..49be5d90 100644
--- a/dibi/libs/DibiFileLogger.php
+++ b/dibi/libs/DibiFileLogger.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -17,6 +15,7 @@
  * dibi file logger.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 class DibiFileLogger extends DibiObject
 {
diff --git a/dibi/libs/DibiFirePhpLogger.php b/dibi/libs/DibiFirePhpLogger.php
index 52549e4a..4d66e45c 100644
--- a/dibi/libs/DibiFirePhpLogger.php
+++ b/dibi/libs/DibiFirePhpLogger.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -17,6 +15,7 @@
  * dibi FirePHP logger.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 class DibiFirePhpLogger extends DibiObject
 {
diff --git a/dibi/libs/DibiFluent.php b/dibi/libs/DibiFluent.php
index c95ff1da..f7cd3cb7 100644
--- a/dibi/libs/DibiFluent.php
+++ b/dibi/libs/DibiFluent.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -17,6 +15,7 @@
  * dibi SQL builder via fluent interfaces. EXPERIMENTAL!
  *
  * @author     David Grudl
+ * @package    dibi
  *
  * @property-read string $command
  * @property-read DibiConnection $connection
diff --git a/dibi/libs/DibiHashMap.php b/dibi/libs/DibiHashMap.php
index 3676bbaf..3ecfbf38 100644
--- a/dibi/libs/DibiHashMap.php
+++ b/dibi/libs/DibiHashMap.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -17,6 +15,7 @@
  * Lazy cached storage.
  *
  * @author     David Grudl
+ * @package    dibi
  * @internal
  */
 abstract class DibiHashMapBase
diff --git a/dibi/libs/DibiObject.php b/dibi/libs/DibiObject.php
index 709b3900..d9541ea2 100644
--- a/dibi/libs/DibiObject.php
+++ b/dibi/libs/DibiObject.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -52,6 +50,7 @@
  * </code>
  *
  * @author     David Grudl
+ * @package    dibi
  */
 abstract class DibiObject
 {
diff --git a/dibi/libs/DibiResult.php b/dibi/libs/DibiResult.php
index d55daff1..a9ad0301 100644
--- a/dibi/libs/DibiResult.php
+++ b/dibi/libs/DibiResult.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -30,6 +28,7 @@
  * </code>
  *
  * @author     David Grudl
+ * @package    dibi
  *
  * @property-read mixed $resource
  * @property-read IDibiResultDriver $driver
diff --git a/dibi/libs/DibiResultIterator.php b/dibi/libs/DibiResultIterator.php
index bba57327..8331cd2f 100644
--- a/dibi/libs/DibiResultIterator.php
+++ b/dibi/libs/DibiResultIterator.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -26,6 +24,7 @@
  * </code>
  *
  * @author     David Grudl
+ * @package    dibi
  */
 class DibiResultIterator implements Iterator, Countable
 {
diff --git a/dibi/libs/DibiRow.php b/dibi/libs/DibiRow.php
index aa9dc5ac..1c54dd16 100644
--- a/dibi/libs/DibiRow.php
+++ b/dibi/libs/DibiRow.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -17,6 +15,7 @@
  * Result set single row.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 class DibiRow implements ArrayAccess, IteratorAggregate, Countable
 {
diff --git a/dibi/libs/DibiTranslator.php b/dibi/libs/DibiTranslator.php
index 56fc1207..0979cb5b 100644
--- a/dibi/libs/DibiTranslator.php
+++ b/dibi/libs/DibiTranslator.php
@@ -7,8 +7,6 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
@@ -17,6 +15,7 @@
  * dibi SQL translator.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 final class DibiTranslator extends DibiObject
 {
diff --git a/dibi/libs/interfaces.php b/dibi/libs/interfaces.php
index c4bc556e..a541fe38 100644
--- a/dibi/libs/interfaces.php
+++ b/dibi/libs/interfaces.php
@@ -7,14 +7,13 @@
  *
  * For the full copyright and license information, please view
  * the file license.txt that was distributed with this source code.
- *
- * @package    dibi
  */
 
 
 
 /**
  * Provides an interface between a dataset and data-aware components.
+ * @package    dibi
  */
 interface IDataSource extends Countable, IteratorAggregate
 {
@@ -26,6 +25,7 @@ interface IDataSource extends Countable, IteratorAggregate
 
 /**
  * Object that is able to generate SQL.
+ * @package    dibi
  */
 interface IDibiVariable
 {
@@ -38,6 +38,7 @@ interface IDibiVariable
 
 /**
  * dibi driver interface.
+ * @package    dibi
  */
 interface IDibiDriver
 {
@@ -147,6 +148,7 @@ interface IDibiDriver
 
 /**
  * dibi result set driver interface.
+ * @package    dibi
  */
 interface IDibiResultDriver
 {
@@ -211,6 +213,7 @@ interface IDibiResultDriver
  * dibi driver reflection.
  *
  * @author     David Grudl
+ * @package    dibi
  */
 interface IDibiReflector
 {