diff --git a/src/Pyrus/Developer/CoverageAnalyzer/AbstractSourceDecorator.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/AbstractSourceDecorator.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/AbstractSourceDecorator.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/AbstractSourceDecorator.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Aggregator.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Aggregator.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Aggregator.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Aggregator.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/DefaultSourceDecorator.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/DefaultSourceDecorator.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/DefaultSourceDecorator.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/DefaultSourceDecorator.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Exception.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Exception.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Exception.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Exception.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/SourceFile.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/SourceFile.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/SourceFile.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/SourceFile.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/SourceFile/PerTest.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/SourceFile/PerTest.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/SourceFile/PerTest.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/SourceFile/PerTest.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Sqlite.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Sqlite.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Sqlite.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Sqlite.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Web/Aggregator.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/Aggregator.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Web/Aggregator.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/Aggregator.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Web/ClassToTemplateMapper.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/ClassToTemplateMapper.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Web/ClassToTemplateMapper.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/ClassToTemplateMapper.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Web/Controller.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/Controller.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Web/Controller.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/Controller.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Web/Exception.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/Exception.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Web/Exception.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/Exception.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Web/LineSummary.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/LineSummary.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Web/LineSummary.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/LineSummary.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Web/SelectDatabase.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/SelectDatabase.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Web/SelectDatabase.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/SelectDatabase.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Web/Summary.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/Summary.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Web/Summary.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/Summary.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Web/TestCoverage.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/TestCoverage.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Web/TestCoverage.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/TestCoverage.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Web/TestSummary.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/TestSummary.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Web/TestSummary.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/TestSummary.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/Web/View.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/View.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/Web/View.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/Web/View.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/make-coverage-phar.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/make-coverage-phar.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/make-coverage-phar.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/make-coverage-phar.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/pear2coverage.phar.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/pear2coverage.phar.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/pear2coverage.phar.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/pear2coverage.phar.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/test-modified.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/test-modified.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/test-modified.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/test-modified.php
diff --git a/src/Pyrus/Developer/CoverageAnalyzer/test.php b/src/PEAR2/Pyrus/Developer/CoverageAnalyzer/test.php
similarity index 100%
rename from src/Pyrus/Developer/CoverageAnalyzer/test.php
rename to src/PEAR2/Pyrus/Developer/CoverageAnalyzer/test.php
diff --git a/src/Pyrus/Developer/Creator/Exception.php b/src/PEAR2/Pyrus/Developer/Creator/Exception.php
similarity index 100%
rename from src/Pyrus/Developer/Creator/Exception.php
rename to src/PEAR2/Pyrus/Developer/Creator/Exception.php
diff --git a/src/Pyrus/Developer/Creator/Phar.php b/src/PEAR2/Pyrus/Developer/Creator/Phar.php
similarity index 100%
rename from src/Pyrus/Developer/Creator/Phar.php
rename to src/PEAR2/Pyrus/Developer/Creator/Phar.php
diff --git a/src/Pyrus/Developer/Creator/Phar/PHPArchive.php b/src/PEAR2/Pyrus/Developer/Creator/Phar/PHPArchive.php
similarity index 100%
rename from src/Pyrus/Developer/Creator/Phar/PHPArchive.php
rename to src/PEAR2/Pyrus/Developer/Creator/Phar/PHPArchive.php
diff --git a/src/Pyrus/Developer/Creator/Tar.php b/src/PEAR2/Pyrus/Developer/Creator/Tar.php
similarity index 100%
rename from src/Pyrus/Developer/Creator/Tar.php
rename to src/PEAR2/Pyrus/Developer/Creator/Tar.php
diff --git a/src/Pyrus/Developer/Creator/Xml.php b/src/PEAR2/Pyrus/Developer/Creator/Xml.php
similarity index 100%
rename from src/Pyrus/Developer/Creator/Xml.php
rename to src/PEAR2/Pyrus/Developer/Creator/Xml.php
diff --git a/src/Pyrus/Developer/Creator/Zip.php b/src/PEAR2/Pyrus/Developer/Creator/Zip.php
similarity index 100%
rename from src/Pyrus/Developer/Creator/Zip.php
rename to src/PEAR2/Pyrus/Developer/Creator/Zip.php
diff --git a/src/Pyrus/Developer/PackageFile/Commands.php b/src/PEAR2/Pyrus/Developer/PackageFile/Commands.php
similarity index 100%
rename from src/Pyrus/Developer/PackageFile/Commands.php
rename to src/PEAR2/Pyrus/Developer/PackageFile/Commands.php
diff --git a/src/Pyrus/Developer/PackageFile/PEAR2SVN.php b/src/PEAR2/Pyrus/Developer/PackageFile/PEAR2SVN.php
similarity index 100%
rename from src/Pyrus/Developer/PackageFile/PEAR2SVN.php
rename to src/PEAR2/Pyrus/Developer/PackageFile/PEAR2SVN.php
diff --git a/src/Pyrus/Developer/PackageFile/PEAR2SVN/Filter.php b/src/PEAR2/Pyrus/Developer/PackageFile/PEAR2SVN/Filter.php
similarity index 100%
rename from src/Pyrus/Developer/PackageFile/PEAR2SVN/Filter.php
rename to src/PEAR2/Pyrus/Developer/PackageFile/PEAR2SVN/Filter.php
diff --git a/src/Pyrus/Developer/PackageFile/PECL.php b/src/PEAR2/Pyrus/Developer/PackageFile/PECL.php
similarity index 100%
rename from src/Pyrus/Developer/PackageFile/PECL.php
rename to src/PEAR2/Pyrus/Developer/PackageFile/PECL.php
diff --git a/src/Pyrus/Developer/PackageFile/PECL/Filter.php b/src/PEAR2/Pyrus/Developer/PackageFile/PECL/Filter.php
similarity index 100%
rename from src/Pyrus/Developer/PackageFile/PECL/Filter.php
rename to src/PEAR2/Pyrus/Developer/PackageFile/PECL/Filter.php
diff --git a/src/Pyrus/Developer/PackageFile/v2.php b/src/PEAR2/Pyrus/Developer/PackageFile/v2.php
similarity index 100%
rename from src/Pyrus/Developer/PackageFile/v2.php
rename to src/PEAR2/Pyrus/Developer/PackageFile/v2.php
diff --git a/src/Pyrus/Developer/Runphpt/Exception.php b/src/PEAR2/Pyrus/Developer/Runphpt/Exception.php
similarity index 100%
rename from src/Pyrus/Developer/Runphpt/Exception.php
rename to src/PEAR2/Pyrus/Developer/Runphpt/Exception.php
diff --git a/src/Pyrus/Developer/Runphpt/Runner.php b/src/PEAR2/Pyrus/Developer/Runphpt/Runner.php
similarity index 100%
rename from src/Pyrus/Developer/Runphpt/Runner.php
rename to src/PEAR2/Pyrus/Developer/Runphpt/Runner.php