diff --git a/src/Config.php b/src/Config.php
index c43bc50..50a88d6 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config;
@@ -21,9 +20,6 @@
  *
  * Implements Countable, Iterator and ArrayAccess
  * to facilitate easy access to the data.
- *
- * @category   Zend
- * @package    Zend_Config
  */
 class Config implements Countable, Iterator, ArrayAccess
 {
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index 3c6a686..92272f8 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -5,15 +5,9 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Exception
- */
 interface ExceptionInterface
 {}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 7670f0e..0d15e1f 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -5,15 +5,9 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Exception
- */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 31dc090..d91923c 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -5,15 +5,9 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Exception
- */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/src/Factory.php b/src/Factory.php
index 48263b4..8639171 100644
--- a/src/Factory.php
+++ b/src/Factory.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config;
 
 use Zend\Stdlib\ArrayUtils;
 
-/**
- * @category  Zend
- * @package   Zend_Config
- */
 class Factory
 {
     /**
diff --git a/src/Processor/Constant.php b/src/Processor/Constant.php
index afea89f..265c937 100644
--- a/src/Processor/Constant.php
+++ b/src/Processor/Constant.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 class Constant extends Token implements ProcessorInterface
 {
     /**
diff --git a/src/Processor/Filter.php b/src/Processor/Filter.php
index 0d4696a..7740a26 100644
--- a/src/Processor/Filter.php
+++ b/src/Processor/Filter.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
@@ -14,11 +13,6 @@
 use Zend\Config\Exception;
 use Zend\Filter\FilterInterface as ZendFilter;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 class Filter implements ProcessorInterface
 {
     /**
diff --git a/src/Processor/ProcessorInterface.php b/src/Processor/ProcessorInterface.php
index 9ddbe15..aafe099 100644
--- a/src/Processor/ProcessorInterface.php
+++ b/src/Processor/ProcessorInterface.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
 
 use Zend\Config\Config;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 interface ProcessorInterface
 {
     /**
diff --git a/src/Processor/Queue.php b/src/Processor/Queue.php
index 8674346..386e251 100644
--- a/src/Processor/Queue.php
+++ b/src/Processor/Queue.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
@@ -14,11 +13,6 @@
 use Zend\Config\Exception;
 use Zend\Stdlib\PriorityQueue;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 class Queue extends PriorityQueue implements ProcessorInterface
 {
     /**
diff --git a/src/Processor/Token.php b/src/Processor/Token.php
index 42e620c..fb85b53 100644
--- a/src/Processor/Token.php
+++ b/src/Processor/Token.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
@@ -14,11 +13,6 @@
 use Zend\Config\Config;
 use Zend\Config\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 class Token implements ProcessorInterface
 {
     /**
diff --git a/src/Processor/Translator.php b/src/Processor/Translator.php
index bc4446e..ba19ddc 100644
--- a/src/Processor/Translator.php
+++ b/src/Processor/Translator.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
@@ -14,11 +13,6 @@
 use Zend\Config\Exception;
 use Zend\I18n\Translator\Translator as ZendTranslator;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 class Translator implements ProcessorInterface
 {
     /**
diff --git a/src/Reader/Ini.php b/src/Reader/Ini.php
index ffb31a8..3b4ea76 100644
--- a/src/Reader/Ini.php
+++ b/src/Reader/Ini.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Reader;
@@ -14,10 +13,6 @@
 
 /**
  * XML config reader.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Reader
  */
 class Ini implements ReaderInterface
 {
diff --git a/src/Reader/Json.php b/src/Reader/Json.php
index ec8e416..3166e6b 100644
--- a/src/Reader/Json.php
+++ b/src/Reader/Json.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Reader;
@@ -16,10 +15,6 @@
 
 /**
  * JSON config reader.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Reader
  */
 class Json implements ReaderInterface
 {
diff --git a/src/Reader/ReaderInterface.php b/src/Reader/ReaderInterface.php
index 55d76a9..9061c57 100644
--- a/src/Reader/ReaderInterface.php
+++ b/src/Reader/ReaderInterface.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Reader;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Reader
- */
 interface ReaderInterface
 {
     /**
diff --git a/src/Reader/Xml.php b/src/Reader/Xml.php
index 24ccd10..ad81764 100644
--- a/src/Reader/Xml.php
+++ b/src/Reader/Xml.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Reader;
@@ -15,10 +14,6 @@
 
 /**
  * XML config reader.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Reader
  */
 class Xml implements ReaderInterface
 {
diff --git a/src/Reader/Yaml.php b/src/Reader/Yaml.php
index 057f944..9ccbb96 100644
--- a/src/Reader/Yaml.php
+++ b/src/Reader/Yaml.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Reader;
@@ -14,10 +13,6 @@
 
 /**
  * YAML config reader.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Reader
  */
 class Yaml implements ReaderInterface
 {
diff --git a/src/ReaderPluginManager.php b/src/ReaderPluginManager.php
index 112c2ee..8b0a3ee 100644
--- a/src/ReaderPluginManager.php
+++ b/src/ReaderPluginManager.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config;
 
 use Zend\ServiceManager\AbstractPluginManager;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- */
 class ReaderPluginManager extends AbstractPluginManager
 {
     /**
diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
index be48c21..881eb75 100644
--- a/src/Writer/AbstractWriter.php
+++ b/src/Writer/AbstractWriter.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
@@ -14,11 +13,6 @@
 use Zend\Config\Exception;
 use Zend\Stdlib\ArrayUtils;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Writer
- */
 abstract class AbstractWriter implements WriterInterface
 {
     /**
diff --git a/src/Writer/Ini.php b/src/Writer/Ini.php
index a516f11..c8a16c7 100644
--- a/src/Writer/Ini.php
+++ b/src/Writer/Ini.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
 
 use Zend\Config\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Writer
- */
 class Ini extends AbstractWriter
 {
     /**
diff --git a/src/Writer/Json.php b/src/Writer/Json.php
index 759d7c5..4048ee8 100644
--- a/src/Writer/Json.php
+++ b/src/Writer/Json.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
 
 use Zend\Json\Json as JsonFormat;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Writer
- */
 class Json extends AbstractWriter
 {
     /**
diff --git a/src/Writer/PhpArray.php b/src/Writer/PhpArray.php
index 1e8a833..478a006 100644
--- a/src/Writer/PhpArray.php
+++ b/src/Writer/PhpArray.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Writer
- */
 class PhpArray extends AbstractWriter
 {
     /**
diff --git a/src/Writer/WriterInterface.php b/src/Writer/WriterInterface.php
index 755d3dd..d121b88 100644
--- a/src/Writer/WriterInterface.php
+++ b/src/Writer/WriterInterface.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Writer
- */
 interface WriterInterface
 {
     /**
diff --git a/src/Writer/Xml.php b/src/Writer/Xml.php
index 42e93d2..41a5ca5 100644
--- a/src/Writer/Xml.php
+++ b/src/Writer/Xml.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
@@ -13,11 +12,6 @@
 use XMLWriter;
 use Zend\Config\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Writer
- */
 class Xml extends AbstractWriter
 {
     /**
diff --git a/src/Writer/Yaml.php b/src/Writer/Yaml.php
index 55e88d4..be2aa07 100644
--- a/src/Writer/Yaml.php
+++ b/src/Writer/Yaml.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
 
 use Zend\Config\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Writer
- */
 class Yaml extends AbstractWriter
 {
     /**