diff --git a/app/Http/Bucket.php b/app/Http/Bucket.php
index c873469..676ca68 100644
--- a/app/Http/Bucket.php
+++ b/app/Http/Bucket.php
@@ -20,8 +20,20 @@ use Carbon\Carbon;
  */
 class Bucket extends FlightAbstract
 {
-    public function indexAction()
+    public function viewAction($id)
     {
-        
+        $this->app->render('bucket', [
+            'id' => $id
+        ]);
+    }
+
+    public function indexAction($id, $visibilty, $page)
+    {
+        $bucketStore = new Bucket();
+        $publicBuckets = $bucketStore->findBy();
+
+        $this->app->json([
+            'publicBuckets' => $publicBuckets
+        ]);
     }
 }
\ No newline at end of file
diff --git a/app/Http/Index.php b/app/Http/Home.php
similarity index 87%
rename from app/Http/Index.php
rename to app/Http/Home.php
index 975955f..57b7168 100644
--- a/app/Http/Index.php
+++ b/app/Http/Home.php
@@ -22,9 +22,7 @@ class Home extends FlightAbstract
 {
     public function indexAction()
     {
-        
-
-        $this->app->render('index', [
+        $this->app->render('home', [
 
         ]);
     }
diff --git a/app/Http/Note.php b/app/Http/Note.php
new file mode 100644
index 0000000..5a746e6
--- /dev/null
+++ b/app/Http/Note.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Http;
+
+use Rakit\Validation\Validator;
+use App\Flight\FlightAbstract;
+
+use App\Models\Bucket;
+use Carbon\Carbon;
+
+/**
+ *
+ *
+ *
+ *
+ *  @author Björn Hase
+ *  @link https://gitea.tentakelfabrik.de/mITSM/feedback GitHub Repository
+ *
+ *
+ */
+class Note extends FlightAbstract
+{
+    /**
+     *
+     *  @param  integer $id 
+     *
+     */
+    public function viewAction($id)
+    {
+        $this->app->render('bucket', [
+            'id' => $id
+        ]);
+    }
+
+    public function indexAction($bucketId)
+    {
+        $noteStore = new Note();
+        $notes = $noteStore->findBy();
+
+        $this->app->json([
+            'data' => $notes,
+            'page' => $page
+        ]);
+    }
+
+    public function createAction($bucketId)
+    {
+        $result = [
+            'success' => false
+        ];
+
+        $noteStore = new Note();
+
+        $this->app->json([
+            'data' => $notes,
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index cf17d6c..049e217 100644
--- a/public/index.php
+++ b/public/index.php
@@ -3,13 +3,16 @@
 require __DIR__.'/../vendor/autoload.php';
 require __DIR__.'/../app/bootstrap.php';
 
-$app->route('GET /', array(new App\Controllers\Index, 'indexAction'));
+$app->route('GET /', array(new App\Http\Home, 'homeAction'));
 
-$app->route('GET /api/bucket', array(new App\Controllers\Bucket, 'indexAction'));
-$app->route('POST /api/bucket', array(new App\Controllers\Bucket, 'createAction'));
-$app->route('POST /api/bucket/[:id]', array(new App\Controllers\Bucket, 'updateAction'));
-$app->route('DELETE /api/bucket/[:id]', array(new App\Controllers\Bucket, 'destroyAction'));
+$app->route('GET /bucket/@id:[0-9]', array(new App\Http\Bucket, 'viewAction'));
+$app->route('GET /bucket/@id:[0-9]', array(new App\Http\Bucket, 'indexAction'));
+$app->route('POST /bucket', array(new App\Http\Bucket, 'createAction'));
+$app->route('PUT /bucket/@id:[0-9]', array(new App\Http\Bucket, 'updateAction'));
+$app->route('DELETE /bucket/@id:[0-9]', array(new App\Http\Bucket, 'destroyAction'));
 
-$app->route('GET /api/note/:bucket_id', array(new App\Controllers\Note, 'indexAction'));
+$app->route('POST /note', array(new App\Http\Note, 'createAction'));
+$app->route('PUT /note/@id:[0-9]', array(new App\Http\Note, 'updateAction'));
+$app->route('DELETE /note/@id:[0-9]', array(new App\Http\Note, 'destroyAction'));
 
 $app->start();