diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventCoordinator.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventCoordinator.kt
index 9108ba48..8c73b889 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventCoordinator.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventCoordinator.kt
@@ -12,6 +12,7 @@ import no.iktdev.mediaprocessing.shared.common.contract.data.MediaProcessStartEv
 import no.iktdev.mediaprocessing.shared.common.contract.data.PermitWorkCreationEvent
 import no.iktdev.mediaprocessing.shared.common.contract.data.StartEventData
 import no.iktdev.mediaprocessing.shared.common.contract.dto.StartOperationEvents
+import no.iktdev.mediaprocessing.shared.common.database.cal.EventsManager
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.stereotype.Component
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventListener.kt
index 3015d72e..271cd466 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventListener.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventListener.kt
@@ -2,6 +2,7 @@ package no.iktdev.mediaprocessing.coordinator
 
 import no.iktdev.mediaprocessing.shared.common.contract.Events
 import no.iktdev.mediaprocessing.shared.common.contract.EventsListenerContract
+import no.iktdev.mediaprocessing.shared.common.database.cal.EventsManager
 
 abstract class CoordinatorEventListener(): EventsListenerContract<EventsManager, Coordinator>() {
     abstract override val produceEvent: Events
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/ActionEventController.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/ActionEventController.kt
index eeb4eca4..ca67d580 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/ActionEventController.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/ActionEventController.kt
@@ -2,8 +2,8 @@ package no.iktdev.mediaprocessing.coordinator.controller
 
 import com.google.gson.Gson
 import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.EventsManager
 import no.iktdev.mediaprocessing.shared.common.contract.dto.RequestWorkProceed
+import no.iktdev.mediaprocessing.shared.common.database.cal.EventsManager
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/EventsManager.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/EventsManager.kt
index 097e31ae..bd0024ae 100644
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/EventsManager.kt
+++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/EventsManager.kt
@@ -12,13 +12,14 @@ import no.iktdev.eventi.implementations.EventsManagerImpl
 import no.iktdev.mediaprocessing.shared.common.database.tables.allEvents
 import no.iktdev.mediaprocessing.shared.common.database.tables.events
 import no.iktdev.mediaprocessing.shared.common.contract.Events
+import no.iktdev.mediaprocessing.shared.common.contract.EventsManagerContract
 import no.iktdev.mediaprocessing.shared.common.contract.data.Event
 import no.iktdev.mediaprocessing.shared.common.contract.fromJsonWithDeserializer
 import org.jetbrains.exposed.exceptions.ExposedSQLException
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 
-class EventsManager(dataSource: DataSource) : EventsManagerImpl<Event>(dataSource) {
+class EventsManager(dataSource: DataSource) : EventsManagerContract(dataSource) {
     val log = KotlinLogging.logger {}
 
     override fun storeEvent(event: Event): Boolean {
diff --git a/shared/contract/build.gradle.kts b/shared/contract/build.gradle.kts
deleted file mode 100644
index cf0a52b5..00000000
--- a/shared/contract/build.gradle.kts
+++ /dev/null
@@ -1,71 +0,0 @@
-plugins {
-    id("java")
-    kotlin("jvm")
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.5.0" // Legg til Kotlin Serialization-plugin
-
-}
-
-group = "no.iktdev.mediaprocessing.shared"
-version = "1.0-SNAPSHOT"
-
-repositories {
-    mavenCentral()
-    maven("https://jitpack.io")
-    maven {
-        url = uri("https://reposilite.iktdev.no/releases")
-    }
-    maven {
-        url = uri("https://reposilite.iktdev.no/snapshots")
-    }
-}
-
-val exposedVersion = "0.44.0"
-dependencies {
-
-    implementation("com.google.code.gson:gson:2.8.9")
-    implementation("io.github.microutils:kotlin-logging-jvm:2.0.11")
-
-    implementation("org.springframework.boot:spring-boot-starter:2.7.0")
-    implementation(project(mapOf("path" to ":shared:eventi")))
-
-    implementation("com.github.pgreze:kotlin-process:1.3.1")
-    implementation("io.github.microutils:kotlin-logging-jvm:2.0.11")
-    implementation("no.iktdev:exfl:0.0.16-SNAPSHOT")
-
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
-    implementation("com.google.code.gson:gson:2.8.9")
-    implementation("org.json:json:20230227")
-    implementation("org.springframework.boot:spring-boot-starter-websocket:2.6.3")
-
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
-
-    implementation("org.jetbrains.exposed:exposed-core:$exposedVersion")
-    implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion")
-    implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
-    implementation("org.jetbrains.exposed:exposed-java-time:$exposedVersion")
-    implementation ("mysql:mysql-connector-java:8.0.29")
-    implementation("org.apache.commons:commons-lang3:3.12.0")
-
-
-    implementation(project(mapOf("path" to ":shared:eventi")))
-
-    testImplementation(platform("org.junit:junit-bom:5.9.1"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
-
-    testImplementation("io.mockk:mockk:1.12.0")
-    testImplementation("com.h2database:h2:1.4.200")
-    testImplementation("org.assertj:assertj-core:3.4.1")
-
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")
-    testImplementation("io.kotlintest:kotlintest-assertions:3.3.2")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.0")
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-kotlin {
-    jvmToolchain(17)
-}
\ No newline at end of file