diff --git a/src/Dibi/Bridges/Nette/DibiExtension21.php b/src/Dibi/Bridges/Nette/DibiExtension21.php
index aa105b59..023c77af 100644
--- a/src/Dibi/Bridges/Nette/DibiExtension21.php
+++ b/src/Dibi/Bridges/Nette/DibiExtension21.php
@@ -8,8 +8,6 @@
 
 /**
  * Dibi extension for Nette Framework 2.1. Creates 'connection' service.
- *
- * @package    dibi\nette
  */
 class DibiNette21Extension extends Nette\DI\CompilerExtension
 {
diff --git a/src/Dibi/Bridges/Nette/DibiExtension22.php b/src/Dibi/Bridges/Nette/DibiExtension22.php
index 70d04b86..1537e5e1 100644
--- a/src/Dibi/Bridges/Nette/DibiExtension22.php
+++ b/src/Dibi/Bridges/Nette/DibiExtension22.php
@@ -13,8 +13,6 @@ use Nette;
 
 /**
  * Dibi extension for Nette Framework 2.2. Creates 'connection' & 'panel' services.
- *
- * @package    dibi\nette
  */
 class DibiExtension22 extends Nette\DI\CompilerExtension
 {
diff --git a/src/Dibi/Bridges/Nette/Panel.php b/src/Dibi/Bridges/Nette/Panel.php
index a2768aa7..a88541ec 100644
--- a/src/Dibi/Bridges/Nette/Panel.php
+++ b/src/Dibi/Bridges/Nette/Panel.php
@@ -10,8 +10,6 @@ use Nette\Diagnostics\Debugger;
 
 /**
  * Dibi panel for Nette\Diagnostics.
- *
- * @package    dibi\nette
  */
 class DibiNettePanel implements Nette\Diagnostics\IBarPanel
 {
diff --git a/src/Dibi/Bridges/Tracy/Panel.php b/src/Dibi/Bridges/Tracy/Panel.php
index 0d74b52d..65aaca94 100644
--- a/src/Dibi/Bridges/Tracy/Panel.php
+++ b/src/Dibi/Bridges/Tracy/Panel.php
@@ -14,7 +14,6 @@ use DibiHelpers;
 
 /**
  * Dibi panel for Tracy.
- * @package    dibi\nette
  */
 class Panel implements Tracy\IBarPanel
 {
diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php
index afcb2ab7..4fd43821 100644
--- a/src/Dibi/Connection.php
+++ b/src/Dibi/Connection.php
@@ -9,8 +9,6 @@
 /**
  * dibi connection.
  *
- * @package    dibi
- *
  * @property-read int $affectedRows
  * @property-read int $insertId
  */
diff --git a/src/Dibi/DataSource.php b/src/Dibi/DataSource.php
index 8fb6a103..6def583f 100644
--- a/src/Dibi/DataSource.php
+++ b/src/Dibi/DataSource.php
@@ -9,7 +9,6 @@
 /**
  * Default implementation of IDataSource for dibi.
  *
- * @package    dibi
  */
 class DibiDataSource implements IDataSource
 {
diff --git a/src/Dibi/DateTime.php b/src/Dibi/DateTime.php
index 66820e97..83aef803 100644
--- a/src/Dibi/DateTime.php
+++ b/src/Dibi/DateTime.php
@@ -8,8 +8,6 @@
 
 /**
  * DateTime.
- *
- * @package    dibi
  */
 class DibiDateTime extends DateTime
 {
diff --git a/src/Dibi/Drivers/FirebirdDriver.php b/src/Dibi/Drivers/FirebirdDriver.php
index dd9f00f9..4bee4005 100644
--- a/src/Dibi/Drivers/FirebirdDriver.php
+++ b/src/Dibi/Drivers/FirebirdDriver.php
@@ -17,8 +17,6 @@
  *   - buffers (int) => buffers is the number of database buffers to allocate for the server-side cache. If 0 or omitted, server chooses its own default.
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
- *
- * @package    dibi\drivers
  */
 class DibiFirebirdDriver implements IDibiDriver, IDibiResultDriver, IDibiReflector
 {
diff --git a/src/Dibi/Drivers/MsSql2005Driver.php b/src/Dibi/Drivers/MsSql2005Driver.php
index 2dba3e06..f512f238 100644
--- a/src/Dibi/Drivers/MsSql2005Driver.php
+++ b/src/Dibi/Drivers/MsSql2005Driver.php
@@ -18,8 +18,6 @@
  *   - charset => character encoding to set (default is UTF-8)
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
- *
- * @package    dibi\drivers
  */
 class DibiMsSql2005Driver implements IDibiDriver, IDibiResultDriver
 {
diff --git a/src/Dibi/Drivers/MsSql2005Reflector.php b/src/Dibi/Drivers/MsSql2005Reflector.php
index 99a1f124..0c9c6633 100644
--- a/src/Dibi/Drivers/MsSql2005Reflector.php
+++ b/src/Dibi/Drivers/MsSql2005Reflector.php
@@ -8,8 +8,6 @@
 
 /**
  * The dibi reflector for MSSQL2005 databases.
- *
- * @package    dibi\drivers
  * @internal
  */
 class DibiMsSql2005Reflector implements IDibiReflector
diff --git a/src/Dibi/Drivers/MsSqlDriver.php b/src/Dibi/Drivers/MsSqlDriver.php
index a4329563..10ff137e 100644
--- a/src/Dibi/Drivers/MsSqlDriver.php
+++ b/src/Dibi/Drivers/MsSqlDriver.php
@@ -17,8 +17,6 @@
  *   - persistent (bool) => try to find a persistent link?
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
- *
- * @package    dibi\drivers
  */
 class DibiMsSqlDriver implements IDibiDriver, IDibiResultDriver
 {
diff --git a/src/Dibi/Drivers/MsSqlReflector.php b/src/Dibi/Drivers/MsSqlReflector.php
index 7246341d..3851e4a8 100644
--- a/src/Dibi/Drivers/MsSqlReflector.php
+++ b/src/Dibi/Drivers/MsSqlReflector.php
@@ -8,8 +8,6 @@
 
 /**
  * The dibi reflector for MsSQL databases.
- *
- * @package    dibi\drivers
  * @internal
  */
 class DibiMsSqlReflector implements IDibiReflector
diff --git a/src/Dibi/Drivers/MySqlDriver.php b/src/Dibi/Drivers/MySqlDriver.php
index d57bc2fd..99b37ae6 100644
--- a/src/Dibi/Drivers/MySqlDriver.php
+++ b/src/Dibi/Drivers/MySqlDriver.php
@@ -23,8 +23,6 @@
  *   - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
- *
- * @package    dibi\drivers
  */
 class DibiMySqlDriver implements IDibiDriver, IDibiResultDriver
 {
diff --git a/src/Dibi/Drivers/MySqlReflector.php b/src/Dibi/Drivers/MySqlReflector.php
index 1f653604..e13c0a73 100644
--- a/src/Dibi/Drivers/MySqlReflector.php
+++ b/src/Dibi/Drivers/MySqlReflector.php
@@ -8,8 +8,6 @@
 
 /**
  * The dibi reflector for MySQL databases.
- *
- * @package    dibi\drivers
  * @internal
  */
 class DibiMySqlReflector implements IDibiReflector
diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php
index 18d77506..9a1cfb20 100644
--- a/src/Dibi/Drivers/MySqliDriver.php
+++ b/src/Dibi/Drivers/MySqliDriver.php
@@ -24,8 +24,6 @@
  *   - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
  *   - resource (mysqli) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
- *
- * @package    dibi\drivers
  */
 class DibiMySqliDriver implements IDibiDriver, IDibiResultDriver
 {
diff --git a/src/Dibi/Drivers/OdbcDriver.php b/src/Dibi/Drivers/OdbcDriver.php
index 086eadbb..a25ec2c7 100644
--- a/src/Dibi/Drivers/OdbcDriver.php
+++ b/src/Dibi/Drivers/OdbcDriver.php
@@ -16,8 +16,6 @@
  *   - persistent (bool) => try to find a persistent link?
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
- *
- * @package    dibi\drivers
  */
 class DibiOdbcDriver implements IDibiDriver, IDibiResultDriver, IDibiReflector
 {
diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OracleDriver.php
index 11a02f4b..462e9863 100644
--- a/src/Dibi/Drivers/OracleDriver.php
+++ b/src/Dibi/Drivers/OracleDriver.php
@@ -20,8 +20,6 @@
  *   - resource (resource) => existing connection resource
  *   - persistent => Creates persistent connections with oci_pconnect instead of oci_new_connect
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
- *
- * @package    dibi\drivers
  */
 class DibiOracleDriver implements IDibiDriver, IDibiResultDriver, IDibiReflector
 {
diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php
index f04c3c4b..65022050 100644
--- a/src/Dibi/Drivers/PdoDriver.php
+++ b/src/Dibi/Drivers/PdoDriver.php
@@ -17,8 +17,6 @@
  *   - resource (PDO) => existing connection
  *   - version
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
- *
- * @package    dibi\drivers
  */
 class DibiPdoDriver implements IDibiDriver, IDibiResultDriver
 {
diff --git a/src/Dibi/Drivers/PostgreDriver.php b/src/Dibi/Drivers/PostgreDriver.php
index 9b36a384..5192af6d 100644
--- a/src/Dibi/Drivers/PostgreDriver.php
+++ b/src/Dibi/Drivers/PostgreDriver.php
@@ -17,8 +17,6 @@
  *   - persistent (bool) => try to find a persistent link?
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
- *
- * @package    dibi\drivers
  */
 class DibiPostgreDriver implements IDibiDriver, IDibiResultDriver, IDibiReflector
 {
diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php
index dbdee6f8..8bb15b3d 100644
--- a/src/Dibi/Drivers/Sqlite3Driver.php
+++ b/src/Dibi/Drivers/Sqlite3Driver.php
@@ -17,8 +17,6 @@
  *   - charset => character encoding to set (default is UTF-8)
  *   - resource (SQLite3) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
- *
- * @package    dibi\drivers
  */
 class DibiSqlite3Driver implements IDibiDriver, IDibiResultDriver
 {
diff --git a/src/Dibi/Drivers/SqliteReflector.php b/src/Dibi/Drivers/SqliteReflector.php
index b3003adb..b3250732 100644
--- a/src/Dibi/Drivers/SqliteReflector.php
+++ b/src/Dibi/Drivers/SqliteReflector.php
@@ -8,8 +8,6 @@
 
 /**
  * The dibi reflector for SQLite database.
- *
- * @package    dibi\drivers
  * @internal
  */
 class DibiSqliteReflector implements IDibiReflector
diff --git a/src/Dibi/Event.php b/src/Dibi/Event.php
index 4d06647d..3d3746ea 100644
--- a/src/Dibi/Event.php
+++ b/src/Dibi/Event.php
@@ -8,8 +8,6 @@
 
 /**
  * Profiler & logger event.
- *
- * @package    dibi
  */
 class DibiEvent
 {
diff --git a/src/Dibi/Fluent.php b/src/Dibi/Fluent.php
index f95fb477..8f133db7 100644
--- a/src/Dibi/Fluent.php
+++ b/src/Dibi/Fluent.php
@@ -9,8 +9,6 @@
 /**
  * dibi SQL builder via fluent interfaces. EXPERIMENTAL!
  *
- * @package    dibi
- *
  * @method DibiFluent select($field)
  * @method DibiFluent distinct()
  * @method DibiFluent from($table)
diff --git a/src/Dibi/HashMap.php b/src/Dibi/HashMap.php
index 2922f594..2cb48249 100644
--- a/src/Dibi/HashMap.php
+++ b/src/Dibi/HashMap.php
@@ -8,8 +8,6 @@
 
 /**
  * Lazy cached storage.
- *
- * @package    dibi
  * @internal
  */
 abstract class DibiHashMapBase
diff --git a/src/Dibi/Helpers.php b/src/Dibi/Helpers.php
index b6788a03..73322914 100644
--- a/src/Dibi/Helpers.php
+++ b/src/Dibi/Helpers.php
@@ -6,9 +6,6 @@
  */
 
 
-/**
- * @package    dibi
- */
 class DibiHelpers
 {
 	use DibiStrict;
diff --git a/src/Dibi/Literal.php b/src/Dibi/Literal.php
index 183c4211..eb4809ee 100644
--- a/src/Dibi/Literal.php
+++ b/src/Dibi/Literal.php
@@ -8,8 +8,6 @@
 
 /**
  * SQL literal value.
- *
- * @package    dibi
  */
 class DibiLiteral
 {
diff --git a/src/Dibi/Loggers/FileLogger.php b/src/Dibi/Loggers/FileLogger.php
index 2e57d481..4ef96370 100644
--- a/src/Dibi/Loggers/FileLogger.php
+++ b/src/Dibi/Loggers/FileLogger.php
@@ -8,8 +8,6 @@
 
 /**
  * dibi file logger.
- *
- * @package    dibi
  */
 class DibiFileLogger
 {
diff --git a/src/Dibi/Loggers/FirePhpLogger.php b/src/Dibi/Loggers/FirePhpLogger.php
index 9f6144aa..21927341 100644
--- a/src/Dibi/Loggers/FirePhpLogger.php
+++ b/src/Dibi/Loggers/FirePhpLogger.php
@@ -8,8 +8,6 @@
 
 /**
  * dibi FirePHP logger.
- *
- * @package    dibi
  */
 class DibiFirePhpLogger
 {
diff --git a/src/Dibi/Reflection/Column.php b/src/Dibi/Reflection/Column.php
index d8f7d060..5a09bf09 100644
--- a/src/Dibi/Reflection/Column.php
+++ b/src/Dibi/Reflection/Column.php
@@ -9,8 +9,6 @@
 /**
  * Reflection metadata class for a table or result set column.
  *
- * @package    dibi\reflection
- *
  * @property-read string $name
  * @property-read string $fullName
  * @property-read DibiTableInfo $table
diff --git a/src/Dibi/Reflection/Database.php b/src/Dibi/Reflection/Database.php
index 81aa1ca2..d5f0aab2 100644
--- a/src/Dibi/Reflection/Database.php
+++ b/src/Dibi/Reflection/Database.php
@@ -9,8 +9,6 @@
 /**
  * Reflection metadata class for a database.
  *
- * @package    dibi\reflection
- *
  * @property-read string $name
  * @property-read array $tables
  * @property-read array $tableNames
diff --git a/src/Dibi/Reflection/ForeignKey.php b/src/Dibi/Reflection/ForeignKey.php
index 0093b8d8..7e852ce6 100644
--- a/src/Dibi/Reflection/ForeignKey.php
+++ b/src/Dibi/Reflection/ForeignKey.php
@@ -9,9 +9,6 @@
 /**
  * Reflection metadata class for a foreign key.
  *
- * @package    dibi\reflection
- * @todo
- *
  * @property-read string $name
  * @property-read array $references
  */
diff --git a/src/Dibi/Reflection/Index.php b/src/Dibi/Reflection/Index.php
index c0848063..c7692534 100644
--- a/src/Dibi/Reflection/Index.php
+++ b/src/Dibi/Reflection/Index.php
@@ -9,8 +9,6 @@
 /**
  * Reflection metadata class for a index or primary key.
  *
- * @package    dibi\reflection
- *
  * @property-read string $name
  * @property-read array $columns
  * @property-read bool $unique
diff --git a/src/Dibi/Reflection/Result.php b/src/Dibi/Reflection/Result.php
index 9f5b9ad8..e62766bf 100644
--- a/src/Dibi/Reflection/Result.php
+++ b/src/Dibi/Reflection/Result.php
@@ -9,8 +9,6 @@
 /**
  * Reflection metadata class for a result set.
  *
- * @package    dibi\reflection
- *
  * @property-read array $columns
  * @property-read array $columnNames
  */
diff --git a/src/Dibi/Reflection/Table.php b/src/Dibi/Reflection/Table.php
index 58a0a0b9..6edf714d 100644
--- a/src/Dibi/Reflection/Table.php
+++ b/src/Dibi/Reflection/Table.php
@@ -9,8 +9,6 @@
 /**
  * Reflection metadata class for a database table.
  *
- * @package    dibi\reflection
- *
  * @property-read string $name
  * @property-read bool $view
  * @property-read array $columns
diff --git a/src/Dibi/Result.php b/src/Dibi/Result.php
index 48492e28..fbc9a873 100644
--- a/src/Dibi/Result.php
+++ b/src/Dibi/Result.php
@@ -22,8 +22,6 @@
  * unset($result);
  * </code>
  *
- * @package    dibi
- *
  * @property-read int $rowCount
  */
 class DibiResult implements IDataSource
diff --git a/src/Dibi/ResultIterator.php b/src/Dibi/ResultIterator.php
index 3b41d50b..295d86b2 100644
--- a/src/Dibi/ResultIterator.php
+++ b/src/Dibi/ResultIterator.php
@@ -17,8 +17,6 @@
  * }
  * unset($result);
  * </code>
- *
- * @package    dibi
  */
 class DibiResultIterator implements Iterator, Countable
 {
diff --git a/src/Dibi/Row.php b/src/Dibi/Row.php
index 636dfe98..4c4f2e40 100644
--- a/src/Dibi/Row.php
+++ b/src/Dibi/Row.php
@@ -8,8 +8,6 @@
 
 /**
  * Result set single row.
- *
- * @package    dibi
  */
 class DibiRow implements ArrayAccess, IteratorAggregate, Countable
 {
diff --git a/src/Dibi/Strict.php b/src/Dibi/Strict.php
index ae62f6dc..cbcbcfe1 100644
--- a/src/Dibi/Strict.php
+++ b/src/Dibi/Strict.php
@@ -8,7 +8,6 @@
 
 /**
  * Better OOP experience.
- * @package    dibi
  */
 trait DibiStrict
 {
diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php
index 24f7be4f..940957e7 100644
--- a/src/Dibi/Translator.php
+++ b/src/Dibi/Translator.php
@@ -8,8 +8,6 @@
 
 /**
  * dibi SQL translator.
- *
- * @package    dibi
  */
 final class DibiTranslator
 {
diff --git a/src/Dibi/Type.php b/src/Dibi/Type.php
index da2fab57..7b79d71f 100644
--- a/src/Dibi/Type.php
+++ b/src/Dibi/Type.php
@@ -8,8 +8,6 @@
 
 /**
  * Data types.
- *
- * @package    dibi
  */
 class DibiType
 {
diff --git a/src/Dibi/dibi.php b/src/Dibi/dibi.php
index e1e00dbb..4f7d7f9d 100644
--- a/src/Dibi/dibi.php
+++ b/src/Dibi/dibi.php
@@ -9,8 +9,6 @@
 /**
  * This class is static container class for creating DB objects and
  * store connections info.
- *
- * @package    dibi
  */
 class dibi
 {
diff --git a/src/Dibi/exceptions.php b/src/Dibi/exceptions.php
index 3f5cb39f..75ca68a2 100644
--- a/src/Dibi/exceptions.php
+++ b/src/Dibi/exceptions.php
@@ -8,8 +8,6 @@
 
 /**
  * dibi common exception.
- *
- * @package    dibi
  */
 class DibiException extends Exception
 {
@@ -54,8 +52,6 @@ class DibiException extends Exception
 
 /**
  * database server exception.
- *
- * @package    dibi
  */
 class DibiDriverException extends DibiException
 {
@@ -113,8 +109,6 @@ class DibiDriverException extends DibiException
 
 /**
  * PCRE exception.
- *
- * @package    dibi
  */
 class DibiPcreException extends Exception
 {
@@ -135,24 +129,16 @@ class DibiPcreException extends Exception
 }
 
 
-/**
- * @package    dibi
- */
 class DibiNotImplementedException extends DibiException
 {}
 
 
-/**
- * @package    dibi
- */
 class DibiNotSupportedException extends DibiException
 {}
 
 
 /**
  * Database procedure exception.
- *
- * @package    dibi
  */
 class DibiProcedureException extends DibiException
 {
diff --git a/src/Dibi/interfaces.php b/src/Dibi/interfaces.php
index 0e3c7ab1..4bac9199 100644
--- a/src/Dibi/interfaces.php
+++ b/src/Dibi/interfaces.php
@@ -8,7 +8,6 @@
 
 /**
  * Provides an interface between a dataset and data-aware components.
- * @package    dibi
  */
 interface IDataSource extends Countable, IteratorAggregate
 {
@@ -19,7 +18,6 @@ interface IDataSource extends Countable, IteratorAggregate
 
 /**
  * dibi driver interface.
- * @package    dibi
  */
 interface IDibiDriver
 {
@@ -131,7 +129,6 @@ interface IDibiDriver
 
 /**
  * dibi result set driver interface.
- * @package    dibi
  */
 interface IDibiResultDriver
 {
@@ -189,8 +186,6 @@ interface IDibiResultDriver
 
 /**
  * dibi driver reflection.
- *
- * @package    dibi
  */
 interface IDibiReflector
 {