diff --git a/api/src/NotesApplication.kt b/api/src/NotesApplication.kt
index 7f5c1bf..0e0cf25 100644
--- a/api/src/NotesApplication.kt
+++ b/api/src/NotesApplication.kt
@@ -1,6 +1,6 @@
 package be.vandewalleh
 
-import be.vandewalleh.controllers.KodeinController
+import be.vandewalleh.controllers.base.KodeinController
 import be.vandewalleh.controllers.controllerModule
 import be.vandewalleh.features.Feature
 import be.vandewalleh.features.configurationFeature
@@ -10,7 +10,6 @@ import be.vandewalleh.migrations.Migration
 import be.vandewalleh.services.serviceModule
 import io.ktor.application.Application
 import io.ktor.application.log
-import io.ktor.auth.authenticate
 import io.ktor.routing.routing
 import me.liuwj.ktorm.database.Database
 import org.kodein.di.Kodein
diff --git a/api/src/controllers/ChaptersController.kt b/api/src/controllers/ChaptersController.kt
index 54ff772..b55f05d 100644
--- a/api/src/controllers/ChaptersController.kt
+++ b/api/src/controllers/ChaptersController.kt
@@ -1,5 +1,6 @@
 package be.vandewalleh.controllers
 
+import be.vandewalleh.controllers.base.AuthCrudController
 import be.vandewalleh.entities.User
 import be.vandewalleh.tables.Chapters
 import be.vandewalleh.tables.Notes
diff --git a/api/src/controllers/Controllers.kt b/api/src/controllers/Controllers.kt
index 799361c..8bf78f7 100644
--- a/api/src/controllers/Controllers.kt
+++ b/api/src/controllers/Controllers.kt
@@ -1,5 +1,6 @@
 package be.vandewalleh.controllers
 
+import be.vandewalleh.controllers.base.KodeinController
 import org.kodein.di.Kodein
 import org.kodein.di.generic.bind
 import org.kodein.di.generic.inSet
@@ -13,7 +14,6 @@ val controllerModule = Kodein.Module(name = "Controller") {
     bind() from setBinding<KodeinController>()
 
     bind<KodeinController>().inSet() with singleton { UserController(this.kodein) }
-    bind<KodeinController>().inSet() with singleton { HealthCheckController(this.kodein) }
     bind<KodeinController>().inSet() with singleton { NotesController(this.kodein) }
-    bind<KodeinController>().inSet() with singleton { NotesTitleController(this.kodein) }
+    bind<KodeinController>().inSet() with singleton { TitleController(this.kodein) }
 }
\ No newline at end of file
diff --git a/api/src/controllers/HealthCheckController.kt b/api/src/controllers/HealthCheckController.kt
deleted file mode 100644
index 311ece3..0000000
--- a/api/src/controllers/HealthCheckController.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package be.vandewalleh.controllers
-
-import io.ktor.application.call
-import io.ktor.locations.Location
-import io.ktor.locations.get
-import io.ktor.response.respondText
-import io.ktor.routing.Routing
-import org.kodein.di.Kodein
-
-class HealthCheckController(kodein: Kodein) : KodeinController(kodein) {
-    override fun Routing.registerRoutes() {
-        get<Routes.Ping> {
-            call.respondText("pong")
-        }
-    }
-
-    object Routes {
-        @Location("/ping")
-        class Ping
-    }
-}
\ No newline at end of file
diff --git a/api/src/controllers/NotesController.kt b/api/src/controllers/NotesController.kt
index d9a92a5..38df007 100644
--- a/api/src/controllers/NotesController.kt
+++ b/api/src/controllers/NotesController.kt
@@ -1,5 +1,6 @@
 package be.vandewalleh.controllers
 
+import be.vandewalleh.controllers.base.AuthCrudController
 import be.vandewalleh.services.NotesService
 import io.ktor.application.call
 import io.ktor.response.respond
diff --git a/api/src/controllers/NotesTitleController.kt b/api/src/controllers/TitleController.kt
similarity index 97%
rename from api/src/controllers/NotesTitleController.kt
rename to api/src/controllers/TitleController.kt
index fdb23ea..c38ddc0 100644
--- a/api/src/controllers/NotesTitleController.kt
+++ b/api/src/controllers/TitleController.kt
@@ -1,5 +1,6 @@
 package be.vandewalleh.controllers
 
+import be.vandewalleh.controllers.base.AuthCrudController
 import be.vandewalleh.entities.Note
 import be.vandewalleh.entities.Tag
 import be.vandewalleh.entities.User
@@ -22,7 +23,7 @@ import org.kodein.di.Kodein
 import org.kodein.di.generic.instance
 import java.time.LocalDateTime
 
-class NotesTitleController(kodein: Kodein) : AuthCrudController("/notes/{noteTitle}", kodein) {
+class TitleController(kodein: Kodein) : AuthCrudController("/notes/{noteTitle}", kodein) {
     private val db by kodein.instance<Database>()
 
     private fun ApplicationCall.noteTitle(): String? {
diff --git a/api/src/controllers/UserController.kt b/api/src/controllers/UserController.kt
index fce3b8e..25d3bd0 100644
--- a/api/src/controllers/UserController.kt
+++ b/api/src/controllers/UserController.kt
@@ -2,6 +2,7 @@ package be.vandewalleh.controllers
 
 import be.vandewalleh.auth.SimpleJWT
 import be.vandewalleh.auth.UsernamePasswordCredential
+import be.vandewalleh.controllers.base.KodeinController
 import be.vandewalleh.services.UserRegistrationDto
 import be.vandewalleh.services.UserService
 import io.ktor.application.call
diff --git a/api/src/controllers/AuthCrudController.kt b/api/src/controllers/base/AuthCrudController.kt
similarity index 95%
rename from api/src/controllers/AuthCrudController.kt
rename to api/src/controllers/base/AuthCrudController.kt
index 8aa7875..00ca994 100644
--- a/api/src/controllers/AuthCrudController.kt
+++ b/api/src/controllers/base/AuthCrudController.kt
@@ -1,4 +1,4 @@
-package be.vandewalleh.controllers
+package be.vandewalleh.controllers.base
 
 import be.vandewalleh.services.UserService
 import io.ktor.application.ApplicationCall
diff --git a/api/src/controllers/KodeinController.kt b/api/src/controllers/base/KodeinController.kt
similarity index 93%
rename from api/src/controllers/KodeinController.kt
rename to api/src/controllers/base/KodeinController.kt
index 5231c49..eb8e373 100644
--- a/api/src/controllers/KodeinController.kt
+++ b/api/src/controllers/base/KodeinController.kt
@@ -1,4 +1,4 @@
-package be.vandewalleh.controllers
+package be.vandewalleh.controllers.base
 
 import io.ktor.application.ApplicationCall
 import io.ktor.http.HttpStatusCode