diff --git a/docker-compose.yml b/docker-compose.yml
index 0942861..4aa185c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,16 +57,16 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
-  kontor-api-fiber:
+  kontor-fiber:
     build:
-      context: ./kontor-api-fiber
+      context: ./kontor-fiber
       dockerfile: Dockerfile
       tags:
-        - kontor-api-fiber:0.2.0-SNAPSHOT
-    image: kontor-api-fiber:0.2.0-SNAPSHOT
+        - kontor-fiber:0.2.0-SNAPSHOT
+    image: kontor-fiber:0.2.0-SNAPSHOT
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://kontor-api-fiber:8600/health"]
+      test: ["CMD", "curl", "-f", "http://kontor-fiber:8600/health"]
       interval: 10s
       timeout: 5s
       retries: 3
@@ -79,16 +79,16 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
-  kontor-api-echo:
+  kontor-echo:
     build:
-      context: ./kontor-api-echo
+      context: ./kontor-echo
       dockerfile: Dockerfile
       tags:
-        - kontor-api-echo:0.2.0-SNAPSHOT
-    image: kontor-api-echo:0.2.0-SNAPSHOT
+        - kontor-echo:0.2.0-SNAPSHOT
+    image: kontor-echo:0.2.0-SNAPSHOT
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://kontor-api-echo:8700/health"]
+      test: ["CMD", "curl", "-f", "http://kontor-echo:8700/health"]
       interval: 10s
       timeout: 5s
       retries: 3
diff --git a/kontor-api-echo/cmd/kontor/main.go b/kontor-api-echo/cmd/kontor/main.go
deleted file mode 100644
index ced8c79..0000000
--- a/kontor-api-echo/cmd/kontor/main.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"kontor-api-echo/pkg/handler"
-	"kontor-api-echo/pkg/schema"
-	"log"
-
-	// jwtware "github.com/gofiber/contrib/jwt"
-	// "github.com/gofiber/fiber/v2/middleware/logger"
-	echojwt "github.com/labstack/echo-jwt/v4"
-	"github.com/labstack/echo/v4"
-	"github.com/labstack/echo/v4/middleware"
-)
-
-func main() {
-	log.Println("Kontor started")
-
-	if err := schema.Connect(); err != nil {
-		log.Fatal(err)
-	}
-
-	e := echo.New()
-	e.GET("/health", handler.GetHealth)
-	e.POST("/login", handler.Login)
-
-	skipper := func(c echo.Context) bool {
-		// Skip health check endpoint
-		return c.Request().URL.Path == "/health"
-	}
-	e.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
-		LogStatus: true,
-		LogURI:    true,
-		Skipper:   skipper,
-		BeforeNextFunc: func(c echo.Context) {
-			c.Set("customValueFromContext", 42)
-		},
-		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
-			value, _ := c.Get("customValueFromContext").(int)
-			fmt.Printf("REQUEST: uri: %v, status: %v, custom-value: %v\n", v.URI, v.Status, value)
-			return nil
-		},
-	}))
-
-	group := e.Group("/api")
-	group.Use(echojwt.WithConfig(echojwt.Config{SigningKey: []byte("secret")}))
-	handler.SetupComicRoutes(group)
-	handler.SetupMediaRoutes(group)
-
-	e.Logger.Fatal(e.Start(":8700"))
-	log.Println("Kontor finished")
-}
diff --git a/kontor-api-echo/Dockerfile b/kontor-echo/Dockerfile
similarity index 100%
rename from kontor-api-echo/Dockerfile
rename to kontor-echo/Dockerfile
diff --git a/kontor-echo/cmd/kontor/main.go b/kontor-echo/cmd/kontor/main.go
new file mode 100644
index 0000000..98209af
--- /dev/null
+++ b/kontor-echo/cmd/kontor/main.go
@@ -0,0 +1,79 @@
+package main
+
+import (
+	"kontor-api-echo/pkg/handler"
+	"kontor-api-echo/pkg/schema"
+	"log"
+
+	// jwtware "github.com/gofiber/contrib/jwt"
+	// "github.com/gofiber/fiber/v2/middleware/logger"
+	echojwt "github.com/labstack/echo-jwt/v4"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
+)
+
+func main() {
+	log.Println("Kontor started")
+
+	if err := schema.Connect(); err != nil {
+		log.Fatal(err)
+	}
+
+	e := echo.New()
+	e.GET("/health", handler.GetHealth)
+	e.POST("/login", handler.Login)
+
+	// skipper := func(c echo.Context) bool {
+	// 	// Skip health check endpoint
+	// 	return c.Request().URL.Path == "/health"
+	// }
+	// e.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
+	// 	LogStatus: true,
+	// 	LogURI:    true,
+	// 	Skipper:   skipper,
+	// 	BeforeNextFunc: func(c echo.Context) {
+	// 		c.Set("customValueFromContext", 42)
+	// 	},
+	// 	LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
+	// 		value, _ := c.Get("customValueFromContext").(int)
+	// 		log.Printf("REQUEST: uri: %v, status: %v, custom-value: %v\n", v.URI, v.Status, value)
+	// 		return nil
+	// 	},
+	// }))
+	e.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
+		LogStatus:   true,
+		LogURI:      true,
+		LogError:    true,
+		HandleError: true,
+		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
+			if v.Error == nil {
+				log.Printf("REQUEST: uri: %v, status: %v\n", v.URI, v.Status)
+			} else {
+				log.Printf("REQUEST-ERROR: uri: %v, status: %v, err: %v\n", v.URI, v.Status, v.Error.Error())
+			}
+			return nil
+		},
+	}))
+
+	group := e.Group("/api")
+	group.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
+		LogStatus:   true,
+		LogURI:      true,
+		LogError:    true,
+		HandleError: true,
+		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
+			if v.Error == nil {
+				log.Printf("REQUEST: uri: %v, status: %v\n", v.URI, v.Status)
+			} else {
+				log.Printf("REQUEST-ERROR: uri: %v, status: %v, err: %v\n", v.URI, v.Status, v.Error.Error())
+			}
+			return nil
+		},
+	}))
+	group.Use(echojwt.WithConfig(echojwt.Config{SigningKey: []byte("secret")}))
+	handler.SetupComicRoutes(group)
+	handler.SetupMediaRoutes(group)
+
+	e.Logger.Fatal(e.Start(":8700"))
+	log.Println("Kontor finished")
+}
diff --git a/kontor-api-echo/go.mod b/kontor-echo/go.mod
similarity index 100%
rename from kontor-api-echo/go.mod
rename to kontor-echo/go.mod
diff --git a/kontor-api-echo/go.sum b/kontor-echo/go.sum
similarity index 100%
rename from kontor-api-echo/go.sum
rename to kontor-echo/go.sum
diff --git a/kontor-api-echo/pkg/handler/auth.go b/kontor-echo/pkg/handler/auth.go
similarity index 100%
rename from kontor-api-echo/pkg/handler/auth.go
rename to kontor-echo/pkg/handler/auth.go
diff --git a/kontor-api-echo/pkg/handler/comics.go b/kontor-echo/pkg/handler/comics.go
similarity index 90%
rename from kontor-api-echo/pkg/handler/comics.go
rename to kontor-echo/pkg/handler/comics.go
index 91b7e9c..99bce8d 100644
--- a/kontor-api-echo/pkg/handler/comics.go
+++ b/kontor-echo/pkg/handler/comics.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"context"
+	"fmt"
 	"kontor-api-echo/pkg/schema"
 	"log"
 	"net/http"
@@ -23,6 +24,8 @@ func GetAllComics(c echo.Context) error {
 	var db *bun.DB
 	ctx := context.Background()
 
+	fmt.Printf("REQUEST: uri: %v, status: %v\n", c.Request().URL, c.Response().Status)
+	log.Printf("REQUEST: uri: %v, status: %v\n", c.Request().URL, c.Response().Status)
 	db, err = schema.GetDatabase()
 	if err != nil {
 		log.Fatal(err)
diff --git a/kontor-api-echo/pkg/handler/health.go b/kontor-echo/pkg/handler/health.go
similarity index 100%
rename from kontor-api-echo/pkg/handler/health.go
rename to kontor-echo/pkg/handler/health.go
diff --git a/kontor-api-echo/pkg/handler/media.go b/kontor-echo/pkg/handler/media.go
similarity index 100%
rename from kontor-api-echo/pkg/handler/media.go
rename to kontor-echo/pkg/handler/media.go
diff --git a/kontor-api-echo/pkg/schema/auth.go b/kontor-echo/pkg/schema/auth.go
similarity index 100%
rename from kontor-api-echo/pkg/schema/auth.go
rename to kontor-echo/pkg/schema/auth.go
diff --git a/kontor-api-echo/pkg/schema/comics.go b/kontor-echo/pkg/schema/comics.go
similarity index 100%
rename from kontor-api-echo/pkg/schema/comics.go
rename to kontor-echo/pkg/schema/comics.go
diff --git a/kontor-api-echo/pkg/schema/comics_test.go b/kontor-echo/pkg/schema/comics_test.go
similarity index 100%
rename from kontor-api-echo/pkg/schema/comics_test.go
rename to kontor-echo/pkg/schema/comics_test.go
diff --git a/kontor-api-echo/pkg/schema/database.go b/kontor-echo/pkg/schema/database.go
similarity index 100%
rename from kontor-api-echo/pkg/schema/database.go
rename to kontor-echo/pkg/schema/database.go
diff --git a/kontor-api-echo/pkg/schema/media.go b/kontor-echo/pkg/schema/media.go
similarity index 100%
rename from kontor-api-echo/pkg/schema/media.go
rename to kontor-echo/pkg/schema/media.go
diff --git a/kontor-api-echo/pkg/utils/auth.go b/kontor-echo/pkg/utils/auth.go
similarity index 100%
rename from kontor-api-echo/pkg/utils/auth.go
rename to kontor-echo/pkg/utils/auth.go
diff --git a/kontor-api-echo/pkg/utils/token.go b/kontor-echo/pkg/utils/token.go
similarity index 100%
rename from kontor-api-echo/pkg/utils/token.go
rename to kontor-echo/pkg/utils/token.go
diff --git a/kontor-api-fiber/Dockerfile b/kontor-fiber/Dockerfile
similarity index 100%
rename from kontor-api-fiber/Dockerfile
rename to kontor-fiber/Dockerfile
diff --git a/kontor-api-fiber/cmd/kontor/main.go b/kontor-fiber/cmd/kontor/main.go
similarity index 100%
rename from kontor-api-fiber/cmd/kontor/main.go
rename to kontor-fiber/cmd/kontor/main.go
diff --git a/kontor-api-fiber/go.mod b/kontor-fiber/go.mod
similarity index 100%
rename from kontor-api-fiber/go.mod
rename to kontor-fiber/go.mod
diff --git a/kontor-api-fiber/go.sum b/kontor-fiber/go.sum
similarity index 100%
rename from kontor-api-fiber/go.sum
rename to kontor-fiber/go.sum
diff --git a/kontor-api-fiber/pkg/handler/auth.go b/kontor-fiber/pkg/handler/auth.go
similarity index 100%
rename from kontor-api-fiber/pkg/handler/auth.go
rename to kontor-fiber/pkg/handler/auth.go
diff --git a/kontor-api-fiber/pkg/handler/comics.go b/kontor-fiber/pkg/handler/comics.go
similarity index 100%
rename from kontor-api-fiber/pkg/handler/comics.go
rename to kontor-fiber/pkg/handler/comics.go
diff --git a/kontor-api-fiber/pkg/handler/health.go b/kontor-fiber/pkg/handler/health.go
similarity index 100%
rename from kontor-api-fiber/pkg/handler/health.go
rename to kontor-fiber/pkg/handler/health.go
diff --git a/kontor-api-fiber/pkg/handler/media.go b/kontor-fiber/pkg/handler/media.go
similarity index 100%
rename from kontor-api-fiber/pkg/handler/media.go
rename to kontor-fiber/pkg/handler/media.go
diff --git a/kontor-api-fiber/pkg/schema/auth.go b/kontor-fiber/pkg/schema/auth.go
similarity index 100%
rename from kontor-api-fiber/pkg/schema/auth.go
rename to kontor-fiber/pkg/schema/auth.go
diff --git a/kontor-api-fiber/pkg/schema/comics.go b/kontor-fiber/pkg/schema/comics.go
similarity index 100%
rename from kontor-api-fiber/pkg/schema/comics.go
rename to kontor-fiber/pkg/schema/comics.go
diff --git a/kontor-api-fiber/pkg/schema/comics_test.go b/kontor-fiber/pkg/schema/comics_test.go
similarity index 100%
rename from kontor-api-fiber/pkg/schema/comics_test.go
rename to kontor-fiber/pkg/schema/comics_test.go
diff --git a/kontor-api-fiber/pkg/schema/database.go b/kontor-fiber/pkg/schema/database.go
similarity index 100%
rename from kontor-api-fiber/pkg/schema/database.go
rename to kontor-fiber/pkg/schema/database.go
diff --git a/kontor-api-fiber/pkg/schema/media.go b/kontor-fiber/pkg/schema/media.go
similarity index 100%
rename from kontor-api-fiber/pkg/schema/media.go
rename to kontor-fiber/pkg/schema/media.go
diff --git a/kontor-api-fiber/pkg/utils/auth.go b/kontor-fiber/pkg/utils/auth.go
similarity index 100%
rename from kontor-api-fiber/pkg/utils/auth.go
rename to kontor-fiber/pkg/utils/auth.go
diff --git a/kontor-api-fiber/pkg/utils/token.go b/kontor-fiber/pkg/utils/token.go
similarity index 100%
rename from kontor-api-fiber/pkg/utils/token.go
rename to kontor-fiber/pkg/utils/token.go