diff --git a/backend/bin/doctrine.php b/backend/bin/doctrine.php
index 5c89ba0..2425398 100644
--- a/backend/bin/doctrine.php
+++ b/backend/bin/doctrine.php
@@ -6,7 +6,8 @@
  * @package doctrine
  * @copyright Copyright (c) 2010, The volkszaehler.org project
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- *
+ */
+/*
  * This file is part of volkzaehler.org
  *
  * volkzaehler.org is free software: you can redistribute it and/or modify
diff --git a/backend/lib/Controller/ChannelController.php b/backend/lib/Controller/ChannelController.php
index aa5bdf3..d719c17 100644
--- a/backend/lib/Controller/ChannelController.php
+++ b/backend/lib/Controller/ChannelController.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package channel
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -29,7 +29,7 @@ use \Volkszaehler\Model;
  * channel controller
  *
  * @author Steffen Vogel <info@steffenvogel.de>
- * @package channel
+ * @package default
  */
 class ChannelController extends Controller {
 
diff --git a/backend/lib/Controller/DataController.php b/backend/lib/Controller/DataController.php
index 11d76c2..4f9a30a 100644
--- a/backend/lib/Controller/DataController.php
+++ b/backend/lib/Controller/DataController.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package data
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -30,7 +30,7 @@ use Volkszaehler\Util;
  *
  * @author Steffen Vogel <info@steffenvogel.de>
  * @todo call via redirect from Controller\Channel
- * @package data
+ * @package default
  */
 class DataController extends Controller {
 
diff --git a/backend/lib/Controller/GroupController.php b/backend/lib/Controller/GroupController.php
index 84ac0de..1340b11 100644
--- a/backend/lib/Controller/GroupController.php
+++ b/backend/lib/Controller/GroupController.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package group
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -27,7 +27,7 @@ namespace Volkszaehler\Controller;
  * group controller
  *
  * @author Steffen Vogel (info@steffenvogel.de)
- * @package group
+ * @package default
  */
 class GroupController extends Controller {
 
diff --git a/backend/lib/Interpreter/Interpreter.php b/backend/lib/Interpreter/Interpreter.php
index 29d9937..203123a 100644
--- a/backend/lib/Interpreter/Interpreter.php
+++ b/backend/lib/Interpreter/Interpreter.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package data
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -25,7 +25,7 @@ namespace Volkszaehler\Interpreter;
 
 /**
  *
- * @package data
+ * @package default
  * @author Steffen Vogel <info@steffenvogel.de>
  *
  */
@@ -40,7 +40,7 @@ interface InterpreterInterface {
  * interpreter superclass for all interpreters
  *
  * @author Steffen Vogel <info@steffenvogel.de>
- * @package data
+ * @package default
  *
  */
 abstract class Interpreter implements InterpreterInterface {
diff --git a/backend/lib/Interpreter/MeterInterpreter.php b/backend/lib/Interpreter/MeterInterpreter.php
index 071326c..1720415 100644
--- a/backend/lib/Interpreter/MeterInterpreter.php
+++ b/backend/lib/Interpreter/MeterInterpreter.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package data
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -26,7 +26,7 @@ namespace Volkszaehler\Interpreter;
 /**
  * meter interpreter
  *
- * @package data
+ * @package default
  * @author Steffen Vogel (info@steffenvogel.de)
  *
  */
diff --git a/backend/lib/Interpreter/SensorInterpreter.php b/backend/lib/Interpreter/SensorInterpreter.php
index 3f358e9..fea7b6c 100644
--- a/backend/lib/Interpreter/SensorInterpreter.php
+++ b/backend/lib/Interpreter/SensorInterpreter.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package data
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -26,7 +26,7 @@ namespace Volkszaehler\Interpreter;
 /**
  * sensor interpreter
  *
- * @package data
+ * @package default
  * @author Steffen Vogel <info@steffenvogel.de>
  */
 class SensorInterpreter extends Interpreter {
diff --git a/backend/lib/Logger/FluksoLogger.php b/backend/lib/Logger/FluksoLogger.php
index 3044e2a..88a94cc 100644
--- a/backend/lib/Logger/FluksoLogger.php
+++ b/backend/lib/Logger/FluksoLogger.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package data
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -26,7 +26,7 @@ namespace Volkszaehler\Logger;
 /**
  * logger for the Flukso.net API
  *
- * @package data
+ * @package default
  * @link http://www.flukso.net
  * @link http://github.com/icarus75/flukso
  * @author Steffen Vogel <info@steffenvogel.de>
diff --git a/backend/lib/Logger/Logger.php b/backend/lib/Logger/Logger.php
index 7cece51..025a5d5 100644
--- a/backend/lib/Logger/Logger.php
+++ b/backend/lib/Logger/Logger.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package data
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -29,7 +29,7 @@ use Volkszaehler\View\HTTP;
  * interface for parsing diffrent logging APIs (google, flukso etc..)
  *
  * @author Steffen Vogel <info@steffenvogel.de>
- * @package data
+ * @package default
  * @todo to be implemented
  */
 interface Logger {
diff --git a/backend/lib/Model/Channel.php b/backend/lib/Model/Channel.php
index b678137..1e3566a 100644
--- a/backend/lib/Model/Channel.php
+++ b/backend/lib/Model/Channel.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package channel
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -29,7 +29,7 @@ use Doctrine\Common\Collections\ArrayCollection;
  * Channel entity
  *
  * @author Steffen Vogel <info@steffenvogel.de>
- * @package channel
+ * @package default
  *
  * @Entity
  * @Table(name="channels")
diff --git a/backend/lib/Model/Data.php b/backend/lib/Model/Data.php
index d4d0b76..ddb1e8a 100644
--- a/backend/lib/Model/Data.php
+++ b/backend/lib/Model/Data.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package data
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -29,7 +29,7 @@ use Doctrine\Common\Collections\ArrayCollection;
  * Data entity
  *
  * @author Steffen Vogel <info@steffenvogel.de>
- * @package data
+ * @package default
  *
  * @Entity
  * @Table(name="data")
diff --git a/backend/lib/Model/Group.php b/backend/lib/Model/Group.php
index e63bbe1..c34c145 100644
--- a/backend/lib/Model/Group.php
+++ b/backend/lib/Model/Group.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package group
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -29,7 +29,7 @@ use Doctrine\Common\Collections\ArrayCollection;
  * Group entity
  *
  * @author Steffen Vogel <info@steffenvogel.de>
- * @package group
+ * @package default
  *
  * @Entity
  * @Table(name="groups")
diff --git a/backend/lib/View/CSV/CSVDataView.php b/backend/lib/View/CSV/CSVDataView.php
index b327f9e..8d57859 100644
--- a/backend/lib/View/CSV/CSVDataView.php
+++ b/backend/lib/View/CSV/CSVDataView.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package data
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -27,7 +27,7 @@ namespace Volkszaehler\View\CSV;
  * CSV data view
  *
  * @author Steffen Vogel <info@steffenvogel.de>
- * @package data
+ * @package default
  */
 class CSVDataView extends CSVView {
 	public function add($obj, $data) {
diff --git a/backend/lib/View/JSON/JSONChannelView.php b/backend/lib/View/JSON/JSONChannelView.php
index 94a6e03..cdc5dd8 100644
--- a/backend/lib/View/JSON/JSONChannelView.php
+++ b/backend/lib/View/JSON/JSONChannelView.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package channel
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -29,7 +29,7 @@ namespace Volkszaehler\View\JSON;
  * also used for data
  *
  * @author Steffen Vogel <info@steffenvogel.de>
- * @package channel
+ * @package default
  */
 class JSONChannelView extends JSONView {
 
diff --git a/backend/lib/View/JSON/JSONGroupView.php b/backend/lib/View/JSON/JSONGroupView.php
index bc47e6c..ef204fd 100644
--- a/backend/lib/View/JSON/JSONGroupView.php
+++ b/backend/lib/View/JSON/JSONGroupView.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package group
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -27,7 +27,7 @@ namespace Volkszaehler\View\JSON;
  * JSON group view
  *
  * @author Steffen Vogel <info@steffenvogel.de>
- * @package group
+ * @package default
  */
 class JSONGroupView extends JSONView {
 
diff --git a/backend/lib/View/XML/XMLChannelView.php b/backend/lib/View/XML/XMLChannelView.php
index 37ed084..44b03d9 100644
--- a/backend/lib/View/XML/XMLChannelView.php
+++ b/backend/lib/View/XML/XMLChannelView.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package channel
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -31,7 +31,7 @@ use Volkszaehler\View\HTTP;
  * also used for data
  *
  * @author Steffen Vogel <info@steffenvogel.de>
- * @package channel
+ * @package default
  */
 class XMLChannelView extends XMLView {
 
diff --git a/backend/lib/View/XML/XMLGroupView.php b/backend/lib/View/XML/XMLGroupView.php
index 7a9f21e..8f63807 100644
--- a/backend/lib/View/XML/XMLGroupView.php
+++ b/backend/lib/View/XML/XMLGroupView.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2010, The volkszaehler.org project
- * @package group
+ * @package default
  * @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
  */
 /*
@@ -29,7 +29,7 @@ use Volkszaehler\View\HTTP;
  * XML group view
  *
  * @author Steffen Vogel <info@steffenvogel.de>
- * @package group
+ * @package default
  */
 class XMLGroupView extends XMLView {
 	protected $xml;