diff --git a/geoapi/api/Api.php b/geoapi/api/Api.php
index f11b630..efcceed 100644
--- a/geoapi/api/Api.php
+++ b/geoapi/api/Api.php
@@ -1,12 +1,12 @@
 <?php
 
+namespace api;
+
 include_once "../../global.inc.php";
 include_once PATH_DATABASE . "/SQLManager.php";
 require_once PATH_3PARTY . "/Slim/Slim.php";
 \Slim\Slim::registerAutoloader();
 
-namespace api;
-
 /**
  * This class provides some general API methods
  * @author stubbfel
@@ -23,11 +23,11 @@ abstract class Api extends \Slim\Slim {
     /**
      * Default-Constructor
      */
-    public function Api() {
+    public function __construct() {
         if (!$this->sqlManager) {
-            echo "bla";
-            $this->sqlManager = new SQLManager();
+            $this->sqlManager = new \database\SQLManager();
         }
+        $this->connect();
         parent::__construct();
     }
 
diff --git a/geoapi/api/SpsApi.php b/geoapi/api/SpsApi.php
index 4b5b191..70890f8 100644
--- a/geoapi/api/SpsApi.php
+++ b/geoapi/api/SpsApi.php
@@ -1,10 +1,11 @@
 <?php
 
-include_once "../../global.inc.php";
-require_once PATH_API . "/Api.php";
-
 namespace api;
 
+include_once "../../global.inc.php";
+include_once PATH_DATABASE . "/SpsSqlManager.php";
+require_once PATH_API . "/Api.php";
+
 /**
  * This class provides some spezial SpsAPI methods
  * @author stubbfel
@@ -15,7 +16,8 @@ class SpsApi extends Api {
     /**
      * Default-Constructor
      */
-    public function SpsApi() {
+    public function __construct() {
+        $this->sqlManager = new \database\SpsSqlManager();
         parent::__construct();
     }
 
@@ -26,6 +28,15 @@ class SpsApi extends Api {
         parent::__destruct();
     }
 
+    /**
+     * Method stert a sps-query
+     * @param array $queryArgs
+     * @return array[num] [assoc]
+     */
+    public function sendSpsQuery($queryArgs = array()) {
+        return $this->sqlManager->sendSpsQuery($queryArgs);
+    }
+
 }
 
 ?>
diff --git a/geoapi/database/HelloApiSQLManager.php b/geoapi/database/HelloApiSQLManager.php
deleted file mode 100644
index cab9eaf..0000000
--- a/geoapi/database/HelloApiSQLManager.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-include_once "../../global.inc.php"; 
-include_once PATH_DATABASE . "/SQLManager.php";
-
-/**
- * The SQLManager manage the SQL-Connection for an API
- *
- * @author stubbfel
- */
-class HelloApiSQLManager  extends \database\SQLManager{
-
-    public function __construct() {
-        parent::__construct();
-    }
-
-    public function __destruct() {
-        parent::__destruct();
-    }
-
-    public function sendHelloQuery() {
-        return $this->query("SELECT * FROM sps");
-    }
-
-}
-
-?>
diff --git a/geoapi/database/SpsSqlManager.php b/geoapi/database/SpsSqlManager.php
index df18854..f7dc7d2 100644
--- a/geoapi/database/SpsSqlManager.php
+++ b/geoapi/database/SpsSqlManager.php
@@ -1,31 +1,44 @@
 <?php
-include_once "../../global.inc.php"; 
-include_once PATH_DATABASE . "/SpsSqlManager.php";
-include_once PATH_DATABASE . "/SqlManager.php";
 
 namespace database;
 
+include_once "../../global.inc.php";
+include_once PATH_DATABASE . "/SpsSqlManager.php";
+include_once PATH_DATABASE . "/SqlManager.php";
+
 /**
  * Description of SpsSqlManager
  * 
  * @author stubbfel
  * @since 20.06.2013
  */
-class SpsSqlManager  extends SQLManager{
-    
+class SpsSqlManager extends SQLManager {
+
+    /**
+     * Default-Constructor
+     */
     public function __construct() {
         parent::__construct();
     }
 
+    /**
+     * Default-DEConstructor
+     */
     public function __destruct() {
         parent::__destruct();
     }
-    
+
+    /**
+     * Methods send an query for the sps-service
+     * @param array $queryArgs
+     * @return array [num][assoc]
+     */
     public function sendSpsQuery($queryArgs = array()) {
         // TODO Input validitaion
         $alias = $queryArgs["alias"];
         return $this->query("SELECT * FROM sps Where alias = \"$alias\"");
     }
+
 }
 
 ?>
diff --git a/geoapi/database/SqlManager.php b/geoapi/database/SqlManager.php
index 67d98f7..a805592 100644
--- a/geoapi/database/SqlManager.php
+++ b/geoapi/database/SqlManager.php
@@ -1,9 +1,9 @@
 <?php
 
-include_once "../../global.inc.php";
-
 namespace database;
 
+include_once "../../global.inc.php";
+
 /**
  * The SQLManager manage the SQL-Connection for an API
  * @author stubbfel
@@ -44,7 +44,7 @@ abstract class SqlManager {
     /**
      * Default-Constructor
      */
-    public function SQLManager() {
+    public function __construct() {
         include_once PATH_CONFIG . "/config.db.php";
         $this->serverAddress = $sqlServer;
         $this->dbName = $sqlDBName;
@@ -83,7 +83,7 @@ abstract class SqlManager {
     public function closeConnection() {
         if ($this->link) {
             mysql_close($this->link);
-            $this->link =null;
+            $this->link = null;
         }
     }
 
diff --git a/geoapi/service/helloservice/.htaccess b/geoapi/service/helloservice/.htaccess
deleted file mode 100644
index 450c0d1..0000000
--- a/geoapi/service/helloservice/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RewriteEngine  on
-RewriteRule ^ index.php [QSA,L]
\ No newline at end of file
diff --git a/geoapi/service/helloservice/HelloApi.php b/geoapi/service/helloservice/HelloApi.php
deleted file mode 100644
index 4e8965a..0000000
--- a/geoapi/service/helloservice/HelloApi.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-include_once "../../global.inc.php";
-include_once PATH_DATABASE . "/HelloApiSQLManager.php";
-require_once PATH_API . "/Api.php";
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/**
- * Description of HelloApi
- *
- * @author stubbfel
- */
-class HelloApi extends Api {
-
-    public function __construct() {
-        $this->sqlManager = new HelloApiSQLManager();
-        parent::__construct();
-    }
-
-    public function __destruct() {
-        parent::__destruct();
-    }
-
-    public function sendHelloQuery() {
-        return $this->sqlManager->sendHelloQuery();
-    }
-
-}
-
-?>
diff --git a/geoapi/service/helloservice/index.php b/geoapi/service/helloservice/index.php
deleted file mode 100644
index f7d29d3..0000000
--- a/geoapi/service/helloservice/index.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-include_once "../../global.inc.php"; 
-require_once "HelloApi.php";        
-
-  
-$app = new HelloApi();
-
-$app->get('/hello/:name', function ($name) use ($app) {
-    $app->connect();
-    print_r($app->sendHelloQuery());
-  //  print 
-    echo "Hello, $name";
-});
-
-$app->run();
-?>
diff --git a/geoapi/service/sps/index.php b/geoapi/service/sps/index.php
index 5dbe497..6f18ae0 100644
--- a/geoapi/service/sps/index.php
+++ b/geoapi/service/sps/index.php
@@ -3,7 +3,7 @@ include_once "../../global.inc.php";
 require_once PATH_API . "/SpsApi.php";        
 
   
-$app = new SpsApi();
+$app = new \api\SpsApi();
 
 $app->get('/alias/:alias', function ($alias) use ($app) {
     $args =array();