diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b84a7a50..2f67f95d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,25 +5,193 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="79fc3e25-8083-4c15-b17f-a1e0d61c77a6" name="Changes" comment="Publishing reason for failure">
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/UIApplicationKt.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/kotlinc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/kotlinc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/coordinator/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/apps/coordinator/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorApplication.kt" beforeDir="false" afterPath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorApplication.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/services/UnattendedIndexing.kt" beforeDir="false" afterPath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/services/UnattendedIndexing.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCatalogStore.kt" beforeDir="false" afterPath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCatalogStore.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentGenresStore.kt" beforeDir="false" afterPath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentGenresStore.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentMetadataStore.kt" beforeDir="false" afterPath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentMetadataStore.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentSubtitleStore.kt" beforeDir="false" afterPath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentSubtitleStore.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentTitleStore.kt" beforeDir="false" afterPath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentTitleStore.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ProcessedFileStore.kt" beforeDir="false" afterPath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ProcessedFileStore.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/InputDirectoryWatcher.kt" beforeDir="false" afterPath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/InputDirectoryWatcher.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/apps/coordinator/src/main/resources/application.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/shared/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/shared/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/FileNameParser.kt" beforeDir="false" afterPath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/FileNameParser.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventCoordinator.kt" beforeDir="false" afterPath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventCoordinator.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterApplication.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterEnv.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/Implementations.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskCoordinator.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/convert/ConvertListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/convert/Converter2.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/tasks/ConvertService.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorApplication.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventCoordinator.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorUtils.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/EventsDatabase.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/Implementations.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/ActionEventController.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/InfoController.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/PollController.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/RequestEventController.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/coordination/ProcesserSocketMessageListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/services/UnattendedIndexing.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/BaseInfoFromFileTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CoverDownloadTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CoverFromMetadataTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkArgumentsTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkArgumentsTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MetadataWaitOrDefaultTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ParseMediaFileStreamsTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/PersistContentTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ReadMediaFileStreamsTaskListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/EncodeWorkArgumentsMapping.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/EventsSummaryMapping.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/FFmpegBase.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCatalogStore.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentGenresStore.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentMetadataStore.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentSubtitleStore.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentTitleStore.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ProcessedFileStore.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/AudioArguments.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/SubtitleArguments.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/VideoArguments.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/validator/CompletionValidator.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/FileWatcherQueue.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/InputDirectoryWatcher.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Implementations.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserApplication.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserEnv.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Reporter.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/TaskCoordinator.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/controller/CancelController.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegArgumentsBuilder.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegRunner.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegTaskService.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/progress/FfmpegDecodedProgress.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/progress/FfmpegProgressDecoder.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeService.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ExtractService.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIApplication.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIEnv.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventChain.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventDataDto.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventSummary.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/explore/ExplorerAttr.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/explore/ExplorerCursor.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/explorer/ExplorerCore.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/CompletedEventsService.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ChainedEventsTopic.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ExplorerTopic.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/FileRequestTopic.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ProcesserTasksTopic.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketClient.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketMessageHandler.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/UnprocessedFilesTopic.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/a2a/ProcesserListenerService.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/Defaults.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/DownloadClient.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/LogHelper.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/Preference.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/SharedConfig.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/TaskCoordinatorBase.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/Events.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsListenerContract.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsManagerContract.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsUtil.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ProcessType.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/BaseInfoEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ConvertWorkCreatedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ConvertWorkPerformed.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeArgumentCreatedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeWorkCreatedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeWorkPerformedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/Event.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractArgumentCreatedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractWorkCreatedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractWorkPerformedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaCoverDownloadedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaCoverInfoReceivedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaFileStreamsParsedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaFileStreamsReadEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaMetadataReceivedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaOutInformationConstructedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaProcessCompletedEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaProcessStartEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/PermitWorkCreationEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/PersistedContentEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Enums.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/EventRequest.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/EventSummary.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/ProcesserEventInfo.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/RequestWorkProceed.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Requester.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/tasks/TaskData.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/AudioArgumentsDto.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/MediaStreams.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/PreferenceDto.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/SubtitleArgumentsDto.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/VideoAndAudioDto.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/VideoArgumentsDto.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/MetadataDto.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/SubtitlesDto.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/VideoDetails.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/EventsDatabase.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/EventsManager.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/RunnerManager.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/TasksManager.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/allEvents.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/events.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/files.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/filesProcessed.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/runners.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/tasks.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/extended/FileExt.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/FileNameDeterminate.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/FileNameParser.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/NameHelper.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/Regexes.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/runner/ResultRunner.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/services/TaskService.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/socket/SocketImplementation.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/Task.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskDoz.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskType.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/build.gradle.kts" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/LogHelper.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/ConsumableEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/LocalDateTimeAdapter.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/PersistentMessageHelper.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/WGson.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/data/EventImpl.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/DataSource.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/DatabaseConnectionConfig.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/MySqlDataSource.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/TableDefaultOperations.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventCoordinator.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventListenerImpl.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventsManagerImpl.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiApplication.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiApplicationTests.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiImplementationBase.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/TestConfig.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockDataEventListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockDataSource.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventCoordinator.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventManager.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/FirstEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/InitEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/SecondEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/ThirdEvent.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/FirstEventListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/ForthEventListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/SecondEventListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/ThirdEventListener.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/FirstEventListenerImplTestBase.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/ForthEventListenerImplTestBase.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/SecondEventListenerImplTestBase.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/ThirdEventListenerImplTestBase.kt" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -105,7 +273,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="v4-ui" />
+        <entry key="$PROJECT_DIR$" value="v4" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -123,81 +291,81 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Gradle.AudioArgumentsTest.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.AudioArgumentsTest.validateChecks1.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.AudioArgumentsTest.validateChecks3.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.Build MediaProcessing2.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.ConvertWorkTaskListenerTest.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.ConvertWorkTaskListenerTest.validateCreationOfConvertTasks.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.ConvertWorkTaskListenerTest.validateParsingOfEvents.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.ConvertWorkTaskListenerTest.validate_shouldIProcessAndHandleEvent1.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.ConvertWorkTaskListenerTest.validate_shouldIProcessAndHandleEvent2.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.ConvertWorkTaskListenerTest.validate_shouldIProcessAndHandleEvent3.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.DatabaseDeserializerTest.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.DatabaseDeserializerTest.validateMediaInfo.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.DatabaseDeserializerTest.validateMetadataRead.executor&quot;: &quot;Debug&quot;,
-    &quot;Gradle.DatabaseDeserializerTest.validateParsingOfStartEvent.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.Download Sources.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.EncodeArgumentCreatorTaskTest.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.FfmpegProgressDecoderTest.executor&quot;: &quot;Debug&quot;,
-    &quot;Gradle.FfmpegProgressDecoderTest.parseReadout1.executor&quot;: &quot;Debug&quot;,
-    &quot;Gradle.FileNameParserTest.assertDotRemoval.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.FileNameParserTest.assertTitleFails.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.FileNameParserTest.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.MediaProcessing2 [apps:build].executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.MediaProcessing2 [apps:clean].executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.MediaProcessing2 [build].executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.MediaProcessing2 [clean].executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.MediaProcessing2:apps [assemble].executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.MediaProcessing2:apps:coordinator [:apps:coordinator:no.iktdev.mediaprocessing.coordinator.CoordinatorApplicationKt.main()].executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.MetadataWaitOrDefaultTaskListenerTest.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.MetadataWaitOrDefaultTaskListenerTest.validate_shouldIProcessAndHandleEvent1.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.MetadataWaitOrDefaultTaskListenerTest.validate_shouldIProcessAndHandleEvent2.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.MetadataWaitOrDefaultTaskListenerTest.validate_shouldIProcessAndHandleEvent3.executor&quot;: &quot;Debug&quot;,
-    &quot;Gradle.ParseMediaFileStreamsTaskListenerTest.testParse.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.SubtitleArgumentsTest.assertThatCommentaryIsNotSelected.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.SubtitleArgumentsTest.assertThatCorrectTrackIsSelected.executor&quot;: &quot;Debug&quot;,
-    &quot;Gradle.SubtitleArgumentsTest.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.SubtitleArgumentsTest.validate1.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.SubtitleArgumentsTest.validate2.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.SubtitleArgumentsTest.validate2_2.executor&quot;: &quot;Debug&quot;,
-    &quot;Gradle.SubtitleArgumentsTest.validate3.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.SubtitleArgumentsTest.validate3_2.executor&quot;: &quot;Debug&quot;,
-    &quot;Gradle.Tests in 'MediaProcessing.apps.coordinator.test'.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.Tests in 'MediaProcessing.apps.processer'.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.VideoArgumentsTest.h264Stream1.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.VideoArgumentsTest.h264Stream2.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.VideoArgumentsTest.hevcStream1.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.VideoArgumentsTest.hevcStream2.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.VideoArgumentsTest.vc1Stream.executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.VideoArgumentsTest.vc1Stream2.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.All in MediaProcessing.executor&quot;: &quot;Run&quot;,
-    &quot;Kotlin.Env - CoordinatorApplicationKt.executor&quot;: &quot;Debug&quot;,
-    &quot;Kotlin.UIApplicationKt.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary&quot;: &quot;JUnit5&quot;,
-    &quot;com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5&quot;: &quot;&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;v4&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/mount/870 EVO 1TB/Workspace/MediaProcessing2&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Gradle.AudioArgumentsTest.executor": "Run",
+    "Gradle.AudioArgumentsTest.validateChecks1.executor": "Run",
+    "Gradle.AudioArgumentsTest.validateChecks3.executor": "Run",
+    "Gradle.Build MediaProcessing2.executor": "Run",
+    "Gradle.ConvertWorkTaskListenerTest.executor": "Run",
+    "Gradle.ConvertWorkTaskListenerTest.validateCreationOfConvertTasks.executor": "Run",
+    "Gradle.ConvertWorkTaskListenerTest.validateParsingOfEvents.executor": "Run",
+    "Gradle.ConvertWorkTaskListenerTest.validate_shouldIProcessAndHandleEvent1.executor": "Run",
+    "Gradle.ConvertWorkTaskListenerTest.validate_shouldIProcessAndHandleEvent2.executor": "Run",
+    "Gradle.ConvertWorkTaskListenerTest.validate_shouldIProcessAndHandleEvent3.executor": "Run",
+    "Gradle.DatabaseDeserializerTest.executor": "Run",
+    "Gradle.DatabaseDeserializerTest.validateMediaInfo.executor": "Run",
+    "Gradle.DatabaseDeserializerTest.validateMetadataRead.executor": "Debug",
+    "Gradle.DatabaseDeserializerTest.validateParsingOfStartEvent.executor": "Run",
+    "Gradle.Download Sources.executor": "Run",
+    "Gradle.EncodeArgumentCreatorTaskTest.executor": "Run",
+    "Gradle.FfmpegProgressDecoderTest.executor": "Debug",
+    "Gradle.FfmpegProgressDecoderTest.parseReadout1.executor": "Debug",
+    "Gradle.FileNameParserTest.assertDotRemoval.executor": "Run",
+    "Gradle.FileNameParserTest.assertTitleFails.executor": "Run",
+    "Gradle.FileNameParserTest.executor": "Run",
+    "Gradle.MediaProcessing2 [apps:build].executor": "Run",
+    "Gradle.MediaProcessing2 [apps:clean].executor": "Run",
+    "Gradle.MediaProcessing2 [build].executor": "Run",
+    "Gradle.MediaProcessing2 [clean].executor": "Run",
+    "Gradle.MediaProcessing2:apps [assemble].executor": "Run",
+    "Gradle.MediaProcessing2:apps:coordinator [:apps:coordinator:no.iktdev.mediaprocessing.coordinator.CoordinatorApplicationKt.main()].executor": "Run",
+    "Gradle.MetadataWaitOrDefaultTaskListenerTest.executor": "Run",
+    "Gradle.MetadataWaitOrDefaultTaskListenerTest.validate_shouldIProcessAndHandleEvent1.executor": "Run",
+    "Gradle.MetadataWaitOrDefaultTaskListenerTest.validate_shouldIProcessAndHandleEvent2.executor": "Run",
+    "Gradle.MetadataWaitOrDefaultTaskListenerTest.validate_shouldIProcessAndHandleEvent3.executor": "Debug",
+    "Gradle.ParseMediaFileStreamsTaskListenerTest.testParse.executor": "Run",
+    "Gradle.SubtitleArgumentsTest.assertThatCommentaryIsNotSelected.executor": "Run",
+    "Gradle.SubtitleArgumentsTest.assertThatCorrectTrackIsSelected.executor": "Debug",
+    "Gradle.SubtitleArgumentsTest.executor": "Run",
+    "Gradle.SubtitleArgumentsTest.validate1.executor": "Run",
+    "Gradle.SubtitleArgumentsTest.validate2.executor": "Run",
+    "Gradle.SubtitleArgumentsTest.validate2_2.executor": "Debug",
+    "Gradle.SubtitleArgumentsTest.validate3.executor": "Run",
+    "Gradle.SubtitleArgumentsTest.validate3_2.executor": "Debug",
+    "Gradle.Tests in 'MediaProcessing.apps.coordinator.test'.executor": "Run",
+    "Gradle.Tests in 'MediaProcessing.apps.processer'.executor": "Run",
+    "Gradle.VideoArgumentsTest.h264Stream1.executor": "Run",
+    "Gradle.VideoArgumentsTest.h264Stream2.executor": "Run",
+    "Gradle.VideoArgumentsTest.hevcStream1.executor": "Run",
+    "Gradle.VideoArgumentsTest.hevcStream2.executor": "Run",
+    "Gradle.VideoArgumentsTest.vc1Stream.executor": "Run",
+    "Gradle.VideoArgumentsTest.vc1Stream2.executor": "Run",
+    "JUnit.All in MediaProcessing.executor": "Run",
+    "Kotlin.Env - CoordinatorApplicationKt.executor": "Debug",
+    "Kotlin.UIApplicationKt.executor": "Run",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary": "JUnit5",
+    "com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5": "",
+    "git-widget-placeholder": "v5",
+    "ignore.virus.scanning.warn.message": "true",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "/mount/870 EVO 1TB/Workspace/mediaprocesserv5",
+    "project.structure.last.edited": "Modules",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
-      &quot;JSON&quot;
+  "keyToStringList": {
+    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
+      "JSON"
     ]
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Workspace\MediaProcessing2\apps\processer\src\test\kotlin\no\iktdev\mediaprocessing\processer" />
@@ -368,7 +536,6 @@
       <item itemvalue="Gradle.VideoArgumentsTest.vc1Stream" />
       <item itemvalue="Gradle.VideoArgumentsTest.vc1Stream2" />
       <item itemvalue="Kotlin.UIApplicationKt" />
-      <item itemvalue="Kotlin.Env - CoordinatorApplicationKt" />
     </list>
     <recent_temporary>
       <list>
@@ -1112,15 +1279,6 @@
           <line>32</line>
           <option name="timeStamp" value="189" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="kotlin-function">
-          <url>file://$PROJECT_DIR$/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskCoordinator.kt</url>
-          <line>48</line>
-          <properties class="no.iktdev.mediaprocessing.converter.TaskCoordinator" method="pullForAvailableTasks">
-            <option name="EMULATED" value="true" />
-            <option name="WATCH_EXIT" value="false" />
-          </properties>
-          <option name="timeStamp" value="191" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterApplication.kt b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterApplication.kt
deleted file mode 100644
index a45c1bd6..00000000
--- a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterApplication.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package no.iktdev.mediaprocessing.converter
-
-import mu.KotlinLogging
-import no.iktdev.exfl.coroutines.CoroutinesDefault
-import no.iktdev.exfl.coroutines.CoroutinesIO
-import no.iktdev.exfl.observable.Observables
-import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig
-import no.iktdev.eventi.database.MySqlDataSource
-import no.iktdev.mediaprocessing.shared.common.database.cal.RunnerManager
-import no.iktdev.mediaprocessing.shared.common.database.cal.TasksManager
-import no.iktdev.mediaprocessing.shared.common.database.tables.runners
-import no.iktdev.mediaprocessing.shared.common.database.tables.tasks
-import no.iktdev.mediaprocessing.shared.common.getAppVersion
-import no.iktdev.mediaprocessing.shared.common.toEventsDatabase
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.runApplication
-import org.springframework.transaction.annotation.Transactional
-import javax.annotation.PreDestroy
-
-@SpringBootApplication
-class ConvertApplication {
-    @PreDestroy
-    fun onShutdown() {
-        doTransactionalCleanup()
-    }
-
-    @Transactional
-    fun doTransactionalCleanup() {
-        runnerManager.unlist()
-    }
-}
-
-val ioCoroutine = CoroutinesIO()
-val defaultCoroutine = CoroutinesDefault()
-
-lateinit var taskManager: TasksManager
-lateinit var runnerManager: RunnerManager
-
-
-private lateinit var eventsDatabase: MySqlDataSource
-private val log = KotlinLogging.logger {}
-
-fun getEventsDatabase(): MySqlDataSource {
-    return eventsDatabase
-}
-
-fun main(args: Array<String>) {
-    ioCoroutine.addListener(listener = object: Observables.ObservableValue.ValueListener<Throwable> {
-        override fun onUpdated(value: Throwable) {
-            value.printStackTrace()
-        }
-    })
-    defaultCoroutine.addListener(listener = object: Observables.ObservableValue.ValueListener<Throwable> {
-        override fun onUpdated(value: Throwable) {
-            value.printStackTrace()
-        }
-    })
-
-
-    eventsDatabase = DatabaseEnvConfig.toEventsDatabase()
-    eventsDatabase.createDatabase()
-    eventsDatabase.createTables(tasks, runners)
-    taskManager = TasksManager(eventsDatabase)
-
-    runnerManager = RunnerManager(dataSource = getEventsDatabase(), applicationName = ConvertApplication::class.java.simpleName)
-    runnerManager.assignRunner()
-
-    runApplication<ConvertApplication>(*args)
-    log.info { "App Version: ${getAppVersion()}" }
-}
-//private val logger = KotlinLogging.logger {}
diff --git a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterEnv.kt b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterEnv.kt
deleted file mode 100644
index 8cf84efb..00000000
--- a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterEnv.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package no.iktdev.mediaprocessing.converter
-
-import no.iktdev.exfl.using
-import java.io.File
-
-class ConverterEnv {
-    companion object {
-        val allowOverwrite = System.getenv("ALLOW_OVERWRITE").toBoolean() ?: false
-        val syncDialogs = System.getenv("SYNC_DIALOGS").toBoolean()
-        val outFormats: List<String> = System.getenv("OUT_FORMATS")?.split(",")?.toList() ?: emptyList()
-
-        val logDirectory = if (!System.getenv("LOG_DIR").isNullOrBlank()) File(System.getenv("LOG_DIR")) else
-            File("data").using("logs", "convert")
-    }
-}
\ No newline at end of file
diff --git a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/Implementations.kt b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/Implementations.kt
deleted file mode 100644
index 96c37d03..00000000
--- a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/Implementations.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package no.iktdev.mediaprocessing.converter
-
-import no.iktdev.mediaprocessing.shared.common.socket.SocketImplementation
-import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Import
-
-@Configuration
-class SocketLocalInit: SocketImplementation()
diff --git a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskCoordinator.kt b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskCoordinator.kt
deleted file mode 100644
index 5114e81c..00000000
--- a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskCoordinator.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package no.iktdev.mediaprocessing.converter
-
-import mu.KotlinLogging
-import no.iktdev.mediaprocessing.shared.common.*
-import no.iktdev.mediaprocessing.shared.common.database.cal.ActiveMode
-import no.iktdev.mediaprocessing.shared.common.database.cal.RunnerManager
-import no.iktdev.mediaprocessing.shared.common.task.TaskType
-import no.iktdev.mediaprocessing.shared.common.contract.data.Event
-import org.springframework.scheduling.annotation.EnableScheduling
-import org.springframework.stereotype.Service
-
-@Service
-@EnableScheduling
-class TaskCoordinator(): TaskCoordinatorBase() {
-    private val log = KotlinLogging.logger {}
-    override fun onProduceEvent(event: Event) {
-        taskManager.produceEvent(event)
-    }
-
-    override fun onCoordinatorReady() {
-        super.onCoordinatorReady()
-        runnerManager = RunnerManager(dataSource = getEventsDatabase(), applicationName = ConvertApplication::class.java.simpleName)
-        runnerManager.assignRunner()
-    }
-
-
-    override val taskAvailabilityEventListener: MutableMap<TaskType, MutableList<TaskQueueListener>> = mutableMapOf(
-        TaskType.Convert to mutableListOf(),
-    )
-
-    private val taskListeners: MutableSet<TaskEvents> = mutableSetOf()
-    fun getTaskListeners(): List<TaskEvents> {
-        return taskListeners.toList()
-    }
-    fun addTaskEventListener(listener: TaskEvents) {
-        taskListeners.add(listener)
-    }
-
-    fun addConvertTaskListener(listener: TaskQueueListener) {
-        addTaskListener(TaskType.Convert, listener)
-    }
-
-    override fun addTaskListener(type: TaskType, listener: TaskQueueListener) {
-        super.addTaskListener(type, listener)
-        pullForAvailableTasks()
-    }
-
-
-    override fun pullForAvailableTasks() {
-        if (runnerManager.iAmSuperseded()) {
-            // This will let the application complete but not consume new
-            val prevState = taskMode
-            taskMode = ActiveMode.Passive
-            if (taskMode != prevState && taskMode == ActiveMode.Passive) {
-                log.warn { "A newer version has been detected. Changing mode to $taskMode, no new tasks will be processed" }
-            }
-            return
-        }
-        val available = taskManager.getClaimableTasks().asClaimable()
-        available.forEach { (type, list) ->
-            taskAvailabilityEventListener[type]?.forEach {  listener ->
-                list.foreachOrUntilClaimed {
-                    listener.onTaskAvailable(it)
-                }
-            }
-        }
-    }
-
-    override fun clearExpiredClaims() {
-        val expiredClaims = taskManager.getTasksWithExpiredClaim().filter { it.task in listOf(TaskType.Convert) }
-        expiredClaims.forEach {
-            log.info { "Found event with expired claim: ${it.referenceId}::${it.eventId}::${it.task}" }
-        }
-        expiredClaims.forEach {
-            val result = taskManager.deleteTaskClaim(referenceId = it.referenceId, eventId = it.eventId)
-            if (result) {
-                log.info { "Released claim on ${it.referenceId}::${it.eventId}::${it.task}" }
-            } else {
-                log.error { "Failed to release claim on ${it.referenceId}::${it.eventId}::${it.task}" }
-            }
-        }
-    }
-
-    override fun getEnabledState(): Boolean {
-        return runnerManager.amIEnabled()
-    }
-
-    interface TaskEvents {
-        fun onCancelOrStopProcess(eventId: String)
-    }
-
-}
diff --git a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/convert/ConvertListener.kt b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/convert/ConvertListener.kt
deleted file mode 100644
index 8ee527a3..00000000
--- a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/convert/ConvertListener.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package no.iktdev.mediaprocessing.converter.convert
-
-interface ConvertListener {
-    fun onStarted(inputFile: String)
-    fun onCompleted(inputFile: String, outputFiles: List<String>)
-    fun onError(inputFile: String, message: String) {}
-}
\ No newline at end of file
diff --git a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/convert/Converter2.kt b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/convert/Converter2.kt
deleted file mode 100644
index 5a28b093..00000000
--- a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/convert/Converter2.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package no.iktdev.mediaprocessing.converter.convert
-
-import no.iktdev.library.subtitle.Configuration
-import no.iktdev.library.subtitle.Syncro
-import no.iktdev.library.subtitle.classes.Dialog
-import no.iktdev.library.subtitle.classes.DialogType
-import no.iktdev.library.subtitle.export.Export
-import no.iktdev.library.subtitle.reader.BaseReader
-import no.iktdev.library.subtitle.reader.Reader
-import no.iktdev.mediaprocessing.converter.ConverterEnv
-import no.iktdev.mediaprocessing.shared.common.contract.data.ConvertData
-import no.iktdev.mediaprocessing.shared.common.contract.dto.SubtitleFormats
-import java.io.File
-import kotlin.jvm.Throws
-
-class Converter2(val data: ConvertData,
-    private val listener: ConvertListener) {
-
-    @Throws(FileUnavailableException::class)
-    private fun getReader(): BaseReader? {
-        val file = File(data.inputFile)
-        if (!file.canRead())
-            throw FileUnavailableException("Can't open file for reading..")
-        return Reader(file).getSubtitleReader()
-    }
-
-    private fun syncDialogs(input: List<Dialog>): List<Dialog> {
-        return if (ConverterEnv.syncDialogs) Syncro().sync(input) else input
-    }
-
-    fun canRead(): Boolean {
-        try {
-            val reader = getReader()
-            return reader != null
-        } catch (e: FileUnavailableException) {
-            return false
-        }
-    }
-
-    @Throws(FileUnavailableException::class, FileIsNullOrEmpty::class)
-    fun execute() {
-        val file = File(data.inputFile)
-        listener.onStarted(file.absolutePath)
-        try {
-            Configuration.exportJson = true
-            val read = getReader()?.read() ?: throw FileIsNullOrEmpty()
-            if (read.isEmpty())
-                throw FileIsNullOrEmpty()
-            val filtered = read.filter { !it.ignore && it.type !in listOf(DialogType.SIGN_SONG, DialogType.CAPTION) }
-            val syncOrNotSync = syncDialogs(filtered)
-
-            val exporter = Export(file, File(data.outputDirectory), data.outputFileName)
-
-            val outFiles = if (data.formats.isEmpty()) {
-                exporter.write(syncOrNotSync)
-            } else {
-                val exported = mutableListOf<File>()
-                if (data.formats.contains(SubtitleFormats.SRT)) {
-                    exported.add(exporter.writeSrt(syncOrNotSync))
-                }
-                if (data.formats.contains(SubtitleFormats.SMI)) {
-                    exported.add(exporter.writeSmi(syncOrNotSync))
-                }
-                if (data.formats.contains(SubtitleFormats.VTT)) {
-                    exported.add(exporter.writeVtt(syncOrNotSync))
-                }
-                exported
-            }
-            listener.onCompleted(file.absolutePath, outFiles.map { it.absolutePath })
-        } catch (e: Exception) {
-            listener.onError(file.absolutePath, e.message ?: e.localizedMessage)
-        }
-    }
-
-
-    class FileIsNullOrEmpty(override val message: String? = "File read is null or empty"): RuntimeException()
-    class FileUnavailableException(override val message: String): RuntimeException()
-}
\ No newline at end of file
diff --git a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/tasks/ConvertService.kt b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/tasks/ConvertService.kt
deleted file mode 100644
index 4dba80ec..00000000
--- a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/tasks/ConvertService.kt
+++ /dev/null
@@ -1,136 +0,0 @@
-package no.iktdev.mediaprocessing.converter.tasks
-
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import mu.KotlinLogging
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.mediaprocessing.converter.*
-import no.iktdev.mediaprocessing.converter.convert.ConvertListener
-import no.iktdev.mediaprocessing.converter.convert.Converter2
-import no.iktdev.mediaprocessing.shared.common.database.cal.Status
-import no.iktdev.mediaprocessing.shared.common.services.TaskService
-import no.iktdev.mediaprocessing.shared.common.task.Task
-import no.iktdev.mediaprocessing.shared.common.contract.data.ConvertData
-import no.iktdev.mediaprocessing.shared.common.contract.data.ConvertWorkPerformed
-import no.iktdev.mediaprocessing.shared.common.contract.data.ConvertedData
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-
-@Service
-class ConvertService(
-    @Autowired var tasks: TaskCoordinator,
-) : TaskService(), ConvertListener, TaskCoordinator.TaskEvents {
-
-    fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    override val log = KotlinLogging.logger {}
-    override val logDir = ConverterEnv.logDirectory
-
-    override fun getServiceId(serviceName: String): String {
-        return super.getServiceId(this::class.java.simpleName)
-    }
-
-
-    var worker: Converter2? = null
-
-    override fun onAttachListener() {
-        tasks.addConvertTaskListener(this)
-        tasks.addTaskEventListener(this)
-    }
-
-
-    override fun isReadyToConsume(): Boolean {
-        return worker == null
-    }
-
-    override fun isTaskClaimable(task: Task): Boolean {
-        return !taskManager.isTaskClaimed(referenceId = task.referenceId, eventId = task.eventId)
-    }
-
-
-    override fun onTaskAssigned(task: Task) {
-        startConvert(task)
-    }
-
-    fun startConvert(task: Task) {
-        val convert = task.data as ConvertData
-        worker = Converter2(convert, this)
-        worker?.execute()
-    }
-
-    override fun onStarted(inputFile: String) {
-        val task = assignedTask ?: return
-        taskManager.markTaskAsClaimed(task.referenceId, task.eventId, serviceId)
-        log.info { "Convert started for ${task.referenceId}" }
-
-    }
-
-
-    override fun onCompleted(inputFile: String, outputFiles: List<String>) {
-        val task = assignedTask ?: return
-        val taskData: ConvertData = task.data as ConvertData
-        log.info { "Convert completed for ${task.referenceId}" }
-        val claimSuccessful = taskManager.markTaskAsCompleted(task.referenceId, task.eventId)
-
-        runBlocking {
-            delay(1000)
-            if (!claimSuccessful) {
-                taskManager.markTaskAsCompleted(task.referenceId, task.eventId)
-                delay(1000)
-            }
-            var readbackIsSuccess = taskManager.isTaskCompleted(task.referenceId, task.eventId)
-            while (!readbackIsSuccess) {
-                delay(1000)
-                readbackIsSuccess = taskManager.isTaskCompleted(task.referenceId, task.eventId)
-            }
-
-            tasks.onProduceEvent(ConvertWorkPerformed(
-                metadata = EventMetadata(
-                    referenceId = task.referenceId,
-                    derivedFromEventId = task.eventId,
-                    status = EventStatus.Success,
-                    source = getProducerName()
-                ),
-                data = ConvertedData(
-                    language = taskData.language,
-                    outputFiles = outputFiles,
-                    baseName = taskData.storeFileName
-                )
-            ))
-            onClearTask()
-        }
-    }
-
-    override fun onError(inputFile: String, message: String) {
-        val task = assignedTask ?: return
-        super.onError(inputFile, message)
-        log.info { "Convert error for ${task.referenceId}\nmessage: $message" }
-
-        taskManager.markTaskAsCompleted(task.referenceId, task.eventId, Status.ERROR, message)
-
-        tasks.onProduceEvent(ConvertWorkPerformed(
-            metadata = EventMetadata(
-                referenceId = task.referenceId,
-                derivedFromEventId = task.eventId,
-                status = EventStatus.Failed,
-                source = getProducerName()
-            )
-        ))
-        onClearTask()
-    }
-
-
-    override fun onClearTask() {
-        super.onClearTask()
-        worker = null
-    }
-
-    override fun onCancelOrStopProcess(eventId: String) {
-        TODO("Not yet implemented")
-    }
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorApplication.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorApplication.kt
deleted file mode 100644
index e4e31d76..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorApplication.kt
+++ /dev/null
@@ -1,140 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator
-
-
-import jakarta.annotation.PreDestroy
-import mu.KotlinLogging
-import no.iktdev.exfl.coroutines.CoroutinesDefault
-import no.iktdev.exfl.coroutines.CoroutinesIO
-import no.iktdev.exfl.observable.Observables
-import no.iktdev.mediaprocessing.shared.common.*
-import no.iktdev.eventi.database.MySqlDataSource
-import no.iktdev.mediaprocessing.shared.common.database.cal.EventsManager
-import no.iktdev.mediaprocessing.shared.common.database.cal.RunnerManager
-import no.iktdev.mediaprocessing.shared.common.database.cal.TasksManager
-import no.iktdev.streamit.library.db.tables.catalog
-import no.iktdev.streamit.library.db.tables.genre
-import no.iktdev.streamit.library.db.tables.helper.data_audio
-import no.iktdev.streamit.library.db.tables.helper.data_video
-import no.iktdev.streamit.library.db.tables.movie
-import no.iktdev.streamit.library.db.tables.serie
-import no.iktdev.streamit.library.db.tables.subtitle
-import no.iktdev.streamit.library.db.tables.summary
-import no.iktdev.streamit.library.db.tables.titles
-import no.iktdev.streamit.library.db.tables.users
-
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.runApplication
-import org.springframework.context.annotation.Bean
-import org.springframework.transaction.annotation.Transactional
-
-val log = KotlinLogging.logger {}
-lateinit var eventDatabase: EventsDatabase
-private lateinit var eventsManager: EventsManager
-lateinit var runnerManager: RunnerManager
-
-
-@SpringBootApplication
-class CoordinatorApplication {
-
-    @Bean
-    fun eventManager(): EventsManager {
-        return eventsManager
-    }
-
-    @PreDestroy
-    fun onShutdown() {
-        doTransactionalCleanup()
-    }
-
-    @Transactional
-    fun doTransactionalCleanup() {
-        runnerManager.unlist()
-    }
-
-}
-
-private lateinit var storeDatabase: MySqlDataSource
-
-val ioCoroutine = CoroutinesIO().
-        also {
-            it.addListener(object : Observables.ObservableValue.ValueListener<Throwable> {
-                override fun onUpdated(value: Throwable) {
-                    log.error { "IO Coroutine" + value.printStackTrace() }
-                }
-            })
-        }
-val defaultCoroutine = CoroutinesDefault().
-    also {
-        it.addListener(object : Observables.ObservableValue.ValueListener<Throwable> {
-            override fun onUpdated(value: Throwable) {
-                log.error { "Default Coroutine" + value.printStackTrace() }
-            }
-        })
-    }
-
-
-fun getStoreDatabase(): MySqlDataSource {
-    return storeDatabase
-}
-
-lateinit var taskManager: TasksManager
-
-fun main(args: Array<String>) {
-
-
-    printSharedConfig()
-
-    ioCoroutine.addListener(listener = object: Observables.ObservableValue.ValueListener<Throwable> {
-        override fun onUpdated(value: Throwable) {
-            value.printStackTrace()
-        }
-    })
-    defaultCoroutine.addListener(listener = object: Observables.ObservableValue.ValueListener<Throwable> {
-        override fun onUpdated(value: Throwable) {
-            value.printStackTrace()
-        }
-    })
-    eventDatabase = EventsDatabase().also {
-        eventsManager = EventsManager(it.database)
-    }
-
-
-
-    storeDatabase = DatabaseEnvConfig.toStoredDatabase()
-    storeDatabase.createDatabase()
-
-
-    taskManager = TasksManager(eventDatabase.database)
-
-
-    val tables = arrayOf(
-        catalog,
-        genre,
-        movie,
-        serie,
-        subtitle,
-        summary,
-        users,
-        data_audio,
-        data_video,
-        titles
-    )
-    storeDatabase.createTables(*tables)
-
-    runnerManager = RunnerManager(dataSource = eventDatabase.database, applicationName = CoordinatorApplication::class.java.simpleName)
-    runnerManager.assignRunner()
-
-    runApplication<CoordinatorApplication>(*args)
-    log.info { "App Version: ${getAppVersion()}" }
-}
-
-fun printSharedConfig() {
-    log.info { "File Input: ${SharedConfig.incomingContent}" }
-    log.info { "File Output: ${SharedConfig.outgoingContent}" }
-    log.info { "Ffprobe: ${SharedConfig.ffprobe}" }
-    log.info { "Ffmpeg: ${SharedConfig.ffmpeg}" }
-
-    /*log.info { "Database: ${DatabaseConfig.database} @ ${DatabaseConfig.address}:${DatabaseConfig.port}" }
-    log.info { "Username: ${DatabaseConfig.username}" }
-    log.info { "Password: ${if (DatabaseConfig.password.isNullOrBlank()) "Is not set" else "Is set"}" }*/
-}
\ No newline at end of file
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
deleted file mode 100644
index cc5d15b5..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventCoordinator.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.data.eventId
-import no.iktdev.eventi.implementations.ActiveMode
-import no.iktdev.eventi.implementations.EventCoordinator
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.ProcessType
-import no.iktdev.mediaprocessing.shared.common.contract.data.Event
-import no.iktdev.mediaprocessing.shared.common.contract.data.MediaProcessStartEvent
-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.OperationEvents
-import no.iktdev.mediaprocessing.shared.common.database.cal.EventsManager
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.context.event.ApplicationReadyEvent
-import org.springframework.context.ApplicationContext
-import org.springframework.context.event.EventListener
-import org.springframework.stereotype.Component
-import java.io.File
-import java.util.*
-
-@Component
-class Coordinator(
-    @Autowired
-    override var applicationContext: ApplicationContext,
-    @Autowired
-    override var eventManager: EventsManager
-
-) : EventCoordinator<Event, EventsManager>() {
-
-    @EventListener(ApplicationReadyEvent::class)
-    fun onApplicationReady() {
-        onReady()
-    }
-
-    fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    public fun startProcess(file: File, type: ProcessType) {
-        val operations: List<OperationEvents> = listOf(
-            OperationEvents.ENCODE,
-            OperationEvents.EXTRACT,
-            OperationEvents.CONVERT
-        )
-        startProcess(file, type, operations)
-    }
-
-    fun startProcess(file: File, type: ProcessType, operations: List<OperationEvents>): UUID {
-        val referenceId: UUID = UUID.randomUUID()
-        val event = MediaProcessStartEvent(
-            metadata = EventMetadata(
-                referenceId = referenceId.toString(),
-                status = EventStatus.Success,
-                source = getProducerName()
-            ),
-            data = StartEventData(
-                file = file.absolutePath,
-                type = type,
-                operations = operations
-            )
-        )
-
-        produceNewEvent(event)
-        return referenceId
-    }
-
-    fun permitWorkToProceedOn(referenceId: String, events: List<Event>, message: String) {
-        val defaultRequiredBy = listOf(Events.EncodeParameterCreated, Events.ExtractParameterCreated)
-        val eventToAttachTo = if (events.any { it.eventType in defaultRequiredBy }) {
-            events.findLast { it.eventType in defaultRequiredBy }
-        } else events.find { it.eventType == Events.ProcessStarted }
-        if (eventToAttachTo == null) {
-            log.error { "No event to attach permit to" }
-            return
-        }
-
-
-        produceNewEvent(
-            PermitWorkCreationEvent(
-                metadata = EventMetadata(
-                    referenceId = referenceId,
-                    derivedFromEventId = eventToAttachTo.eventId(),
-                    status = EventStatus.Success,
-                    source = getProducerName()
-                ),
-                data = message
-            )
-        )
-    }
-
-    override fun getActiveTaskMode(): ActiveMode {
-        if (runnerManager.iAmSuperseded()) {
-            // This will let the application complete but not consume new
-            taskMode = ActiveMode.Passive
-        }
-        return taskMode
-    }
-
-    override fun updateEnabledState(): Boolean {
-        isEnabled = runnerManager.amIEnabled()
-        return isEnabled
-    }
-
-}
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
deleted file mode 100644
index 271cd466..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorEventListener.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-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
-    abstract override val listensForEvents: List<Events>
-    abstract override var coordinator: Coordinator?
-}
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorUtils.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorUtils.kt
deleted file mode 100644
index 61ca2e97..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/CoordinatorUtils.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator
-
-import dev.vishna.watchservice.KWatchChannel
-import dev.vishna.watchservice.asWatchChannel
-import kotlinx.coroutines.runBlocking
-import java.io.File
-
-data class FileWatcher(val file: File, val watcher: KWatchChannel)
-
-suspend fun File.asWatcher(block: suspend (KWatchChannel) -> Unit): FileWatcher {
-    val channel = this.asWatchChannel()
-    block(channel)
-    return FileWatcher(this, channel)
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/EventsDatabase.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/EventsDatabase.kt
deleted file mode 100644
index c14552de..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/EventsDatabase.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator
-
-import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig
-import no.iktdev.mediaprocessing.shared.common.database.tables.*
-import no.iktdev.mediaprocessing.shared.common.toEventsDatabase
-
-class EventsDatabase() {
-    val database = DatabaseEnvConfig.toEventsDatabase()
-    val tables = listOf(
-        events, // For kafka
-        allEvents,
-        tasks,
-        runners,
-        filesProcessed,
-        files
-    )
-
-    init {
-        database.createDatabase()
-        database.createTables(*tables.toTypedArray())
-    }
-
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/Implementations.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/Implementations.kt
deleted file mode 100644
index a7d839b3..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/Implementations.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator
-
-import no.iktdev.mediaprocessing.shared.common.socket.SocketImplementation
-import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Import
-
-@Configuration
-class SocketLocalInit: SocketImplementation() {
-}
-
-
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
deleted file mode 100644
index 0003e915..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/ActionEventController.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.controller
-
-import com.google.gson.Gson
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-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
-import org.springframework.stereotype.Controller
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-
-@Controller
-@RequestMapping(path = ["/action"])
-class ActionEventController(@Autowired var coordinator: Coordinator, @Autowired var eventsManager: EventsManager) {
-
-
-    @PostMapping("/flow/proceed")
-    fun permitRunOnSequence(@RequestBody data: RequestWorkProceed): ResponseEntity<String> {
-
-        val set = eventsManager.getEventsWith(data.referenceId)
-        if (set.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.NO_CONTENT).body(Gson().toJson(data))
-        }
-        coordinator.permitWorkToProceedOn(data.referenceId, set, "Requested by ${data.source}")
-
-        //EVENT_MEDIA_WORK_PROCEED_PERMITTED("event:media-work-proceed:permitted")
-        return ResponseEntity.ok(null)
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/InfoController.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/InfoController.kt
deleted file mode 100644
index be8ded0a..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/InfoController.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.controller
-
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-class InfoController {
-    @Autowired lateinit var coordinator: Coordinator
-
-    @GetMapping("/cachedReferenceList")
-    fun cachedReferenceList(): String {
-        return coordinator.cachedReferenceList.joinToString(",")
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/PollController.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/PollController.kt
deleted file mode 100644
index 0e706023..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/PollController.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.controller
-
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Controller
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-
-@Controller
-@RequestMapping(path = ["/polls"])
-class PollController(@Autowired var coordinator: Coordinator) {
-
-    @GetMapping()
-    fun polls(): String {
-        val stat = coordinator.getActivePolls()
-        return "Active Polls ${stat.active}/${stat.total}"
-    }
-}
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/RequestEventController.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/RequestEventController.kt
deleted file mode 100644
index 55398e85..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/RequestEventController.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.controller
-
-import com.google.gson.Gson
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.shared.common.contract.ProcessType
-import no.iktdev.mediaprocessing.shared.common.contract.dto.EventRequest
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OperationEvents
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.HttpStatus
-import org.springframework.http.ResponseEntity
-import org.springframework.stereotype.Controller
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.ResponseStatus
-import java.io.File
-
-@Controller
-@RequestMapping(path = ["/request"])
-class RequestEventController(@Autowired var coordinator: Coordinator) {
-
-    @PostMapping("/convert")
-    @ResponseStatus(HttpStatus.OK)
-    fun requestConvert(@RequestBody payload: EventRequest): ResponseEntity<String> {
-        var referenceId: String?
-        try {
-            val file = File(payload.file)
-            if (!file.exists()) {
-                return ResponseEntity.status(HttpStatus.NO_CONTENT).body(payload.file)
-            }
-            referenceId = coordinator.startProcess(file, payload.mode, listOf(OperationEvents.CONVERT)).toString()
-
-        } catch (e: Exception) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Gson().toJson(payload))
-        }
-        return ResponseEntity.ok(referenceId)
-    }
-
-    @PostMapping("/extract")
-    @ResponseStatus(HttpStatus.OK)
-    fun requestExtract(@RequestBody payload: EventRequest): ResponseEntity<String> {
-        var referenceId: String?
-        try {
-            val file = File(payload.file)
-            if (!file.exists()) {
-                return ResponseEntity.status(HttpStatus.NO_CONTENT).body(Gson().toJson(payload))
-            }
-            referenceId = coordinator.startProcess(file, payload.mode, listOf(OperationEvents.EXTRACT)).toString()
-
-        } catch (e: Exception) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Gson().toJson(payload))
-        }
-        return ResponseEntity.ok(referenceId)
-    }
-
-    @PostMapping("/encode")
-    @ResponseStatus(HttpStatus.OK)
-    fun requestEncode(@RequestBody payload: EventRequest): ResponseEntity<String> {
-        var referenceId: String?
-        try {
-            val file = File(payload.file)
-            if (!file.exists()) {
-                return ResponseEntity.status(HttpStatus.NO_CONTENT).body(Gson().toJson(payload))
-            }
-            referenceId = coordinator.startProcess(file, payload.mode, listOf(OperationEvents.ENCODE)).toString()
-
-        } catch (e: Exception) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Gson().toJson(payload))
-        }
-        return ResponseEntity.ok(referenceId)
-    }
-
-    @PostMapping("/all")
-    @ResponseStatus(HttpStatus.OK)
-    fun requestAll(@RequestBody payload: EventRequest): ResponseEntity<String> {
-        var referenceId: String?
-        try {
-            val file = File(payload.file)
-            if (!file.exists()) {
-                return ResponseEntity.status(HttpStatus.NO_CONTENT).body(payload.file)
-            }
-            referenceId = coordinator.startProcess(file, type = payload.mode).toString()
-
-        } catch (e: Exception) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Gson().toJson(payload))
-        }
-        return ResponseEntity.ok(referenceId)
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/coordination/ProcesserSocketMessageListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/coordination/ProcesserSocketMessageListener.kt
deleted file mode 100644
index 33531a9b..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/coordination/ProcesserSocketMessageListener.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.coordination
-
-/**
- * Class to handle messages from websockets, produced by Processer instances.
- * This is due to keep a overview of progress by processer
- */
-class ProcesserSocketMessageListener {
-
-
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/services/UnattendedIndexing.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/services/UnattendedIndexing.kt
deleted file mode 100644
index b9c377f1..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/services/UnattendedIndexing.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.services
-
-import mu.KotlinLogging
-import no.iktdev.eventi.database.withTransaction
-import no.iktdev.mediaprocessing.coordinator.eventDatabase
-import no.iktdev.mediaprocessing.shared.common.SharedConfig
-import no.iktdev.mediaprocessing.shared.common.database.tables.files
-import no.iktdev.mediaprocessing.shared.common.extended.isSupportedVideoFile
-import no.iktdev.mediaprocessing.shared.common.md5
-import org.jetbrains.exposed.sql.insertIgnore
-import org.springframework.scheduling.annotation.EnableScheduling
-import org.springframework.scheduling.annotation.Scheduled
-import org.springframework.stereotype.Service
-
-@Service
-@EnableScheduling
-class UnattendedIndexing {
-    private val logger = KotlinLogging.logger {}
-
-    @Scheduled(fixedDelay = 60_000*60)
-    fun indexContent() {
-        val allFiles = SharedConfig.incomingContent.flatMap { folder ->
-            logger.info { "Performing indexing of folder: ${folder.name}" }
-            folder.walkTopDown()
-                .filter { it.isFile && it.isSupportedVideoFile() }
-                .toMutableList()
-        }
-        val ignoredParents = allFiles
-            .asSequence()
-            .mapNotNull { it.parentFile }
-            .filter { parent -> parent.resolve(".ignore").exists() }
-            .toSet()
-
-        val fileList = allFiles
-            .filter { file -> file.parentFile !in ignoredParents }
-
-        fileList.forEach { file ->
-            withTransaction(eventDatabase.database) {
-                files.insertIgnore {
-                    it[this.fileName] = file.absolutePath
-                    it[this.baseName] = file.nameWithoutExtension
-                    it[this.folder] = file.parentFile.absolutePath
-                    it[this.checksum] = file.md5()
-                }
-            }
-        }
-        logger.info { "Indexing completed" }
-        /*val storedFiles = withTransaction(eventDatabase.database) {
-            files.selectAll()
-                .mapNotNull { it[files.fileName] }
-        }?.forEach { file ->
-            if (!File(file).exists()) {
-                logger.info { "Detected file no longer existing. Performing removal i db" }
-                files.deleteWhere {
-                    (fileName eq file)
-                }
-            }
-        }*/
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt
deleted file mode 100644
index 834f686d..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.implementations
-
-import com.google.gson.Gson
-import mu.KotlinLogging
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.referenceId
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.ProcessType
-import no.iktdev.mediaprocessing.shared.common.contract.data.Event
-import no.iktdev.mediaprocessing.shared.common.contract.data.MediaProcessStartEvent
-import no.iktdev.mediaprocessing.shared.common.contract.data.az
-
-abstract class WorkTaskListener: CoordinatorEventListener() {
-    private val log = KotlinLogging.logger {}
-
-    override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List<Event>): Boolean {
-        if (!super.shouldIProcessAndHandleEvent(incomingEvent, events)) {
-            return false
-        }
-        return canStart(incomingEvent, events)
-    }
-
-    fun canStart(incomingEvent: Event, events: List<Event>): Boolean {
-        val autoStart = events.find { it.eventType == Events.ProcessStarted }?.az<MediaProcessStartEvent>()?.data
-        if (autoStart == null) {
-            log.error { "Start event not found. Requiring permit event" }
-        }
-        return if (incomingEvent.eventType == Events.WorkProceedPermitted) {
-            return true
-        } else {
-            if (autoStart == null || autoStart.type == ProcessType.MANUAL) {
-                log.warn { "${incomingEvent.metadata.referenceId} waiting for Proceed event due to Manual process" }
-                false
-            } else true
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/BaseInfoFromFileTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/BaseInfoFromFileTaskListener.kt
deleted file mode 100644
index a71dbeb3..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/BaseInfoFromFileTaskListener.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.shared.common.parsing.FileNameParser
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OperationEvents
-import no.iktdev.mediaprocessing.shared.common.contract.dto.isOnly
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import java.io.File
-
-@Service
-class BaseInfoFromFileTaskListener() : CoordinatorEventListener() {
-    @Autowired
-    override var coordinator: Coordinator? = null
-
-    val log = KotlinLogging.logger {}
-
-    override val produceEvent: Events = Events.BaseInfoRead
-    override val listensForEvents: List<Events> = listOf(Events.ProcessStarted)
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List<Event>): Boolean {
-        if (!super.shouldIProcessAndHandleEvent(incomingEvent, events)) {
-            return false
-        }
-        val startedWith = events.findFirstEventOf<MediaProcessStartEvent>()?.data?.operations;
-        if (startedWith?.isOnly(OperationEvents.CONVERT) == true) {
-            return false
-        }
-        return true
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume()
-        if (event == null) {
-            log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" }
-            return
-        }
-        active = true
-        val message = try {
-            readFileInfo(event.data as StartEventData, event.metadata.eventId)?.let {
-                BaseInfoEvent(metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()), data = it)
-            } ?: BaseInfoEvent(metadata = event.makeDerivedEventInfo(EventStatus.Failed, getProducerName()))
-        } catch (e: Exception) {
-            e.printStackTrace()
-            BaseInfoEvent(metadata = event.makeDerivedEventInfo(EventStatus.Failed, getProducerName()))
-        }
-        onProduceEvent(message)
-        active = false
-    }
-
-
-    @Throws(Exception::class)
-    fun readFileInfo(started: StartEventData, eventId: String): BaseInfo? {
-        return try {
-            val fileName = File(started.file).nameWithoutExtension
-            val fileNameParser = FileNameParser(fileName)
-            BaseInfo(
-                title = fileNameParser.guessDesiredTitle().also {
-                                                                if (it.isBlank()) {
-                                                                    throw RuntimeException("No title found!")
-                                                                }
-                },
-                sanitizedName = fileNameParser.guessDesiredFileName(),
-                searchTitles = fileNameParser.guessSearchableTitle()
-            )
-        } catch (e: Exception) {
-            e.printStackTrace()
-            log.error { "Failed to read info from file\neventId: $eventId" }
-            throw e
-        }
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(BaseInfoEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-        ))
-    }
-
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt
deleted file mode 100644
index a99ab29c..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt
+++ /dev/null
@@ -1,301 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import com.google.gson.GsonBuilder
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.LocalDateTimeAdapter
-import no.iktdev.eventi.data.*
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.EventsSummaryMapping
-import no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.store.*
-import no.iktdev.mediaprocessing.coordinator.tasksV2.validator.CompletionValidator
-import no.iktdev.mediaprocessing.shared.common.parsing.NameHelper
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.reader.*
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import java.io.File
-import java.time.LocalDateTime
-
-@Service
-class CompletedTaskListener : CoordinatorEventListener() {
-    val log = KotlinLogging.logger {}
-
-    var doNotProduceComplete = System.getenv("DISABLE_COMPLETE").toBoolean() ?: false
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    override fun onReady() {
-        super.onReady()
-        if (doNotProduceComplete) {
-            log.warn { "DoNotProduceComplete is set!\n\tNo complete event will be triggered!\n\tTo enable production of complete vents, remove this line in your environment: \"DISABLE_COMPLETE\"" }
-        }
-    }
-
-    override fun shouldIHandleFailedEvents(incomingEvent: Event): Boolean {
-        return true
-    }
-
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-
-    override val produceEvent: Events = Events.ProcessCompleted
-    override val listensForEvents: List<Events> = listOf(
-        Events.CoverDownloaded,
-        Events.ConvertTaskCompleted,
-        Events.EncodeTaskCompleted,
-        Events.ExtractTaskCompleted,
-        Events.PersistContent
-    )
-
-
-    override fun isPrerequisitesFulfilled(incomingEvent: Event, events: List<Event>): Boolean {
-        val started = events.find { it.eventType == Events.ProcessStarted }?.az<MediaProcessStartEvent>()
-        if (started == null) {
-            log.info { "No Start event" }
-            return false
-        }
-        val viableEvents = events.filter { it.isSuccessful() }
-
-        if (!CompletionValidator.req1(started, events)) {
-            return false
-        }
-
-        if (!CompletionValidator.req2(started.data?.operations ?: emptyList(), viableEvents)) {
-            return false
-        }
-
-        if (!CompletionValidator.req3(started.data?.operations ?: emptyList(), events)) {
-            return false
-        }
-
-        if (!CompletionValidator.req4(events)) {
-            return false
-        }
-
-        return super.isPrerequisitesFulfilled(incomingEvent, events)
-    }
-
-    fun getVideo(events: List<Event>): VideoDetails? {
-        val mediaInfo = events.find { it.eventType == Events.ReadOutNameAndType }?.az<MediaOutInformationConstructedEvent>()
-        val encoded = events.find { it.eventType == Events.EncodeTaskCompleted }?.dataAs<EncodedData>()?.outputFile
-        if (encoded == null) {
-            log.warn { "No encode no video details!" }
-            return null
-        }
-
-        val proper = mediaInfo?.data?.toValueObject() ?: run {
-            log.error { "Unable to get media object from data" }
-            return null
-        }
-
-        return VideoDetails(
-            type = proper.type,
-            fileName = File(encoded).name,
-            serieInfo = if (proper !is EpisodeInfo) null else SerieInfo(
-                episodeTitle = proper.episodeTitle,
-                episodeNumber = proper.episode,
-                seasonNumber = proper.season,
-                title = proper.title
-            )
-        )
-    }
-
-    override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List<Event>): Boolean {
-        if (doNotProduceComplete) {
-            return false
-        }
-        val result = super.shouldIProcessAndHandleEvent(incomingEvent, events)
-        return result && incomingEvent.eventType == Events.PersistContent
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume() ?: return
-        active = true
-
-        val mediaInfo: ComposedMediaInfo = composeMediaInfo(events) ?: run {
-            log.error { "Unable to compose media info for ${event.referenceId()}" }
-            return
-        }
-
-        val existingTitles = ContentTitleStore.findMasterTitles(mediaInfo.titles)
-
-        val usableCollection: String = if (existingTitles.isNotEmpty())
-            ContentCatalogStore.getCollectionByTitleAndType(mediaInfo.type, existingTitles) ?: run {
-                log.warn { "Did not receive collection based on titles provided in list ${existingTitles.joinToString(",")}, falling back to fallbackCollection: ${mediaInfo.fallbackCollection}" }
-                mediaInfo.fallbackCollection
-            } else mediaInfo.fallbackCollection
-
-        val genreIdsForCatalog = ContentGenresStore.storeAndGetIds(mediaInfo.genres)
-
-        val persistedContent: PersistedContent? = events.find { it.eventType == Events.PersistContent }?.az<PersistedContentEvent>()?.data
-        if (persistedContent == null) {
-            log.error { "PersistedContent is null! can't continue" }
-            return
-        }
-
-        val completedData = CompletedData(
-            eventIdsCollected = events.map { it.eventId() },
-            metadataStored = MetadataStored(
-                title = mediaInfo.title,
-                titles = mediaInfo.titles,
-                type = mediaInfo.type,
-                cover = persistedContent.cover?.storeDestinationFileName?.let { File(it).name },
-                collection = usableCollection,
-                summary = mediaInfo.summaries,
-                foundTitles = existingTitles,
-                genres = mediaInfo.genres,
-                genreIds = genreIdsForCatalog
-            )
-        )
-
-        completedData.metadataStored.let { meta ->
-            val catalogId = ContentCatalogStore.storeCatalog(
-                title = meta.title,
-                titles = mediaInfo.titles,
-                collection = meta.collection,
-                type = meta.type,
-                cover = meta.cover,
-                genres = meta.genreIds
-            )
-            catalogId?.let { id ->
-                meta.summary.forEach { summary ->
-                    ContentMetadataStore.storeSummary(id, summary)
-                }
-            }
-            ContentTitleStore.store(meta.title, meta.titles)
-        }
-
-
-        val videoInfo = getVideo(events)
-        if (videoInfo != null) {
-            ContentCatalogStore.storeMedia(
-                title = completedData.metadataStored.title,
-                titles = mediaInfo.titles,
-                collection = completedData.metadataStored.collection,
-                type = completedData.metadataStored.type,
-                videoDetails = videoInfo
-            )
-        } else {
-            log.info { "VideoInfo is null" }
-        }
-
-
-        try {
-            persistedContent.subtitles.let { subtitles ->
-                subtitles.map {
-                    ContentSubtitleStore.storeSubtitles(
-                        collection = completedData.metadataStored.collection,
-                        destinationFile = File(it.storeDestinationFileName)
-                    )
-                }
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-
-        ProcessedFileStore.store(
-            mediaInfo.title,
-            events,
-            EventsSummaryMapping().map(events)
-        )
-
-        if (!doNotProduceComplete) {
-            onProduceEvent(MediaProcessCompletedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-                data = completedData
-            ))
-        } else {
-            log.warn { "Do not produce complete is enabled!" }
-        }
-
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(MediaProcessCompletedEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-            data = null
-        ))
-    }
-
-    internal data class ComposedMediaInfo(
-        val title: String,
-        val fallbackCollection: String,
-
-        val titles: List<String>,
-        val type: String,
-        val summaries: List<SummaryInfo>,
-        val genres: List<String>
-    )
-
-    private fun composeMediaInfo(events: List<Event>): ComposedMediaInfo? {
-        val baseInfo =
-            events.find { it.eventType == Events.BaseInfoRead }?.az<BaseInfoEvent>()?.let {
-                it.data
-            } ?: run {
-                log.info { "Cant find BaseInfoEvent on ${Events.BaseInfoRead}" }
-                return null
-            }
-        val metadataInfo = getMetadata(events)
-        val mediaInfo: MediaInfo = events.find { it.eventType == Events.ReadOutNameAndType }
-            ?.az<MediaOutInformationConstructedEvent>()?.let {
-                it.data?.toValueObject()
-            } ?: run {
-            log.info { "Cant find MediaOutInformationConstructedEvent on ${Events.ReadOutNameAndType}" }
-            return null
-        }
-
-        val summaries = metadataInfo?.summary?.filter { it.summary != null }
-            ?.map { SummaryInfo(language = it.language, summary = it.summary!!) } ?: emptyList()
-
-        val titles: MutableList<String> = mutableListOf(mediaInfo.title)
-        metadataInfo?.let {
-            titles.addAll(it.altTitle)
-            titles.add(it.title)
-            titles.add(NameHelper.normalize(it.title))
-        }
-
-        return ComposedMediaInfo(
-            title = NameHelper.normalize(metadataInfo?.title ?: mediaInfo.title),
-            fallbackCollection = baseInfo.title,
-            titles = titles,
-            type = metadataInfo?.type ?: mediaInfo.type,
-            summaries = summaries,
-            genres = metadataInfo?.genres ?: emptyList()
-        )
-    }
-
-
-    private fun getMetadata(events: List<Event>): pyMetadata? {
-        val referenceId = events.firstNotNullOf { it.referenceId() }
-
-        val gson = GsonBuilder()
-            .registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
-            .setPrettyPrinting()
-            .create()
-
-        //log.info { "Events in complete:\n${gson.toJson(events)}" }
-
-        val metadataFound = events.find { it.eventType == Events.MetadataSearchPerformed }
-        if (metadataFound == null) {
-            log.warn { "ReferenceId: $referenceId -> ${Events.MetadataSearchPerformed} was not found in events" }
-            return null
-        }
-        val data = metadataFound.az<MediaMetadataReceivedEvent>()
-        if (data == null) {
-            log.warn { "ReferenceId: $referenceId -> ${Events.MetadataSearchPerformed} does not contain any data.." }
-            return null
-        }
-
-        return data.data
-    }
-
-
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt
deleted file mode 100644
index af4fc5cf..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import com.google.gson.Gson
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.*
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.taskManager
-import no.iktdev.mediaprocessing.coordinator.tasksV2.implementations.WorkTaskListener
-import no.iktdev.mediaprocessing.shared.common.task.TaskType
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OperationEvents
-import no.iktdev.mediaprocessing.shared.common.contract.dto.isOnly
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import java.io.File
-
-@Service
-class ConvertWorkTaskListener: WorkTaskListener() {
-    val log = KotlinLogging.logger {}
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-    override val produceEvent: Events = Events.ConvertTaskCreated
-    override val listensForEvents: List<Events> = listOf(
-        Events.ExtractTaskCompleted,
-        Events.ProcessStarted
-    )
-
-    override fun canProduceMultipleEvents(): Boolean {
-        return true
-    }
-    override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List<Event>): Boolean {
-        val mainCheckOk = super.shouldIProcessAndHandleEvent(incomingEvent, events);
-        if (!mainCheckOk) {
-            return false
-        }
-
-        val startOperation = events.findFirstOf(Events.ProcessStarted)?.dataAs<StartEventData>()
-        if (startOperation == null) {
-            log.error { "Could not find 'ProcessStarted' event" }
-            return false
-        }
-
-        if (incomingEvent.isOfEvent(Events.ProcessStarted)) {
-            return startOperation.operations.isOnly(OperationEvents.CONVERT)
-        }
-
-        val producedEvents = events.filter { it.eventType == produceEvent }
-        val shouldIHandleAndProduce = producedEvents.none { it.derivedFromEventId() == incomingEvent.eventId() }
-
-        val extractedEvent = events.findFirstEventOf<ExtractWorkPerformedEvent>()
-        if (extractedEvent?.isSuccessful() == true && shouldIHandleAndProduce) {
-            log.info { "Permitting handling of event: ${extractedEvent.data?.outputFile}" }
-        }
-
-        return shouldIHandleAndProduce
-    }
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume()
-        if (event == null) {
-            log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" }
-            return
-        }
-        active = true
-
-        var language: String? = null
-        var storeAsFile: String? = null
-
-
-        val file = if (event.eventType == Events.ExtractTaskCompleted) {
-            val foundEvent = event.az<ExtractWorkPerformedEvent>()?.data
-            language = foundEvent?.language
-            storeAsFile = foundEvent?.storeFileName
-            foundEvent?.outputFile
-        } else if (event.eventType == Events.ProcessStarted) {
-            val startEvent = event.az<MediaProcessStartEvent>()?.data
-            if (startEvent?.operations?.isOnly(OperationEvents.CONVERT) == true) {
-                startEvent.file
-            } else null
-        } else {
-            events.find { it.eventType == Events.ExtractTaskCompleted }
-                ?.az<ExtractWorkPerformedEvent>()?.data?.outputFile
-        }
-
-
-        val convertFile = file?.let { File(it) }
-        if (language.isNullOrEmpty()) {
-            convertFile?.parentFile?.nameWithoutExtension?.let {
-                if (it.length == 3) {
-                    language = it.lowercase()
-                }
-            }
-        }
-
-
-        if (convertFile == null || !convertFile.exists()) {
-            onProduceEvent(ConvertWorkCreatedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Failed, getProducerName())
-            ))
-            return
-        } else {
-            val convertData = ConvertData(
-                language = language ?: "unk",
-                inputFile = convertFile.absolutePath,
-                outputFileName = convertFile.nameWithoutExtension,
-                storeFileName = storeAsFile ?: convertFile.nameWithoutExtension,
-                outputDirectory = convertFile.parentFile.absolutePath,
-                allowOverwrite = true
-            )
-
-
-            ConvertWorkCreatedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-                data = convertData
-            ).also { event ->
-                val taskCreatedSuccessfully = taskManager.createTask(
-                    referenceId = event.referenceId(),
-                    eventId = event.eventId(),
-                    derivedFromEventId = event.derivedFromEventId(),
-                    task = TaskType.Convert,
-                    data = WGson.gson.toJson(event.data!!),
-                    inputFile = event.data!!.inputFile
-                )
-
-                if (!taskCreatedSuccessfully) {
-                    log.error { "Failed to create task for events on referenceId: ${event.referenceId()}" }
-                } else {
-                    onProduceEvent(event)
-                }
-
-            }
-        }
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(ConvertWorkCreatedEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-            data = null
-        ))
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CoverDownloadTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CoverDownloadTaskListener.kt
deleted file mode 100644
index 6186aa07..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CoverDownloadTaskListener.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import kotlinx.coroutines.runBlocking
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.shared.common.DownloadClient
-import no.iktdev.mediaprocessing.shared.common.SharedConfig
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class CoverDownloadTaskListener : CoordinatorEventListener() {
-    val log = KotlinLogging.logger {}
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-    override val produceEvent: Events = Events.CoverDownloaded
-    override val listensForEvents: List<Events> = listOf(Events.ReadOutCover)
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume()
-        if (event == null) {
-            log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" }
-            return
-        }
-        active = true
-
-        val failedEventDefault = MediaCoverDownloadedEvent(
-            metadata = event.makeDerivedEventInfo(EventStatus.Failed, getProducerName())
-        )
-
-        val data = event.az<MediaCoverInfoReceivedEvent>()?.data
-        if (data == null) {
-            log.error { "No valid data for use to obtain cover" }
-            onProduceEvent(failedEventDefault)
-            active = false
-            return
-        }
-
-        val client = DownloadClient(data.url, SharedConfig.cachedContent, data.outFileBaseName)
-
-        val outFile = runBlocking {
-            client.getOutFile()
-        }
-
-        val coversInDifferentFormats = SharedConfig.cachedContent.listFiles { it -> it.isFile && it.extension.lowercase() in client.contentTypeToExtension().values }
-            ?.filter { it.nameWithoutExtension.contains(data.outFileBaseName, ignoreCase = true) } ?: emptyList()
-
-        val result = if (outFile?.exists() == true) {
-            outFile
-        } else if (coversInDifferentFormats.isNotEmpty()) {
-            coversInDifferentFormats.random()
-        } else if (outFile != null) {
-            runBlocking {
-                client.download(outFile)
-            }
-        } else {
-            null
-        }
-
-        if (result == null) {
-            log.error { "Could not download cover, check logs ${event.metadata.eventId} " }
-        } else {
-            if (!result.exists() || !result.canRead()) {
-                onProduceEvent(failedEventDefault)
-                active = false
-                return
-            }
-            onProduceEvent(MediaCoverDownloadedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-                data = DownloadedCover(result.absolutePath)
-            ))
-        }
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(MediaCoverDownloadedEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-            data = null
-        ))
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CoverFromMetadataTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CoverFromMetadataTaskListener.kt
deleted file mode 100644
index 030ba309..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CoverFromMetadataTaskListener.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.data.isSuccessful
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.shared.common.parsing.NameHelper
-import no.iktdev.mediaprocessing.shared.common.parsing.Regexes
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class CoverFromMetadataTaskListener: CoordinatorEventListener() {
-    val log = KotlinLogging.logger {}
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-
-    override val produceEvent: Events = Events.ReadOutCover
-    override val listensForEvents: List<Events> = listOf(
-        Events.MetadataSearchPerformed
-    )
-
-    override fun isPrerequisitesFulfilled(incomingEvent: Event, events: List<Event>): Boolean {
-        return (events.any { it.eventType == Events.ReadOutNameAndType && it.isSuccessful() })
-    }
-
-    override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List<Event>): Boolean {
-        val state = super.shouldIProcessAndHandleEvent(incomingEvent, events)
-        if (!state) {
-            return false
-        }
-        if (!incomingEvent.isSuccessful())
-            return false
-        return listensForEvents.any { it == incomingEvent.eventType }
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume()
-        if (event == null) {
-            log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" }
-            return
-        }
-        active = true
-
-        val baseInfo = events.find { it.eventType == Events.BaseInfoRead }?.az<BaseInfoEvent>()?.data
-        if (baseInfo == null) {
-            log.info { "No base info" }
-            active = false
-            return
-        }
-
-        val metadataEvent = if (event.eventType == Events.MetadataSearchPerformed) event else events.findLast { it.eventType == Events.MetadataSearchPerformed }
-        val metadata = metadataEvent?.az<MediaMetadataReceivedEvent>()?.data
-            ?: return
-        val mediaOutInfo = events.find { it.eventType == Events.ReadOutNameAndType }?.az<MediaOutInformationConstructedEvent>()?.data
-        if (mediaOutInfo == null) {
-            log.info { "No Media out info" }
-            active = false
-            return
-        }
-        val videoInfo = mediaOutInfo.toValueObject()
-
-        var coverTitle = metadata.title ?: videoInfo?.title ?: baseInfo.title
-        coverTitle = Regexes.illegalCharacters.replace(coverTitle, " - ")
-        coverTitle = Regexes.trimWhiteSpaces.replace(coverTitle, " ")
-
-        val coverUrl = metadata.cover
-        val result = if (coverUrl.isNullOrBlank()) {
-            log.warn { "No cover available for ${baseInfo.title}" }
-            MediaCoverInfoReceivedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Skipped, getProducerName())
-            )
-        } else {
-            MediaCoverInfoReceivedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-                data = CoverDetails(
-                    url = coverUrl,
-                    outFileBaseName = NameHelper.normalize(coverTitle),
-                )
-            )
-        }
-        onProduceEvent(result)
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(MediaCoverInfoReceivedEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-            data = null
-        ))
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkArgumentsTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkArgumentsTaskListener.kt
deleted file mode 100644
index 4d6024c6..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkArgumentsTaskListener.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.data.dataAs
-import no.iktdev.eventi.data.eventId
-import no.iktdev.eventi.data.referenceId
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.EncodeWorkArgumentsMapping
-import no.iktdev.mediaprocessing.shared.common.Preference
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OperationEvents
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class EncodeWorkArgumentsTaskListener: CoordinatorEventListener() {
-    val log = KotlinLogging.logger {}
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-
-    override val produceEvent: Events = Events.EncodeParameterCreated
-
-    override val listensForEvents: List<Events> = listOf(
-        Events.StreamParsed,
-        Events.ReadOutNameAndType
-    )
-    val preference = Preference.getPreference()
-
-    override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List<Event>): Boolean {
-        val state = super.shouldIProcessAndHandleEvent(incomingEvent, events)
-        val eventType = events.map { it.eventType }
-
-        val startOperation = events.findFirstOf(Events.ProcessStarted)?.dataAs<StartEventData>() ?: return false
-        if (startOperation.operations.none { it == OperationEvents.ENCODE }) {
-            return false
-        }
-
-        return state && eventType.containsAll(listensForEvents)
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume()
-        if (event == null) {
-            log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" }
-            return
-        }
-        val started = events.find { it.eventType == Events.ProcessStarted }?.az<MediaProcessStartEvent>() ?: return
-
-        active = true
-
-        val streamsParsed = events.findEventOf<MediaFileStreamsParsedEvent>()
-        val streams = streamsParsed?.data
-        if (streams == null) {
-            active = false
-            log.error { "No Streams found for event ${streamsParsed?.metadata?.eventId} with referenceId ${event.metadata.referenceId}" }
-            return
-        }
-
-        val mediaInfoEvent = events.findEventOf<MediaOutInformationConstructedEvent>()
-        val mediaInfo = mediaInfoEvent?.data
-        val mediaInfoData = mediaInfo?.toValueObject()
-        if (mediaInfo == null) {
-            active = false
-            log.error { "No media info data was provided for event ${mediaInfoEvent?.eventId()} with referenceId ${event.referenceId()}" }
-            return
-        } else if (mediaInfoData == null) {
-            active = false
-            log.error { "Media info data was provided but could not be converted to proper value object for event ${mediaInfoEvent?.eventId()} with referenceId ${event.referenceId()}" }
-            return
-        }
-
-        val inputFile = started.data?.file
-        if (inputFile == null) {
-            active = false
-            log.error { "No input file was provided for the start event ${started.metadata.eventId} with referenceId ${event.referenceId()}" }
-            return
-        }
-        val mapper = EncodeWorkArgumentsMapping(
-            inputFile = inputFile,
-            outFileFullName = mediaInfoData.fullName,
-            streams = streams,
-            preference = preference.encodePreference
-        )
-
-        val result = mapper.getArguments()
-        if (result == null) {
-            onProduceEvent(EncodeArgumentCreatedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Failed, getProducerName())
-            ))
-        } else {
-            onProduceEvent(EncodeArgumentCreatedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-                data = result
-            ))
-        }
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(EncodeArgumentCreatedEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-        ))
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt
deleted file mode 100644
index a886b376..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.data.derivedFromEventId
-import no.iktdev.eventi.data.eventId
-import no.iktdev.eventi.data.referenceId
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.taskManager
-import no.iktdev.mediaprocessing.coordinator.tasksV2.implementations.WorkTaskListener
-import no.iktdev.mediaprocessing.shared.common.task.TaskType
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class EncodeWorkTaskListener : WorkTaskListener() {
-    private val log = KotlinLogging.logger {}
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-    override val produceEvent: Events = Events.EncodeTaskCreated
-    override val listensForEvents: List<Events> = listOf(
-        Events.EncodeParameterCreated,
-        Events.WorkProceedPermitted
-    )
-
-    override fun canProduceMultipleEvents(): Boolean {
-        return true
-    }
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume()
-        if (event == null) {
-            log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" }
-            return
-        }
-        active = true
-
-        val encodeArguments = if (event.eventType == Events.EncodeParameterCreated) {
-            event.az<EncodeArgumentCreatedEvent>()?.data
-        } else {
-            events.find { it.eventType == Events.EncodeParameterCreated }
-                ?.az<EncodeArgumentCreatedEvent>()?.data
-        }
-        if (encodeArguments == null) {
-            log.error { "No Encode arguments found.. referenceId: ${event.referenceId()}" }
-            active = false
-            return
-        }
-        EncodeWorkCreatedEvent(
-            metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-            data = encodeArguments
-        ).also { event ->
-            val taskCreatedSuccessfully = taskManager.createTask(
-                referenceId = event.referenceId(),
-                eventId = event.eventId(),
-                derivedFromEventId = event.derivedFromEventId(),
-                task = TaskType.Encode,
-                data = WGson.gson.toJson(event.data!!),
-                inputFile = event.data!!.inputFile
-            )
-            if (!taskCreatedSuccessfully) {
-                log.error { "Failed to create task for events on referenceId: ${event.referenceId()}" }
-            } else {
-                onProduceEvent(event)
-            }
-        }
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(EncodeWorkCreatedEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-            data = null
-        ))
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkArgumentsTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkArgumentsTaskListener.kt
deleted file mode 100644
index 0cb8ae25..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkArgumentsTaskListener.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.data.eventId
-import no.iktdev.eventi.data.referenceId
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.ExtractWorkArgumentsMapping
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OperationEvents
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class ExtractWorkArgumentsTaskListener: CoordinatorEventListener() {
-    val log = KotlinLogging.logger {}
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-    override val produceEvent: Events = Events.ExtractParameterCreated
-    override val listensForEvents: List<Events> = listOf(
-        Events.StreamParsed,
-        Events.ReadOutNameAndType
-    )
-
-    override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List<Event>): Boolean {
-        val startEvent = events.findFirstEventOf<MediaProcessStartEvent>()
-        val hasExtract = startEvent?.data?.operations?.contains(OperationEvents.EXTRACT) ?: false
-
-        val state = super.shouldIProcessAndHandleEvent(incomingEvent, events)
-        val eventType = events.map { it.eventType }
-        return hasExtract && state && eventType.containsAll(listensForEvents)
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume()
-        if (event == null) {
-            log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" }
-            return
-        }
-        val started = events.find { it.eventType == Events.ProcessStarted }?.az<MediaProcessStartEvent>() ?: return
-
-        active = true
-
-        val streamsParsed = events.findEventOf<MediaFileStreamsParsedEvent>()
-        val streams = streamsParsed?.data
-        if (streams == null) {
-            active = false
-            log.error { "No Streams found for event ${streamsParsed?.metadata?.eventId} with referenceId ${event.metadata.referenceId}" }
-            return
-        }
-
-        val mediaInfoEvent = events.findEventOf<MediaOutInformationConstructedEvent>()
-        val mediaInfo = mediaInfoEvent?.data
-        val mediaInfoData = mediaInfo?.toValueObject()
-        if (mediaInfo == null) {
-            active = false
-            log.error { "No media info data was provided for event ${mediaInfoEvent?.eventId()} with referenceId ${event.referenceId()}" }
-            return
-        } else if (mediaInfoData == null) {
-            active = false
-            log.error { "Media info data was provided but could not be converted to proper value object for event ${mediaInfoEvent?.eventId()} with referenceId ${event.referenceId()}" }
-            return
-        }
-
-        val inputFile = started.data?.file
-        if (inputFile == null) {
-            active = false
-            log.error { "No input file was provided for the start event ${started.metadata.eventId} with referenceId ${event.referenceId()}" }
-            return
-        }
-
-        val mapper = ExtractWorkArgumentsMapping(
-            inputFile = inputFile,
-            outFileFullName = mediaInfoData.fullName,
-            streams = streams
-        )
-
-        val result = mapper.getArguments()
-        if (result.isEmpty()) {
-            onProduceEvent(ExtractArgumentCreatedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Skipped, getProducerName())
-            ))
-        } else {
-            onProduceEvent(ExtractArgumentCreatedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-                data = result
-            ))
-        }
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(ExtractArgumentCreatedEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-            data = null
-        ))
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt
deleted file mode 100644
index ff6c145f..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.data.derivedFromEventId
-import no.iktdev.eventi.data.eventId
-import no.iktdev.eventi.data.referenceId
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.taskManager
-import no.iktdev.mediaprocessing.coordinator.tasksV2.implementations.WorkTaskListener
-import no.iktdev.mediaprocessing.shared.common.task.TaskType
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class ExtractWorkTaskListener: WorkTaskListener() {
-    private val log = KotlinLogging.logger {}
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-    override val produceEvent: Events = Events.ExtractTaskCreated
-    override val listensForEvents: List<Events> = listOf(
-        Events.ExtractParameterCreated,
-        Events.WorkProceedPermitted
-    )
-
-    override fun canProduceMultipleEvents(): Boolean {
-        return true
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume()
-        if (event == null) {
-            log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" }
-            active = false
-            return
-        }
-        active = true
-
-        val arguments = if (event.eventType == Events.ExtractParameterCreated) {
-            event.az<ExtractArgumentCreatedEvent>()?.data
-        } else {
-            events.find { it.eventType == Events.ExtractParameterCreated }
-                ?.az<ExtractArgumentCreatedEvent>()?.data
-        }
-        if (arguments == null) {
-            log.error { "No Extract arguments found.. referenceId: ${event.referenceId()}" }
-            active = false
-            return
-        }
-        if (arguments.isEmpty()) {
-            active = false
-            return
-        }
-
-        arguments.mapNotNull {
-            ExtractWorkCreatedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-                data = it
-            )
-        }.forEach { event ->
-            val taskCreatedSuccessfully = taskManager.createTask(
-                referenceId = event.referenceId(),
-                eventId = event.eventId(),
-                derivedFromEventId = event.derivedFromEventId(),
-                task = TaskType.Extract,
-                data = WGson.gson.toJson(event.data!!),
-                inputFile = event.data!!.inputFile
-            )
-            if (!taskCreatedSuccessfully) {
-                log.error { "Failed to create task for events on referenceId: ${event.referenceId()}" }
-            } else {
-                onProduceEvent(event)
-            }
-        }
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(ExtractWorkCreatedEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-            data = null
-        ))
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt
deleted file mode 100644
index cef7a5f5..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt
+++ /dev/null
@@ -1,192 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import com.google.gson.JsonObject
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.coordinator.log
-import no.iktdev.mediaprocessing.shared.common.SharedConfig
-import no.iktdev.mediaprocessing.shared.common.parsing.FileNameDeterminate
-import no.iktdev.mediaprocessing.shared.common.parsing.NameHelper
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.data.EpisodeInfo
-import no.iktdev.mediaprocessing.shared.common.contract.data.MovieInfo
-import no.iktdev.mediaprocessing.shared.common.contract.data.pyMetadata
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import java.io.FileFilter
-
-
-@Service
-class MediaOutInformationTaskListener: CoordinatorEventListener() {
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-
-    override val produceEvent: Events = Events.ReadOutNameAndType
-    override val listensForEvents: List<Events> = listOf(
-        Events.MetadataSearchPerformed
-    )
-
-    override fun shouldIHandleFailedEvents(incomingEvent: Event): Boolean {
-        return (incomingEvent.eventType in listensForEvents)
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume()
-        if (event == null) {
-            log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" }
-            return
-        }
-        active = true
-
-        val metadataResult = event.az<MediaMetadataReceivedEvent>()
-        val mediaBaseInfo = events.findLast { it.eventType == Events.BaseInfoRead }?.az<BaseInfoEvent>()?.data
-        if (mediaBaseInfo == null) {
-            log.error { "Required event ${Events.BaseInfoRead} is not present" }
-            coordinator?.produceNewEvent(
-                MediaOutInformationConstructedEvent(
-                    metadata = event.makeDerivedEventInfo(EventStatus.Failed, getProducerName())
-                )
-            )
-            active = false
-            return
-        }
-        val pm = ProcessMediaInfoAndMetadata(mediaBaseInfo, metadataResult?.data)
-        val vi = pm.getVideoPayload()
-
-        val result = if (vi != null) {
-            MediaInfoReceived(
-                info = vi
-            ).let { MediaOutInformationConstructedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-                data = it
-            ) }
-        } else {
-            MediaOutInformationConstructedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Failed, getProducerName())
-            )
-        }
-        onProduceEvent(result)
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(MediaOutInformationConstructedEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-            data = null
-        ))
-    }
-
-    class ProcessMediaInfoAndMetadata(val baseInfo: BaseInfo, val metadata: pyMetadata? = null) {
-        var metadataDeterminedContentType: FileNameDeterminate.ContentType = metadata?.type?.let { contentType ->
-            when (contentType) {
-                "serie", "tv" -> FileNameDeterminate.ContentType.SERIE
-                "movie" -> FileNameDeterminate.ContentType.MOVIE
-                else -> FileNameDeterminate.ContentType.UNDEFINED
-            }
-        } ?: FileNameDeterminate.ContentType.UNDEFINED
-
-        fun getTitlesFromMetadata(): List<String> {
-            val titles: MutableList<String> = mutableListOf()
-            metadata?.title?.let { titles.add(it) }
-            metadata?.altTitle?.let { titles.addAll(it) }
-            return titles
-        }
-        fun getExistingCollections() = SharedConfig.outgoingContent.listFiles(FileFilter { it.isDirectory })?.map { it.name } ?: emptyList()
-
-        fun getUsedCollectionForTitleOrNull(): String? {
-            val exisiting = getExistingCollections()
-            if (exisiting.isEmpty()) {
-                return null
-            }
-            // Contains will cause mayhem!, ex: Collection with a single letter will make it messy
-            val existingMatch = exisiting.find { it.lowercase() == baseInfo.title.lowercase() }
-            return existingMatch
-        }
-
-        fun getCollection(): String {
-            val usedCollection = getUsedCollectionForTitleOrNull()
-            if (usedCollection != null) {
-                return usedCollection
-            }
-
-            val metaTitles = getTitlesFromMetadata()
-            val existingCollection = getExistingCollections()
-
-            // Contains will cause mayhem!, ex: Collection with a single letter will make it messy
-            val ecList = existingCollection.filter { ec -> metaTitles.any { it.lowercase() == ec.lowercase() } }
-            if (ecList.isNotEmpty()) {
-                return ecList.first()
-            }
-
-
-            return NameHelper.cleanup(baseInfo.title)
-        }
-
-        fun getTitle(): String {
-            val metaTitles = getTitlesFromMetadata()
-            val collection = getCollection()
-
-            val filteredMetaTitles = metaTitles.filter { it.lowercase().contains(baseInfo.title.lowercase()) || NameHelper.normalize(it).lowercase().contains(baseInfo.title.lowercase()) }
-
-
-            return if (collection == baseInfo.title) {
-                collection
-            } else {
-                NameHelper.cleanup (filteredMetaTitles.firstOrNull() ?: baseInfo.title)
-            }
-        }
-
-        fun getVideoPayload(): JsonObject? {
-            val defaultFnd = FileNameDeterminate(getTitle(), baseInfo.sanitizedName, FileNameDeterminate.ContentType.UNDEFINED)
-
-            val determinedContentType = defaultFnd.getDeterminedVideoInfo()
-                .let {
-                    when (it) {
-                        is EpisodeInfo -> FileNameDeterminate.ContentType.SERIE
-                        is MovieInfo -> FileNameDeterminate.ContentType.MOVIE
-                        else -> FileNameDeterminate.ContentType.UNDEFINED
-                    }
-                }
-            return if (determinedContentType == metadataDeterminedContentType && determinedContentType == FileNameDeterminate.ContentType.MOVIE) {
-                FileNameDeterminate(getTitle(), getTitle(), FileNameDeterminate.ContentType.MOVIE).getDeterminedVideoInfo()?.toJsonObject()
-            } else {
-                FileNameDeterminate(getTitle(), baseInfo.sanitizedName, metadataDeterminedContentType).getDeterminedVideoInfo()?.toJsonObject()
-            }
-        }
-
-    }
-
-
-    fun findNearestValue(list: List<String>, target: String): String? {
-        return list.minByOrNull { it.distanceTo(target) }
-    }
-
-    fun String.distanceTo(other: String): Int {
-        val distance = Array(length + 1) { IntArray(other.length + 1) }
-        for (i in 0..length) {
-            distance[i][0] = i
-        }
-        for (j in 0..other.length) {
-            distance[0][j] = j
-        }
-        for (i in 1..length) {
-            for (j in 1..other.length) {
-                distance[i][j] = minOf(
-                    distance[i - 1][j] + 1,
-                    distance[i][j - 1] + 1,
-                    distance[i - 1][j - 1] + if (this[i - 1] == other[j - 1]) 0 else 1
-                )
-            }
-        }
-        return distance[length][other.length]
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MetadataWaitOrDefaultTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MetadataWaitOrDefaultTaskListener.kt
deleted file mode 100644
index 14845999..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MetadataWaitOrDefaultTaskListener.kt
+++ /dev/null
@@ -1,161 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import kotlinx.coroutines.*
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.*
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.eventi.database.toEpochSeconds
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.lastOrSuccessOf
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.scheduling.annotation.EnableScheduling
-import org.springframework.scheduling.annotation.Scheduled
-import org.springframework.stereotype.Service
-import java.time.Duration
-import java.time.Instant
-import java.time.LocalDateTime
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-import java.util.*
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.atomic.AtomicBoolean
-
-val metadataTimeoutMinutes: Int = System.getenv("METADATA_TIMEOUT")?.toIntOrNull() ?: -1
-
-
-@Service
-class MetadataWaitOrDefaultTaskListener() : CoordinatorEventListener() {
-
-    override fun onReady() {
-        super.onReady()
-        if (metadataTimeoutMinutes == 0) {
-            log.warn { "Metadata timeout is set to 0 minutes.. This will block proceeding until metadata is found.." }
-        }
-    }
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-
-    val log = KotlinLogging.logger {}
-
-
-    override val produceEvent: Events = Events.MetadataSearchPerformed
-    override val listensForEvents: List<Events> = listOf(
-        Events.BaseInfoRead,
-        Events.MetadataSearchPerformed,
-        Events.ProcessCompleted
-    )
-
-    val metadataTimeout = metadataTimeoutMinutes * 60
-
-    private val timeoutScope = CoroutineScope(Dispatchers.Default)
-    val timeoutJobs = ConcurrentHashMap<String, Job>()
-
-
-    override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List<Event>): Boolean {
-        if (!isOfEventsIListenFor(incomingEvent))
-            return false
-
-        val childOf = events.filter { it.derivedFromEventId() == incomingEvent.eventId() }
-        val haveListenerProduced = childOf.any { it.eventType == produceEvent }
-        if (haveListenerProduced)
-            return false
-
-        val metadataEvent = events.findEventOf<MediaMetadataReceivedEvent>()
-        val metadataSource = metadataEvent?.metadata?.source
-
-        if (events.any { it.eventType == produceEvent } && !canProduceMultipleEvents() && metadataSource == getProducerName()) {
-            return false
-        }
-
-        if (!havProducedDerivedEventOnIncomingEvent(incomingEvent, events) && canProduceMultipleEvents()) {
-            return true
-        }
-
-        if (haveProducedExpectedMessageBasedOnEvent(incomingEvent, events))
-            return false
-
-        return (events.any { it.eventType == Events.BaseInfoRead })
-    }
-
-    /**
-     * This one gets special treatment, since it will only produce a timeout it does not need to use the incoming event
-     */
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        if (metadataTimeoutMinutes <= -1) {
-            log.info { "Metadata has no timeout, a timeout will be created.." }
-            val meta = incomingEvent.metadata()
-            onProduceEvent(MediaMetadataReceivedEvent(
-                metadata = meta.copy(
-                    status = EventStatus.Failed,
-                    source = getProducerName()
-                ),
-                data = null
-            ))
-            return
-        }
-
-
-        val searchPerformedEvent: MediaMetadataReceivedEvent? = events.findEventOf<MediaMetadataReceivedEvent>()
-
-        if (searchPerformedEvent != null) {
-            if (timeoutJobs.containsKey(searchPerformedEvent.referenceId())) {
-                val job = timeoutJobs.remove(searchPerformedEvent.referenceId())
-                job?.cancel()
-            }
-        }
-
-
-        val baseInfo = events.findFirstEventOf<BaseInfoEvent>()
-        if (baseInfo?.isSuccessful() != true) {
-            return
-        }
-
-        if (incomingEvent.isOfEvent(Events.BaseInfoRead)) {
-            if (timeoutJobs.containsKey(incomingEvent.metadata().referenceId))
-                return
-            val ttsc = timeoutScope.launch {
-                createTimeout(incomingEvent.metadata().referenceId, incomingEvent.metadata().eventId, baseInfo)
-            }
-            timeoutJobs[incomingEvent.metadata().referenceId] = ttsc
-        }
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(MediaMetadataReceivedEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-            data = null
-        ))
-    }
-
-    suspend fun createTimeout(referenceId: String, eventId: String, baseInfo: BaseInfoEvent) {
-        val expiryTime = (Instant.now().epochSecond + metadataTimeout)
-        val dateTime = LocalDateTime.ofEpochSecond(expiryTime, 0, ZoneOffset.UTC)
-        val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm", Locale.ENGLISH)
-        log.info { "Sending ${baseInfo.data?.title} to waiting queue. Expiry ${dateTime.format(formatter)}" }
-        delay(Duration.ofSeconds(metadataTimeout.toLong()).toMillis())
-        if (!this.isActive()) {
-            return
-        }
-        coordinator!!.produceNewEvent(
-            MediaMetadataReceivedEvent(
-                metadata = EventMetadata(
-                    referenceId = referenceId,
-                    derivedFromEventId = eventId,
-                    status = EventStatus.Skipped,
-                    source = getProducerName()
-                )
-            )
-
-        )
-    }
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ParseMediaFileStreamsTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ParseMediaFileStreamsTaskListener.kt
deleted file mode 100644
index e8d900cf..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ParseMediaFileStreamsTaskListener.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import com.google.gson.Gson
-import com.google.gson.JsonObject
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.data.dataAs
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.Event
-import no.iktdev.mediaprocessing.shared.common.contract.data.MediaFileStreamsParsedEvent
-import no.iktdev.mediaprocessing.shared.common.contract.data.MediaMetadataReceivedEvent
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.AudioStream
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.ParsedMediaStreams
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.SubtitleStream
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.VideoStream
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class ParseMediaFileStreamsTaskListener() : CoordinatorEventListener() {
-    val log = KotlinLogging.logger {}
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-
-
-    override val produceEvent: Events = Events.StreamParsed
-    override val listensForEvents: List<Events> = listOf(
-        Events.StreamRead
-    )
-
-    override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List<Event>): Boolean {
-        return super.shouldIProcessAndHandleEvent(incomingEvent, events)
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume()
-        if (event == null) {
-            log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" }
-            return
-        }
-        active = true
-
-
-        val readData = event.dataAs<JsonObject>()
-        val result = try {
-            MediaFileStreamsParsedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-                data = parseStreams(readData)
-            )
-        } catch (e: Exception) {
-            e.printStackTrace()
-            MediaFileStreamsParsedEvent(
-                metadata = event.makeDerivedEventInfo(EventStatus.Failed, getProducerName())
-            )
-        }
-        onProduceEvent(result)
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(
-            MediaFileStreamsParsedEvent(
-            metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-            data = null
-        )
-        )
-    }
-
-    fun parseStreams(data: JsonObject?): ParsedMediaStreams {
-        val ignoreCodecs = listOf("png", "mjpeg")
-        val gson = Gson()
-        return try {
-            val jStreams = data!!.getAsJsonArray("streams")
-
-            val videoStreams = mutableListOf<VideoStream>()
-            val audioStreams = mutableListOf<AudioStream>()
-            val subtitleStreams = mutableListOf<SubtitleStream>()
-
-            for (streamJson in jStreams) {
-                val streamObject = streamJson.asJsonObject
-                if (!streamObject.has("codec_name")) continue
-                val codecName = streamObject.get("codec_name").asString
-                val codecType = streamObject.get("codec_type").asString
-
-                if (codecName in ignoreCodecs) continue
-
-                when (codecType) {
-                    "video" -> videoStreams.add(gson.fromJson(streamObject, VideoStream::class.java))
-                    "audio" -> audioStreams.add(gson.fromJson(streamObject, AudioStream::class.java))
-                    "subtitle" -> subtitleStreams.add(gson.fromJson(streamObject, SubtitleStream::class.java))
-                }
-            }
-
-            val parsedStreams = ParsedMediaStreams(
-                videoStream = videoStreams,
-                audioStream = audioStreams,
-                subtitleStream = subtitleStreams
-            )
-            parsedStreams
-
-        } catch (e: Exception) {
-            "Failed to parse data, its either not a valid json structure or expected and required fields are not present.".also {
-                log.error { it }
-            }
-            throw e
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/PersistContentTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/PersistContentTaskListener.kt
deleted file mode 100644
index a038115f..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/PersistContentTaskListener.kt
+++ /dev/null
@@ -1,190 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.data.*
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.store.*
-import no.iktdev.mediaprocessing.coordinator.tasksV2.validator.CompletionValidator
-import no.iktdev.mediaprocessing.shared.common.parsing.NameHelper
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.reader.*
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class PersistContentTaskListener : CoordinatorEventListener() {
-    val log = KotlinLogging.logger {}
-
-    var doNotProduceComplete = System.getenv("DISABLE_COMPLETE").toBoolean() ?: false
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    override fun onReady() {
-        super.onReady()
-        if (doNotProduceComplete) {
-            log.warn { "DoNotProduceComplete is set!\n\tNo complete event will be triggered!\n\tTo enable production of complete vents, remove this line in your environment: \"DISABLE_COMPLETE\"" }
-        }
-    }
-
-    override fun shouldIHandleFailedEvents(incomingEvent: Event): Boolean {
-        return true
-    }
-
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-
-    override val produceEvent: Events = Events.PersistContent
-    override val listensForEvents: List<Events> = listOf(
-        Events.CoverDownloaded,
-        Events.ConvertTaskCompleted,
-        Events.EncodeTaskCompleted,
-        Events.ExtractTaskCompleted
-    )
-
-
-    override fun isPrerequisitesFulfilled(incomingEvent: Event, events: List<Event>): Boolean {
-        val started = events.find { it.eventType == Events.ProcessStarted }?.az<MediaProcessStartEvent>()
-        if (started == null) {
-            log.info { "No Start event" }
-            return false
-        }
-        val viableEvents = events.filter { it.isSuccessful() }
-
-        if (!CompletionValidator.req1(started, events)) {
-            return false
-        }
-
-        if (!CompletionValidator.req2(started.data?.operations ?: emptyList(), viableEvents)) {
-            return false
-        }
-
-        if (!CompletionValidator.req3(started.data?.operations ?: emptyList(), events)) {
-            return false
-        }
-
-        if (!CompletionValidator.req4(events)) {
-            return false
-        }
-
-        return super.isPrerequisitesFulfilled(incomingEvent, events)
-    }
-
-    override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List<Event>): Boolean {
-        if (doNotProduceComplete) {
-            return false
-        }
-        val result = super.shouldIProcessAndHandleEvent(incomingEvent, events)
-        return result
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume() ?: return
-        active = true
-
-        if (doNotProduceComplete) {
-            return
-        }
-
-        val mediaInfo: ComposedMediaInfo = composeMediaInfo(events) ?: run {
-            log.error { "Unable to compose media info for ${event.referenceId()}" }
-            return
-        }
-
-        val existingTitles = ContentTitleStore.findMasterTitles(mediaInfo.titles)
-
-        val usableCollection: String = if (existingTitles.isNotEmpty())
-            ContentCatalogStore.getCollectionByTitleAndType(mediaInfo.type, existingTitles) ?: run {
-                log.warn { "Did not receive collection based on titles provided in list ${existingTitles.joinToString(",")}, falling back to fallbackCollection: ${mediaInfo.fallbackCollection}" }
-                mediaInfo.fallbackCollection
-            } else mediaInfo.fallbackCollection
-
-        val mover = ContentCompletionMover(usableCollection, events)
-
-        val newCoverPath = mover.moveCover()
-        val newVideoPath = mover.moveVideo()
-        val newSubtitles = mover.moveSubtitles()
-
-
-        val contentEvent = PersistedContent(
-            cover = newCoverPath?.let { PersistedItem(it.first, it.second) },
-            video = newVideoPath?.let { PersistedItem(it.first, it.second) },
-            subtitles = newSubtitles?.map { PersistedItem(it.source, it.destination) } ?: emptyList()
-        )
-
-        onProduceEvent(PersistedContentEvent(
-            metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-            data = contentEvent
-        ))
-
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(
-            PersistedContentEvent(
-                metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-                data = null
-            )
-        )
-    }
-
-    internal data class ComposedMediaInfo(
-        val title: String,
-        val fallbackCollection: String,
-
-        val titles: List<String>,
-        val type: String,
-        val summaries: List<SummaryInfo>,
-        val genres: List<String>
-    )
-
-    private fun composeMediaInfo(events: List<Event>): ComposedMediaInfo? {
-        val baseInfo =
-            events.find { it.eventType == Events.BaseInfoRead }?.az<BaseInfoEvent>()?.let {
-                it.data
-            } ?: run {
-                log.info { "Cant find BaseInfoEvent on ${Events.BaseInfoRead}" }
-                return null
-            }
-        val metadataInfo =
-            events.find { it.eventType == Events.MetadataSearchPerformed }?.az<MediaMetadataReceivedEvent>()?.data
-                ?: run {
-                log.info { "Cant find MediaMetadataReceivedEvent on ${Events.MetadataSearchPerformed}" }
-                null
-            }
-        val mediaInfo: MediaInfo = events.find { it.eventType == Events.ReadOutNameAndType }
-            ?.az<MediaOutInformationConstructedEvent>()?.let {
-                it.data?.toValueObject()
-            } ?: run {
-            log.info { "Cant find MediaOutInformationConstructedEvent on ${Events.ReadOutNameAndType}" }
-            return null
-        }
-
-        val summaries = metadataInfo?.summary?.filter { it.summary != null }
-            ?.map { SummaryInfo(language = it.language, summary = it.summary!!) } ?: emptyList()
-
-        val titles: MutableList<String> = mutableListOf(mediaInfo.title)
-        metadataInfo?.let {
-            titles.addAll(it.altTitle)
-            titles.add(it.title)
-            titles.add(NameHelper.normalize(it.title))
-        }
-
-        return ComposedMediaInfo(
-            title = NameHelper.normalize(metadataInfo?.title ?: mediaInfo.title),
-            fallbackCollection = baseInfo.title,
-            titles = titles,
-            type = metadataInfo?.type ?: mediaInfo.type,
-            summaries = summaries,
-            genres = metadataInfo?.genres ?: emptyList()
-        )
-    }
-
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ReadMediaFileStreamsTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ReadMediaFileStreamsTaskListener.kt
deleted file mode 100644
index 30912222..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ReadMediaFileStreamsTaskListener.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners
-
-import com.google.gson.Gson
-import com.google.gson.JsonObject
-import kotlinx.coroutines.runBlocking
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.core.WGson
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.data.dataAs
-import no.iktdev.mediaprocessing.coordinator.Coordinator
-import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener
-import no.iktdev.mediaprocessing.shared.common.SharedConfig
-import no.iktdev.mediaprocessing.shared.common.runner.CodeToOutput
-import no.iktdev.mediaprocessing.shared.common.runner.getOutputUsing
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OperationEvents
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import java.io.File
-
-@Service
-class ReadMediaFileStreamsTaskListener() : CoordinatorEventListener() {
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: Coordinator? = null
-
-    val log = KotlinLogging.logger {}
-    val requiredOperations = listOf(OperationEvents.ENCODE, OperationEvents.EXTRACT)
-
-    override val produceEvent: Events = Events.StreamRead
-    override val listensForEvents: List<Events> = listOf(Events.ProcessStarted)
-
-    override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List<Event>): Boolean {
-        val status =  super.shouldIProcessAndHandleEvent(incomingEvent, events)
-        val permittedOperations = events.findFirstEventOf<MediaProcessStartEvent>()?.data?.operations ?: return false
-        return if (permittedOperations.any { it in requiredOperations }) {
-            status
-        } else {
-            false
-        }
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<Event>, events: List<Event>) {
-        val event = incomingEvent.consume()
-        if (event == null) {
-            log.error { "Event is null and should not be available! ${WGson.gson.toJson(incomingEvent.metadata())}" }
-            return
-        }
-        active = true
-
-        val startEvent = event.dataAs<StartEventData>()
-        if (startEvent == null || !startEvent.operations.any { it in requiredOperations }) {
-            log.info { "${event.metadata.referenceId} does not contain a operation in ${requiredOperations.joinToString(",") { it.name }}" }
-            active = false
-            return
-        }
-        val result = runBlocking {
-            try {
-                val data = fileReadStreams(startEvent, event.metadata.eventId)
-                MediaFileStreamsReadEvent(
-                    metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-                    data = data
-                )
-            } catch (e: Exception) {
-                e.printStackTrace()
-                MediaFileStreamsReadEvent(
-                    metadata = event.makeDerivedEventInfo(EventStatus.Failed, getProducerName())
-                )
-            }
-        }
-        onProduceEvent(result)
-        active = false
-    }
-
-    override fun produceFailure(incomingEvent: Event) {
-        onProduceEvent(
-            MediaFileStreamsReadEvent(
-                metadata = incomingEvent.makeDerivedEventInfo(EventStatus.Failed, getProducerName()),
-                data = null
-            )
-        )
-    }
-
-
-    suspend fun fileReadStreams(started: StartEventData, eventId: String): JsonObject? {
-        val file = File(started.file)
-        return if (file.exists() && file.isFile) {
-            val result = readStreams(file)
-            val joined = result.output.joinToString(" ")
-            Gson().fromJson(joined, JsonObject::class.java)
-        } else {
-            val message = "File in data is not a file or does not exist: ${file.absolutePath}".also {
-                log.error { it }
-            }
-            throw RuntimeException(message)
-
-        }
-    }
-
-    suspend fun readStreams(file: File): CodeToOutput {
-        val result = getOutputUsing(
-            SharedConfig.ffprobe,
-            "-v", "quiet", "-print_format", "json", "-show_streams", file.absolutePath
-        )
-        return result
-    }
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/EncodeWorkArgumentsMapping.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/EncodeWorkArgumentsMapping.kt
deleted file mode 100644
index 0e3575cc..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/EncodeWorkArgumentsMapping.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping
-
-import no.iktdev.exfl.using
-import no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.streams.AudioArguments
-import no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.streams.VideoArguments
-import no.iktdev.mediaprocessing.shared.common.contract.data.EncodeArgumentData
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.AudioStream
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.EncodingPreference
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.ParsedMediaStreams
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.VideoStream
-import java.io.File
-
-class EncodeWorkArgumentsMapping(
-    val inputFile: String,
-    val outFileFullName: String,
-    val streams: ParsedMediaStreams,
-    val preference: EncodingPreference
-) {
-
-    fun getArguments(): EncodeArgumentData? {
-        val vaas = VideoAndAudioSelector(streams, preference)
-        val vArg = vaas.getVideoStream()
-            ?.let { VideoArguments(it, streams, preference.video).getVideoArguments() }
-        val aArg = vaas.getAudioStream()
-            ?.let { AudioArguments(it, streams, preference.audio).getAudioArguments() }
-
-        val vaArgs = toFfmpegWorkerArguments(vArg, aArg)
-        return if (vaArgs.isEmpty()) {
-            null
-        } else {
-            EncodeArgumentData(
-                inputFile = inputFile,
-                outputFileName = "${outFileFullName}.mp4",
-                arguments = vaArgs
-            )
-        }
-    }
-
-
-    private class VideoAndAudioSelector(val mediaStreams: ParsedMediaStreams, val preference: EncodingPreference) {
-        private var defaultVideoSelected: VideoStream? = mediaStreams.videoStream
-            .filter { (it.duration_ts ?: 0) > 0 }
-            .maxByOrNull { it.duration_ts ?: 0 } ?: mediaStreams.videoStream.minByOrNull { it.index }
-        private var defaultAudioSelected: AudioStream? = mediaStreams.audioStream
-            .filter { (it.duration_ts ?: 0) > 0 }
-            .maxByOrNull { it.duration_ts ?: 0 } ?: mediaStreams.audioStream.minByOrNull { it.index }
-
-        fun getVideoStream(): VideoStream? {
-            return defaultVideoSelected
-        }
-
-        fun getAudioStream(): AudioStream? {
-            val languageFiltered = mediaStreams.audioStream.filter { it.tags.language == preference.audio.language }
-            val channeledAndCodec = languageFiltered.find {
-                it.channels >= (preference.audio.channels ?: 2) && it.codec_name == preference.audio.codec.lowercase()
-            }
-            return channeledAndCodec ?: return languageFiltered.minByOrNull { it.index } ?: defaultAudioSelected
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/EventsSummaryMapping.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/EventsSummaryMapping.kt
deleted file mode 100644
index f393f159..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/EventsSummaryMapping.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping
-
-import no.iktdev.eventi.data.dataAs
-import no.iktdev.eventi.data.isSuccessful
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.dto.EventSummary
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OperationEvents
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OperationsSummary
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OutputFiles
-import no.iktdev.mediaprocessing.shared.common.getChecksum
-
-class EventsSummaryMapping {
-
-    fun map(events: List<Event>): EventSummary {
-        val startOperations = events.find { it.eventType == Events.ProcessStarted }?.dataAs<StartEventData>() ?: throw RuntimeException("No start event found")
-        val successOperations = listOfNotNull(
-            if (isEncodedSuccessful(events)) OperationEvents.ENCODE else null,
-            if (isExtractedSuccessful(events)) OperationEvents.EXTRACT else null,
-            if (isConvertedSuccessful(events)) OperationEvents.CONVERT else null
-        )
-
-
-        return EventSummary(
-            inputFile = startOperations.file,
-            inputFileChecksum = getChecksum(startOperations.file),
-            operationsSummary = OperationsSummary(
-                requestedOperations = startOperations.operations,
-                completedOperations = successOperations
-            ),
-            outputFiles = getProducesFiles(events)
-        )
-    }
-
-
-    fun isEncodedSuccessful(events: List<Event>) = events.filter { it.eventType == Events.EncodeTaskCompleted }.any { it.isSuccessful() }
-    fun isExtractedSuccessful(events: List<Event>) = events.filter { it.eventType == Events.ExtractTaskCompleted }.any { it.isSuccessful() }
-    fun isConvertedSuccessful(events: List<Event>) = events.filter { it.eventType == Events.ConvertTaskCompleted }.any { it.isSuccessful() }
-
-    fun getProducesFiles(events: List<Event>): OutputFiles {
-        val encoded = if (isEncodedSuccessful(events)) {
-            events.filter { it.eventType == Events.EncodeTaskCompleted }
-                .filter { it.isSuccessful() }
-                .mapNotNull { it.dataAs<EncodedData>()?.outputFile }
-        } else emptyList()
-
-        val extracted = if (isExtractedSuccessful(events)) {
-            events.filter { it.eventType == Events.ExtractTaskCompleted }
-                .filter { it.isSuccessful() }
-                .mapNotNull { it.dataAs<ExtractedData>() }
-                .map { it.outputFile }
-        } else emptyList()
-
-        val converted = if (isConvertedSuccessful(events)) {
-            events.filter { it.eventType == Events.ConvertTaskCompleted }
-                .filter { it.isSuccessful() }
-                .mapNotNull { it.dataAs<ConvertedData>() }
-                .flatMap { it.outputFiles }
-        } else emptyList()
-
-        return OutputFiles(
-            encoded = encoded,
-            extracted = extracted,
-            converted = converted
-        )
-    }
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt
deleted file mode 100644
index ab234450..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping
-
-import no.iktdev.exfl.using
-import no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.streams.SubtitleArguments
-import no.iktdev.mediaprocessing.shared.common.contract.data.ExtractArgumentData
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.ParsedMediaStreams
-import java.io.File
-
-class ExtractWorkArgumentsMapping(
-    val inputFile: String,
-    val outFileFullName: String,
-    val streams: ParsedMediaStreams
-) {
-
-    fun getArguments(): List<ExtractArgumentData> {
-        val sArg = SubtitleArguments(streams.subtitleStream).getSubtitleArguments()
-
-        val entries = sArg.map {
-            ExtractArgumentData(
-                inputFile = inputFile,
-                language = it.language,
-                arguments = it.codecParameters + it.optionalParameters + listOf("-map", "0:s:${it.index}"),
-                outputFileName = "${outFileFullName}.${it.language}.${it.format}",
-                storeFileName = outFileFullName
-            )
-        }
-
-        return entries
-    }
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/FFmpegBase.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/FFmpegBase.kt
deleted file mode 100644
index 0ad1c988..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/FFmpegBase.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping
-
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.AudioArgumentsDto
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.VideoArgumentsDto
-
-fun toFfmpegWorkerArguments(
-    videoArguments: VideoArgumentsDto?,
-    audioArguments: AudioArgumentsDto?
-): List<String> {
-    val arguments = mutableListOf<String>(
-        *videoArguments?.codecParameters?.toTypedArray() ?: arrayOf(),
-        *videoArguments?.optionalParameters?.toTypedArray() ?: arrayOf(),
-        *audioArguments?.codecParameters?.toTypedArray() ?: arrayOf(),
-        *audioArguments?.optionalParameters?.toTypedArray() ?: arrayOf()
-    )
-    videoArguments?.index?.let {
-        arguments.addAll(listOf("-map", "0:v:$it"))
-    }
-    audioArguments?.index?.let {
-        arguments.addAll(listOf("-map", "0:a:$it"))
-    }
-    return arguments
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCatalogStore.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCatalogStore.kt
deleted file mode 100644
index d9a4de67..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCatalogStore.kt
+++ /dev/null
@@ -1,178 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.store
-
-import mu.KotlinLogging
-import no.iktdev.eventi.database.withTransaction
-import no.iktdev.mediaprocessing.coordinator.getStoreDatabase
-import no.iktdev.mediaprocessing.shared.common.contract.reader.VideoDetails
-import no.iktdev.streamit.library.db.executeWithStatus
-import no.iktdev.streamit.library.db.insertWithSuccess
-import no.iktdev.streamit.library.db.query.MovieQuery
-import no.iktdev.streamit.library.db.tables.catalog
-import no.iktdev.streamit.library.db.tables.serie
-import org.jetbrains.exposed.sql.*
-
-object ContentCatalogStore {
-    val log = KotlinLogging.logger {}
-
-    /**
-     * Given a list of titles and type,
-     * the codes purpose is to find the matching collection in the catalog by title
-     */
-    fun getCollectionByTitleAndType(type: String, titles: List<String>): String? {
-        return withTransaction(getStoreDatabase()) {
-            catalog.select {
-                (catalog.type eq type) and
-                        ((catalog.title inList titles) or
-                                (catalog.collection inList titles))
-            }.map {
-                it[catalog.collection]
-            }.firstOrNull()
-        }
-    }
-
-    private fun getCover(collection: String, type: String): String? {
-        return withTransaction(getStoreDatabase()) {
-            catalog.select {
-                (catalog.collection eq collection) and
-                        (catalog.type eq type)
-            }.map { it[catalog.cover] }.firstOrNull()
-        }
-    }
-
-    fun storeCatalog(title: String, titles: List<String>, collection: String, type: String, cover: String?, genres: String?): Int? {
-        val status = executeWithStatus(getStoreDatabase().database, block = {
-            val existingRow = catalog.select {
-                (catalog.collection eq collection) and
-                        (catalog.type eq type)
-            }.firstOrNull()
-
-            if (existingRow == null) {
-                log.info { "$collection does not exist, and will be created" }
-                catalog.insert {
-                    it[catalog.title] = title
-                    it[catalog.cover] = cover
-                    it[catalog.type] = type
-                    it[catalog.collection] = collection
-                    it[catalog.genres] = genres
-                }
-            } else {
-                val id = existingRow[catalog.id]
-                val storedTitle = existingRow[catalog.title]
-                val useCover = existingRow[catalog.cover] ?: cover
-                val useGenres = existingRow[catalog.genres] ?: genres
-
-                catalog.update({
-                    (catalog.id eq id) and
-                            (catalog.collection eq collection)
-                }) {
-                    it[catalog.cover] = useCover
-                    it[catalog.genres] = useGenres
-                }
-            }
-        }, {
-            log.error { "Failed to store catalog $collection: ${it.message}" }
-        })
-        if (status) {
-            log.info { "$collection was successfully stored!" }
-        } else {
-            log.error { "Unable to store catalog $collection..." }
-        }
-        return getId(title, titles, collection, type)
-    }
-
-    private fun storeMovie(catalogId: Int, videoDetails: VideoDetails) {
-        val iid = MovieQuery(videoDetails.fileName).insertAndGetId() ?: run {
-            log.error { "Movie id was not returned!" }
-            return
-        }
-        val status = executeWithStatus(getStoreDatabase().database, block = {
-            catalog.update({
-                (catalog.id eq catalogId)
-            }) {
-                it[catalog.iid] = iid
-            }
-        }, {
-            log.error { "Failed to store movie ${videoDetails.fileName}: ${it.message}" }
-        })
-        if (status) {
-            log.info { "${videoDetails.fileName} was successfully stored in movies!" }
-        } else {
-            log.error { "Unable to store catalog ${videoDetails.fileName} in movies..." }
-        }
-    }
-
-    private fun storeSerie(collection: String, videoDetails: VideoDetails) {
-        log.info { "Attempting to store $collection!" }
-        val serieInfo = videoDetails.serieInfo ?: run {
-            log.error { "serieInfo in videoDetails is null!" }
-            return
-        }
-        val status = insertWithSuccess(getStoreDatabase().database, block = {
-            serie.insert {
-                it[title] = serieInfo.episodeTitle
-                it[episode] = serieInfo.episodeNumber
-                it[season] = serieInfo.seasonNumber
-                it[video] = videoDetails.fileName
-                it[serie.collection] = collection
-            }
-        }, onError = {
-            log.error { "Failed to store serie ${videoDetails.fileName}: ${it.message}" }
-        })
-        if (!status) {
-            log.error { "Failed to insert ${videoDetails.fileName} with episode: ${serieInfo.episodeNumber} and season ${serieInfo.seasonNumber}" }
-            val finalStatus = insertWithSuccess(getStoreDatabase().database, block =  {
-                serie.insert {
-                    it[title] = serieInfo.episodeTitle
-                    it[episode] = serieInfo.episodeNumber
-                    it[season] = 0
-                    it[video] = videoDetails.fileName
-                    it[serie.collection] = collection
-                }
-            },  { log.error { "Failed to store serie: ${it.message}" } })
-            if (!finalStatus) {
-                log.error { "Failed to insert ${videoDetails.fileName} with fallback season 0" }
-            } else {
-                log.info { "${videoDetails.fileName} was successfully stored in movies with fallback season 0!" }
-            }
-        } else {
-            log.info { "${videoDetails.fileName} was successfully stored in series!" }
-        }
-    }
-
-    fun storeMedia(title: String, titles: List<String>, collection: String, type: String, videoDetails: VideoDetails) {
-        val catalogId = getId(title, titles, collection, type) ?: run {
-            log.warn { "Could not find id for $title with type $type" }
-            return
-        }
-        log.info { "$title is identified as $type" }
-        when (type) {
-            "movie" -> storeMovie(catalogId, videoDetails)
-            "serie" -> storeSerie(collection, videoDetails)
-            else -> {
-                log.error { "$type was provided for the function storeMedia, thus failing" }
-                throw RuntimeException("Illegal type provided")
-            }
-        }
-    }
-
-    private fun getId(title: String, titles: List<String>, collection: String, type: String): Int? {
-        val ids = withTransaction(getStoreDatabase().database) {
-            catalog.select {
-                ((catalog.title eq title)
-                        or (catalog.collection eq collection)
-                        or (catalog.title inList titles)) and
-                        (catalog.type eq type)
-            }.map { it[catalog.id].value }
-        } ?: run {
-            log.warn { "No values found on $title with type $type" }
-            return null
-        }
-        if (ids.size > 1) {
-            log.info { "Found ids: ${ids.joinToString(",")}" }
-        }
-        return ids.firstOrNull()
-    }
-
-
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt
deleted file mode 100644
index e35b8c09..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.store
-
-import mu.KotlinLogging
-import no.iktdev.eventi.data.dataAs
-import no.iktdev.exfl.using
-import no.iktdev.mediaprocessing.shared.common.SharedConfig
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.getCRC32
-import no.iktdev.mediaprocessing.shared.common.moveTo
-import no.iktdev.mediaprocessing.shared.common.notExist
-import java.io.File
-
-class ContentCompletionMover(val collection: String, val events: List<Event>) {
-    val log = KotlinLogging.logger {}
-    val storeFolder = SharedConfig.outgoingContent.using(collection)
-
-    init {
-        if (storeFolder.notExist()) {
-            log.info { "Creating missing folders for path ${storeFolder.absolutePath}" }
-            storeFolder.mkdirs()
-        }
-    }
-
-
-    /**
-     * @return Pair<OldPath, NewPath> or null if no file found
-     */
-    fun moveVideo(): Pair<String, String>? {
-        val encodedFile = events.find { it.eventType == Events.EncodeTaskCompleted }?.dataAs<EncodedData>()?.outputFile?.let {
-            File(it)
-        } ?: return null
-        if (!encodedFile.exists()) {
-            log.error { "Provided file ${encodedFile.absolutePath} does not exist at the given location" }
-            return null
-        }
-        val storeFile = storeFolder.using(encodedFile.name)
-        val result = encodedFile.moveTo(storeFile) {
-        }
-        return if (result) run {
-            log.info { "Moved ${encodedFile.absolutePath} to ${storeFile.absolutePath} for permanent storage and usage" }
-            Pair(encodedFile.absolutePath, storeFile.absolutePath)
-        } else throw RuntimeException("Unable to movie file ${encodedFile.absolutePath} to ${storeFile.absolutePath}")
-    }
-
-    fun moveCover(): Pair<String, String>? {
-        val coverFile = events.find { it.eventType == Events.CoverDownloaded }?.
-            az<MediaCoverDownloadedEvent>()?.data?.absoluteFilePath?.let {
-                File(it)
-        } ?: return null
-
-        if (coverFile.notExist()) {
-            log.error { "Provided file ${coverFile.absolutePath} does not exist at the given location" }
-            return null
-        }
-        val storeFile = storeFolder.using(coverFile.name)
-        if (storeFile.exists() && storeFile.getCRC32() == coverFile.getCRC32()) {
-            return Pair(coverFile.absolutePath, storeFile.absolutePath)
-        }
-        val result = coverFile.moveTo(storeFile)
-        return if (result) {
-            log.info { "Moved ${coverFile.absolutePath} to ${storeFile.absolutePath} for permanent storage and usage" }
-            Pair(coverFile.absolutePath, storeFile.absolutePath)
-        } else null
-    }
-
-
-
-    data class MovableSubtitle(
-        val language: String,
-        val cachedFile: File,
-        val storeFileName: String
-    )
-
-    fun getMovableSubtitles(): List<MovableSubtitle> {
-        val extracted =
-            events.filter { it.eventType == Events.ExtractTaskCompleted }.mapNotNull { it.dataAs<ExtractedData>() }
-        val converted =
-            events.filter { it.eventType == Events.ConvertTaskCompleted }.mapNotNull { it.dataAs<ConvertedData>() }
-
-        val items = mutableListOf<MovableSubtitle>()
-
-        extracted.map { MovableSubtitle(
-            language = it.language,
-            cachedFile = File(it.outputFile),
-            storeFileName = it.storeFileName
-        ) }.also { items.addAll(it) }
-
-        converted.flatMap { it.outputFiles.map { outFile ->
-            MovableSubtitle(
-                language = it.language,
-                cachedFile = File(outFile),
-                storeFileName = it.baseName
-            )
-        } }.also { items.addAll(it) }
-
-        return items
-    }
-
-    data class MovedSubtitle(
-        val language: String,
-        val source: String,
-        val destination: String
-    )
-
-    fun moveSubtitles(): List<MovedSubtitle>? {
-        val subtitleFolder = storeFolder.using("sub")
-        val moved: MutableList<MovedSubtitle> = mutableListOf()
-
-        val subtitles = getMovableSubtitles()
-        if (subtitles.isEmpty()) {
-            return null
-        }
-        for (movable in subtitles) {
-            val languageFolder = subtitleFolder.using(movable.language).also {
-                if (it.notExist()) {
-                    it.mkdirs()
-                }
-            }
-            val storeFile = languageFolder.using("${movable.storeFileName}.${movable.cachedFile.extension}")
-            val success = movable.cachedFile.moveTo(storeFile)
-            if (success) {
-                log.info { "Moved ${movable.cachedFile.absolutePath} to ${storeFile.absolutePath} for permanent storage and usage" }
-                moved.add(MovedSubtitle(movable.language, movable.cachedFile.absolutePath, storeFile.absolutePath))
-            }
-        }
-
-        return moved
-    }
-
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentGenresStore.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentGenresStore.kt
deleted file mode 100644
index 6c6e761a..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentGenresStore.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.store
-
-import no.iktdev.eventi.database.withTransaction
-import no.iktdev.mediaprocessing.coordinator.getStoreDatabase
-import no.iktdev.streamit.library.db.query.GenreQuery
-
-object ContentGenresStore {
-    fun storeAndGetIds(genres: List<String>): String? {
-        return try {
-            withTransaction(getStoreDatabase()) {
-                val gq = GenreQuery( *genres.toTypedArray() )
-                gq.insertAndGetIds()
-                gq.getIds().joinToString(",")
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return null
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentMetadataStore.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentMetadataStore.kt
deleted file mode 100644
index b488a333..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentMetadataStore.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.store
-
-import no.iktdev.mediaprocessing.coordinator.getStoreDatabase
-import no.iktdev.mediaprocessing.shared.common.contract.reader.SummaryInfo
-import no.iktdev.streamit.library.db.executeOrException
-import no.iktdev.streamit.library.db.query.SummaryQuery
-
-object ContentMetadataStore {
-
-    fun storeSummary(catalogId: Int, summaryInfo: SummaryInfo) {
-        val result = executeOrException(getStoreDatabase().database, block =  {
-            SummaryQuery(
-                cid = catalogId,
-                language = summaryInfo.language,
-                description = summaryInfo.summary
-            ).insert()
-        })
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentSubtitleStore.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentSubtitleStore.kt
deleted file mode 100644
index d74edfb6..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentSubtitleStore.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.store
-
-import mu.KotlinLogging
-import no.iktdev.mediaprocessing.coordinator.getStoreDatabase
-import no.iktdev.streamit.library.db.executeWithStatus
-import no.iktdev.streamit.library.db.query.SubtitleQuery
-import no.iktdev.streamit.library.db.tables.subtitle
-import org.jetbrains.exposed.sql.insert
-import java.io.File
-
-object ContentSubtitleStore {
-    val log = KotlinLogging.logger {}
-
-    fun storeSubtitles(collection: String, destinationFile: File): Boolean {
-        return executeWithStatus (getStoreDatabase().database, block =  {
-            subtitle.insert {
-                it[this.associatedWithVideo] = destinationFile.nameWithoutExtension
-                it[this.language] = destinationFile.parentFile.nameWithoutExtension
-                it[this.collection] = collection
-                it[this.format] = destinationFile.extension.uppercase()
-                it[this.subtitle] = destinationFile.name
-            }
-        }, onError = {
-            log.error { "Failed to store subtitle $destinationFile: ${it.message}" }
-        })
-    }
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentTitleStore.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentTitleStore.kt
deleted file mode 100644
index f332dc91..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentTitleStore.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.store
-
-import no.iktdev.mediaprocessing.coordinator.getStoreDatabase
-import no.iktdev.mediaprocessing.shared.common.parsing.NameHelper
-import no.iktdev.streamit.library.db.tables.titles
-import no.iktdev.streamit.library.db.withTransaction
-import org.jetbrains.exposed.sql.insertIgnore
-import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.sql.select
-
-object ContentTitleStore {
-
-    fun store(mainTitle: String, otherTitles: List<String>) {
-        try {
-            withTransaction(getStoreDatabase().database, block = {
-                val titlesToUse = otherTitles + listOf(
-                    NameHelper.normalize(mainTitle)
-                ).filter { it != mainTitle }
-
-                titlesToUse.forEach { t ->
-                    titles.insertIgnore {
-                        it[masterTitle] = mainTitle
-                        it[alternativeTitle] = t
-                    }
-                }
-            }, {
-
-            })
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    fun findMasterTitles(titleList: List<String>): List<String> {
-        return withTransaction(getStoreDatabase().database, block = {
-            titles.select {
-                (titles.alternativeTitle inList titleList) or
-                        (titles.masterTitle inList titleList)
-            }.map {
-                it[titles.masterTitle]
-            }.distinctBy { it }
-        }, {
-
-        })  ?: emptyList()
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ProcessedFileStore.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ProcessedFileStore.kt
deleted file mode 100644
index 05221ad8..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ProcessedFileStore.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.store
-
-import com.google.gson.Gson
-import mu.KotlinLogging
-import no.iktdev.mediaprocessing.coordinator.eventDatabase
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.dto.EventSummary
-import no.iktdev.mediaprocessing.shared.common.database.tables.filesProcessed
-import no.iktdev.mediaprocessing.shared.common.getChecksum
-import no.iktdev.streamit.library.db.withTransaction
-import org.jetbrains.exposed.sql.insert
-
-object ProcessedFileStore {
-    val log = KotlinLogging.logger {}
-
-    fun store(title: String, events: List<Event>, summary: EventSummary) {
-        val inputFilePath = events.findFirstEventOf<MediaProcessStartEvent>()?.data?.file ?: return
-        val checksum = getChecksum(inputFilePath)
-
-
-        withTransaction(eventDatabase.database.database, block = {
-            filesProcessed.insert {
-                it[this.title] = title
-                it[this.inputFile] = inputFilePath
-                it[this.data] = Gson().toJson(summary)
-                it[this.checksum] = checksum
-            }
-        }) {
-            it.printStackTrace()
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/AudioArguments.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/AudioArguments.kt
deleted file mode 100644
index 6a84f2a7..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/AudioArguments.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.streams
-
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.AudioArgumentsDto
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.AudioPreference
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.AudioStream
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.ParsedMediaStreams
-
-class AudioArguments(
-    val audioStream: AudioStream,
-    val allStreams: ParsedMediaStreams,
-    val preference: AudioPreference
-) {
-    fun isAudioCodecEqual() = audioStream.codec_name.lowercase() == preference.codec.lowercase()
-
-    /**
-     * Checks whether its ac3 or eac3, as google cast supports this and most other devices.
-     */
-    fun isOfSupportedSurroundCodec(): Boolean {
-        return audioStream.codec_name.lowercase() in listOf("eac3", "ac3")
-    }
-
-
-    fun isSurround(): Boolean {
-        return audioStream.channels > 2
-    }
-
-
-    fun getAudioArguments(): AudioArgumentsDto {
-        val optionalParams = mutableListOf<String>()
-
-        if (!isSurround()) {
-            return if (isAudioCodecEqual()) {
-                asPassthrough()
-            } else {
-                asStereo()
-            }
-        } else {
-            if (preference.forceStereo) {
-                return asStereo()
-            }
-            if (preference.passthroughOnGenerallySupportedSurroundSound && isOfSupportedSurroundCodec()) {
-                return asPassthrough()
-            } else if (preference.passthroughOnGenerallySupportedSurroundSound && !isOfSupportedSurroundCodec()) {
-                return asSurround()
-            }
-            if (preference.convertToEac3OnUnsupportedSurround ) {
-                return asSurround()
-            }
-
-
-            return asStereo()
-        }
-    }
-
-    fun index(): Int {
-        return allStreams.audioStream.indexOf(audioStream)
-    }
-
-    fun asPassthrough(): AudioArgumentsDto {
-        return AudioArgumentsDto(
-            index = index()
-        )
-    }
-    fun asStereo(): AudioArgumentsDto {
-        return AudioArgumentsDto(
-            index = index(),
-            codecParameters = listOf(
-                "-c:a", preference.codec,
-                "-ac", "2"
-            ), optionalParameters = emptyList()
-        )
-    }
-    fun asSurround(): AudioArgumentsDto {
-        return AudioArgumentsDto(
-            index = index(),
-            codecParameters = listOf(
-                "-c:a", "eac3"
-            ), optionalParameters = emptyList()
-        )
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/SubtitleArguments.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/SubtitleArguments.kt
deleted file mode 100644
index c7135556..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/SubtitleArguments.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.streams
-
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.SubtitleArgumentsDto
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.SubtitleStream
-import kotlin.math.sqrt
-
-class SubtitleArguments(val subtitleStreams: List<SubtitleStream>) {
-    /**
-     * @property DEFAULT is default subtitle as dialog
-     * @property CC is Closed-Captions
-     * @property SHD is Hard of hearing
-     * @property NON_DIALOGUE is for Signs or Song (as in lyrics)
-     */
-    private enum class SubtitleType {
-        DEFAULT,
-        CC,
-        SHD,
-        NON_DIALOGUE
-    }
-
-    private fun SubtitleStream.isCC(): Boolean {
-        if ((this.disposition?.captions ?: 0) > 0) {
-            return true
-        }
-        val title = this.tags.title?.lowercase() ?: return false
-        val keywords = listOf("cc", "closed caption")
-        return keywords.any { title.contains(it) }
-    }
-
-    private fun SubtitleStream.isSHD(): Boolean {
-        if ((this.disposition?.hearing_impaired ?: 0) > 0) {
-            return true
-        }
-        val title = this.tags.title?.lowercase() ?: return false
-        val keywords = listOf("shd", "hh", "Hard-of-Hearing", "Hard of Hearing")
-        return keywords.any { title.contains(it) }
-    }
-
-    private fun SubtitleStream.isSignOrSong(): Boolean {
-        if ((this.disposition?.lyrics ?: 0) > 0) {
-            return true
-        }
-        val title = this.tags.title?.lowercase() ?: return false
-        val keywords = listOf("song", "songs", "sign", "signs")
-        return keywords.any { title.contains(it) }
-    }
-
-    private fun SubtitleStream.isNonDialog(): Boolean {
-        val title = this.tags.title?.lowercase() ?: return false
-        val keywords = listOf("commentary")
-        return keywords.any { title.contains(it) }
-    }
-
-    private fun getSubtitleType(stream: SubtitleStream): SubtitleType {
-        return if (stream.isSignOrSong() || stream.isNonDialog())
-            SubtitleType.NON_DIALOGUE
-        else if (stream.isSHD()) {
-            SubtitleType.SHD
-        } else if (stream.isCC()) {
-            SubtitleType.CC
-        } else SubtitleType.DEFAULT
-    }
-
-    fun getSubtitleArguments(): List<SubtitleArgumentsDto> {
-        val acceptable = subtitleStreams.filter { !it.isSignOrSong() }
-        val codecFiltered = acceptable.filter { getFormatToCodec(it.codec_name) != null }
-
-        val languageGrouped = codecFiltered.groupBy { it.tags.language ?: "eng" }
-
-        val streamsToExtract = languageGrouped.mapNotNull { item ->
-            val itemToType = item.value.map { it to getSubtitleType(it) }
-            val usableSubtitles = itemToType.filter { it.second == SubtitleType.DEFAULT }.ifEmpty { itemToType }
-            val excludedLowFrameCount = excludeLowFrameCount(usableSubtitles.map { it.first }).sortedByDescending { it.tags.NUMBER_OF_FRAMES }
-            excludedLowFrameCount.firstOrNull() ?: run {
-                usableSubtitles.map { it.first }.firstOrNull { it.disposition?.default == 1 } ?: usableSubtitles.firstOrNull()?.first
-            }
-        }
-
-        return streamsToExtract.mapNotNull { stream ->
-            getFormatToCodec(stream.codec_name)?.let { format ->
-                SubtitleArgumentsDto(
-                    mediaIndex = stream.index,
-                    index = subtitleStreams.indexOf(stream),
-                    language = stream.tags.language ?: "eng",
-                    format = format
-                )
-            }
-        }
-
-    }
-
-    fun excludeLowFrameCount(streams: List<SubtitleStream>): List<SubtitleStream> {
-        val usable = streams.filter { (it.tags.NUMBER_OF_FRAMES ?: 0) > 0 }
-        val mean = usable.mapNotNull { it.tags.NUMBER_OF_FRAMES }.average()
-        val variance = usable.map { (it.tags.NUMBER_OF_FRAMES!! - mean) * (it.tags.NUMBER_OF_FRAMES!! - mean) }.average()
-        val standardDeviation = sqrt(variance)
-
-        // Definer intervallet for "normale" rammer: mean ± 2 * standard deviation
-        val lowerBound = mean - 2 * standardDeviation
-        val upperBound = mean + 2 * standardDeviation
-
-        return usable.filter {
-            val frameCount = it.tags.NUMBER_OF_FRAMES ?: 0
-            frameCount.toDouble() in lowerBound..upperBound
-        }
-    }
-
-    fun getFormatToCodec(codecName: String): String? {
-        return when (codecName) {
-            "ass" -> "ass"
-            "subrip" -> "srt"
-            "webvtt", "vtt" -> "vtt"
-            "smi" -> "smi"
-            "hdmv_pgs_subtitle" -> null
-            else -> null
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/VideoArguments.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/VideoArguments.kt
deleted file mode 100644
index c0d05fd7..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/streams/VideoArguments.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.mapping.streams
-
-import no.iktdev.mediaprocessing.coordinator.log
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.ParsedMediaStreams
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.VideoArgumentsDto
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.VideoPreference
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.VideoStream
-
-class VideoArguments(
-    val videoStream: VideoStream,
-    val allStreams: ParsedMediaStreams,
-    val preference: VideoPreference
-) {
-    fun isVideoCodecEqual() = getCodec(videoStream.codec_name) == getCodec(preference.codec.lowercase())
-    fun getCodec(name: String): String {
-        return when (name.lowercase()) {
-            "hevc", "hevec", "h265", "h.265", "libx265" -> "libx265"
-            "h.264", "h264", "libx264" -> "libx264"
-            "vp9", "vp-9", "libvpx-vp9" -> "libvpx-vp9"
-            "av1", "libaom-av1" -> "libaom-av1"
-            "mpeg4", "mp4", "libxvid" -> "libxvid"
-            "vvc", "h.266", "libvvc" -> "libvvc"
-            "vp8", "libvpx" -> "libvpx"
-            else -> name
-        }
-    }
-
-    fun getCodec() = getCodec(videoStream.codec_name)
-
-
-    fun getVideoArguments(): VideoArgumentsDto {
-        val codecParams = if (isVideoCodecEqual()) {
-            if (getCodec() == "libx265") {
-                composeHevcArguments(getCodec())
-            } else {
-                mutableListOf("-c:v", "copy")
-            }
-        } else {
-            when (getCodec(preference.codec.lowercase())) {
-                "libx265" -> composeHevcArguments(getCodec())
-                "libx264" -> composeH264Arguments(getCodec())
-                else -> run {
-                    val codec = getCodec(preference.codec.lowercase())
-                    log.info { "Unsupported codec found ${codec}, making best effort..." }
-                    listOf("-c:v", codec)
-                }
-            }
-        }
-
-
-        return VideoArgumentsDto(
-            index = allStreams.videoStream.indexOf(videoStream),
-            codecParameters = codecParams,
-            optionalParameters = composeOptionalArguments()
-        )
-    }
-
-    private fun composeOptionalArguments(): List<String> {
-
-        val pixelFormat: List<String> = if (preference.pixelFormatPassthrough.none { it == videoStream.pix_fmt }) {
-            listOf("-pix_fmt", preference.pixelFormat)
-        } else emptyList()
-
-        val crfParam = if (pixelFormat.isNotEmpty() || !isVideoCodecEqual()) {
-            listOf("-crf", preference.threshold.toString())
-        } else emptyList()
-
-        val defaultCodecParams = listOf("-movflags", "+faststart")
-
-        return pixelFormat + crfParam + defaultCodecParams
-    }
-
-    private fun composeH264Arguments(codec: String): List<String> {
-        return listOf(
-            "-c:v", "libx264",
-            "-profile:v", "high",
-            "-level:v", preference.h264Level.toString(),
-            "preset", "slow",
-        )
-    }
-
-    private fun composeHevcArguments(codec: String): List<String> {
-        val targetProfile = if (videoStream.pix_fmt.contains("10")) "main10" else "main"
-
-        val unsetCodecMetadata = videoStream.codec_tag_string == "[0][0][0][0]" || videoStream.codec_tag == "0x0000"
-
-        // Map level til en streng – her forenklet
-        val targetLevel = when (videoStream.level) {
-            150 -> "5.0"
-            153 -> "5.1"
-            else -> "5.0" // Default hvis vi ikke har en eksplisitt mapping
-        }
-
-        return if (codec != "libx265" || (unsetCodecMetadata && preference.reencodeOnIncorrectMetadataForChromecast)) {
-            // Konverter (eller reenkode) til HEVC med x265 med riktige parametere
-            listOf(
-                "-c:v", "libx265", "-preset", "slow",
-                "-x265-params", "\"profile=$targetProfile:level=$targetLevel\"",
-                "-tag:v", "hev1"
-            )
-        } else {
-            // Dersom vi mener at vi kun trenger å remuxe, kan vi gjøre
-            listOf(
-                "-c:v", "copy", "-tag:v", "hev1"
-            )
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/validator/CompletionValidator.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/validator/CompletionValidator.kt
deleted file mode 100644
index 87f63bf6..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/validator/CompletionValidator.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.tasksV2.validator
-
-import no.iktdev.eventi.data.dataAs
-import no.iktdev.eventi.data.isSkipped
-import no.iktdev.eventi.data.isSuccessful
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OperationEvents
-import no.iktdev.mediaprocessing.shared.common.contract.dto.SubtitleFormats
-import no.iktdev.mediaprocessing.shared.common.contract.dto.isOnly
-import java.io.File
-
-/**
- * Validates whether all the required work has been created and processed in accordance with expected behaviour and sequence
- */
-object CompletionValidator {
-
-    /**
-     * Checks whether it requires encode or extract or both, and it has created events with args
-     */
-    fun req1(started: MediaProcessStartEvent, events: List<Event>): Boolean {
-        val encodeFulfilledOrSkipped = if (started.data?.operations?.contains(OperationEvents.ENCODE) == true) {
-            events.any { it.eventType == Events.EncodeParameterCreated }
-        } else true
-
-        val extractFulfilledOrSkipped = if (started.data?.operations?.contains(OperationEvents.EXTRACT) == true) {
-            events.any { it.eventType == Events.ExtractParameterCreated }
-        } else true
-
-        if (!encodeFulfilledOrSkipped || !extractFulfilledOrSkipped) {
-            return false
-        } else return true
-    }
-
-    /**
-     * Checks whether work that was supposed to be created has been created.
-     * Checks if all subtitles that can be processed has been created if convert is set.
-     */
-    fun req2(operations: List<OperationEvents>, events: List<Event>): Boolean {
-        if (OperationEvents.ENCODE in operations) {
-            val encodeParamter = events.find { it.eventType == Events.EncodeParameterCreated }?.az<EncodeArgumentCreatedEvent>()
-            val encodeWork = events.find { it.eventType == Events.EncodeTaskCreated }
-            if (encodeParamter?.isSuccessful() == true && (encodeWork == null))
-                return false
-        }
-
-        val extractParamter = events.find { it.eventType == Events.ExtractParameterCreated }?.az<ExtractArgumentCreatedEvent>()
-        val extractWork = events.filter { it.eventType == Events.ExtractTaskCreated }
-        if (OperationEvents.EXTRACT in operations) {
-            if (extractParamter?.isSuccessful() == true && extractParamter.data?.size != extractWork.size)
-                return false
-        }
-
-        if (OperationEvents.CONVERT in operations) {
-            val convertWork = events.filter { it.eventType == Events.ConvertTaskCreated }
-
-            val supportedSubtitleFormats = SubtitleFormats.entries.map { it.name }
-            val eventsSupportsConvert = extractWork.filter { it.data is ExtractArgumentData }
-                .filter { (it.dataAs<ExtractArgumentData>()?.outputFileName?.let { f -> File(f).extension.uppercase() } in supportedSubtitleFormats) }
-
-            if (convertWork.size != eventsSupportsConvert.size)
-                return false
-        }
-
-        return true
-    }
-
-    /**
-     * Checks whether all work that has been created has been completed
-     */
-    fun req3(operations: List<OperationEvents>, events: List<Event>): Boolean {
-        if (OperationEvents.ENCODE in operations) {
-            val encodeWork = events.filter { it.eventType == Events.EncodeTaskCreated }
-            val encodePerformed = events.filter { it.eventType == Events.EncodeTaskCompleted }
-            if (encodePerformed.size < encodeWork.size)
-                return false
-        }
-
-        if (OperationEvents.EXTRACT in operations) {
-            val extractWork = events.filter { it.eventType == Events.ExtractTaskCreated }
-            val extractPerformed = events.filter { it.eventType == Events.ExtractTaskCompleted }
-            if (extractPerformed.size < extractWork.size)
-                return false
-        }
-
-        if (OperationEvents.CONVERT in operations) {
-            val convertWork = events.filter { it.eventType == Events.ConvertTaskCreated }
-            val convertPerformed = events.filter { it.eventType == Events.ConvertTaskCompleted }
-            if (convertPerformed.size < convertWork.size || (operations.isOnly(OperationEvents.CONVERT) && convertWork.isEmpty()))
-                return false
-        }
-
-        return true
-    }
-
-    /**
-     * Checks if metadata has cover, if so, 2 events are expected
-     */
-    fun req4(events: List<Event>): Boolean {
-        val metadata = events.find { it.eventType == Events.MetadataSearchPerformed }
-        if (metadata?.isSkipped() == true) {
-            return true
-        }
-
-        if (metadata?.isSuccessful() != true) {
-            return true
-        }
-
-        val hasCover = metadata.dataAs<pyMetadata>()?.cover != null
-        if (hasCover == false) {
-            return true
-        }
-
-        if (events.any { it.eventType == Events.ReadOutCover } && events.any { it.eventType == Events.CoverDownloaded }) {
-            return true
-        }
-        return false
-    }
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/FileWatcherQueue.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/FileWatcherQueue.kt
deleted file mode 100644
index 3384d6b7..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/FileWatcherQueue.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.watcher
-
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.delay
-import no.iktdev.mediaprocessing.coordinator.defaultCoroutine
-import no.iktdev.mediaprocessing.shared.common.isFileAvailable
-import java.io.File
-import java.util.UUID
-
-data class PendingFile(val id: String = UUID.randomUUID().toString(), val file: File, var time: Long = 0)
-class FileWatcherQueue {
-    private val fileChannel = Channel<PendingFile>()
-
-    fun addToQueue(file: File, onFilePending: (PendingFile) -> Unit, onFileAccessible: (PendingFile) -> Unit) {
-        // Check if the file is accessible
-        if (isFileAvailable(file)) {
-            // If accessible, run the function immediately and return
-            onFileAccessible(PendingFile(file = file))
-            return
-        }
-
-        // Add the file to the channel for processing
-        fileChannel.trySend(PendingFile(file = file))
-
-        // Coroutine to process the file and remove it from the queue when accessible
-        defaultCoroutine.launch {
-            while (true) {
-                delay(500)
-                val currentFile = fileChannel.receive()
-                if (isFileAvailable(currentFile.file)) {
-                    onFileAccessible(currentFile)
-                    // File is accessible, remove it from the queue
-                    removeFromQueue(currentFile.file) { /* Do nothing here as the operation is not intended to be performed here */ }
-                } else {
-                    // File is not accessible, put it back in the channel for later processing
-                    fileChannel.send(currentFile.apply { time += 500 })
-                    onFilePending(currentFile)
-                }
-            }
-        } // https://chat.openai.com/share/f3c8f6ea-603a-40d6-a811-f8fea5067501
-    }
-
-    fun removeFromQueue(file: File, onFileRemoved: (PendingFile) -> Unit) {
-        val currentItems = fileChannel.list()
-        val toRemove = currentItems.filter {
-            if (it.file.isDirectory) it.file.name == file.name else it.file.name == file.name && it.file.parent == file.parent
-        }
-
-        toRemove.let {
-            it.forEach { file -> onFileRemoved(file) }
-        }
-    }
-
-
-    // Extension function to find and remove an element from the channel
-    fun <T> Channel<T>.findAndRemove(predicate: (T) -> Boolean): List<T> {
-        val forRemoved = mutableListOf<T>()
-        val items = mutableListOf<T>()
-        while (true) {
-            val item = tryReceive().getOrNull() ?: break
-            if (predicate(item)) {
-                forRemoved.add(item)
-            }
-            items.add(item)
-        }
-        for (item in items) {
-            trySend(item).isSuccess
-        }
-        return forRemoved
-    }
-
-    fun <T> Channel<T>.list(): List<T> {
-        val items = mutableListOf<T>()
-        while (true) {
-            val item = tryReceive().getOrNull() ?: break
-            items.add(item)
-            trySend(item).isSuccess
-        }
-        return items
-    }
-
-
-}
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/InputDirectoryWatcher.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/InputDirectoryWatcher.kt
deleted file mode 100644
index 786785dc..00000000
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/InputDirectoryWatcher.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-package no.iktdev.mediaprocessing.coordinator.watcher
-
-import dev.vishna.watchservice.KWatchEvent.Kind.Deleted
-import dev.vishna.watchservice.KWatchEvent.Kind.Initialized
-import dev.vishna.watchservice.asWatchChannel
-import jakarta.annotation.PreDestroy
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.channels.consumeEach
-import kotlinx.coroutines.delay
-import mu.KotlinLogging
-import no.iktdev.eventi.database.executeWithResult
-import no.iktdev.eventi.database.withTransaction
-import no.iktdev.mediaprocessing.coordinator.*
-import no.iktdev.mediaprocessing.shared.common.SharedConfig
-import no.iktdev.mediaprocessing.shared.common.contract.ProcessType
-import no.iktdev.mediaprocessing.shared.common.database.tables.files
-import no.iktdev.mediaprocessing.shared.common.extended.isSupportedVideoFile
-import no.iktdev.mediaprocessing.shared.common.ifNotEmpty
-import no.iktdev.mediaprocessing.shared.common.md5
-import no.iktdev.streamit.library.db.executeOrException
-import no.iktdev.streamit.library.db.withTransaction
-import org.jetbrains.exposed.sql.insertIgnore
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import java.io.File
-
-
-interface FileWatcherEvents {
-    fun onFileAvailable(file: PendingFile)
-
-    /**
-     * If the file is being copied or incomplete, or in case a process currently owns the file, pending should be issued
-     */
-    fun onFilePending(file: PendingFile)
-
-    /**
-     * If the file is either removed or is not a valid file
-     */
-    fun onFileFailed(file: PendingFile)
-
-
-    fun onFileRemoved(file: PendingFile)
-}
-
-
-
-@Service
-class InputDirectoryWatcher(@Autowired var coordinator: Coordinator): FileWatcherEvents {
-
-    private val logger = KotlinLogging.logger {}
-    val watchDirectories = SharedConfig.incomingContent
-    val queue = FileWatcherQueue()
-
-    @Volatile
-    private var isStopping: Boolean = false
-    @PreDestroy
-    fun setStop() {
-        isStopping = true
-    }
-
-
-    suspend fun watchFiles() {
-        log.info { "Starting Watcher" }
-        val dirs = watchDirectories.filter { it.exists() && it.isDirectory }
-        if (dirs.isNotEmpty()) {
-            val paths = dirs.joinToString("\n\t") { it.absolutePath }
-            log.info { "Watching directories:\n\t$paths" }
-
-            for (dir in dirs) {
-                val files = dir.listFiles()?.map { it.name }?.joinToString { "\n\t $it" } ?: "No files present.."
-                log.info { "Content present for path ${dir.absolutePath} \n$files" }
-            }
-        }
-
-        //val errorConfiguredDirs = watchDirectories.filter { !it.isDirectory || !it.exists()}.joinToString("\n\t") { it.absolutePath }
-        watchDirectories.filter { !it.isDirectory || !it.exists()}.ifNotEmpty {
-            val errorConfiguredDirs = it.joinToString("\n\t") { it.absolutePath }
-            log.error { "Failed to initialize watcher for the following: \n\t $errorConfiguredDirs" }
-        }
-        for (folder in watchDirectories) {
-            startWatchOnDirectory(folder)
-        }
-    }
-
-    val activeWatchers: MutableList<FileWatcher> = mutableListOf()
-    @OptIn(ExperimentalCoroutinesApi::class)
-    private suspend fun startWatchOnDirectory(file: File) {
-        if (activeWatchers.any {it -> it.file.absolutePath == file.absolutePath}) {
-            log.error { "Attempting to start a watcher on an already watched directory ${file.absolutePath}" }
-            return
-        }
-        val watcher =  file.asWatcher { watcher ->
-            try {
-                watcher.consumeEach {
-                    if (it.file == SharedConfig.incomingContent) {
-                        logger.info { "IO Watcher ${it.kind} on ${it.file.absolutePath}" }
-                    } else {
-                        logger.info { "IO Event: ${it.kind}: ${it.file.name}" }
-                    }
-                    try {
-                        when (it.kind) {
-                            Deleted -> removeFile(it.file)
-                            Initialized -> { /* Do nothing */ }
-                            else -> {
-                                val added = addFile(it.file)
-                                if (!added) {
-                                    logger.info { "Ignoring event kind: ${it.kind.name} for file ${it.file.name} as it is not a supported video file" }
-                                }
-                            }
-                        }
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-                }
-            } catch (e: Exception) {
-                log.error { "Consume failed ${e.message}" }
-                e.printStackTrace()
-                watcher.close()
-            }
-        }.also { watcher ->
-            watcher.watcher.invokeOnClose {
-                it?.printStackTrace()
-                log.warn { "Watcher stopped for ${watcher.file}" }
-                if (!isStopping) {
-                    log.info { "Determined that the program is not in a termination stage.. Restarting watcher" }
-                    activeWatchers.remove(watcher)
-                    ioCoroutine.launch {
-                        log.info { "Waiting 500ms before restarting watcher.." }
-                        delay(500)
-                        startWatchOnDirectory(watcher.file)
-                    }
-                }
-            }
-        }
-        log.info { "Now watching ${file.absolutePath} for files" }
-        activeWatchers.add(watcher)
-    }
-
-
-    init {
-        ioCoroutine.launch {
-            watchFiles()
-        }
-    }
-
-
-    private fun addFile(file: File): Boolean {
-        return if (file.isFile && file.isSupportedVideoFile()) {
-            log.info { "Adding ${file.name} to queue" }
-            queue.addToQueue(file, this@InputDirectoryWatcher::onFilePending, this@InputDirectoryWatcher::onFileAvailable)
-            true
-        } else if (file.isDirectory) {
-            log.info { "Searching for files in ${file.name}" }
-            val supportedFiles = file.walkTopDown().filter { f -> f.isFile && f.isSupportedVideoFile() }
-            supportedFiles.forEach { sf ->
-                log.info { "Adding ${sf.name} to queue from folder" }
-                queue.addToQueue(sf, this@InputDirectoryWatcher::onFilePending, this@InputDirectoryWatcher::onFileAvailable)
-            }
-            true
-        } else false
-    }
-
-    private fun removeFile(file: File) {
-        log.info { "Removing file from Queue ${file.name}" }
-        queue.removeFromQueue(file, this@InputDirectoryWatcher::onFileRemoved)
-    }
-
-    override fun onFileAvailable(file: PendingFile) {
-        logger.info { "File available ${file.file.name}" }
-
-        // This sends it to coordinator to start the process
-        executeWithResult(eventDatabase.database.database) {
-            files.insertIgnore {
-                it[baseName] = file.file.nameWithoutExtension
-                it[folder] = file.file.parentFile.absolutePath
-                it[fileName] = file.file.absolutePath
-                it[checksum] = file.file.md5()
-            }
-        }
-        coordinator.startProcess(file.file, ProcessType.FLOW)
-    }
-
-    override fun onFilePending(file: PendingFile) {
-        logger.info { "File pending availability ${file.file.name}" }
-    }
-
-    override fun onFileFailed(file: PendingFile) {
-        logger.warn { "File failed availability ${file.file.name}" }
-    }
-
-    override fun onFileRemoved(file: PendingFile) {
-        logger.info { "File removed ${file.file.name} was removed" }
-    }
-
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Implementations.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Implementations.kt
deleted file mode 100644
index 25065b38..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Implementations.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package no.iktdev.mediaprocessing.processer
-
-import no.iktdev.mediaprocessing.shared.common.Defaults
-import no.iktdev.mediaprocessing.shared.common.socket.SocketImplementation
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Import
-import org.springframework.web.client.RestTemplate
-
-
-
-@Configuration
-public class DefaultProcesserConfiguration: Defaults() {
-}
-
-@Configuration
-class SocketImplemented: SocketImplementation() {
-    override var additionalOrigins: List<String> = ProcesserEnv.wsAllowedOrigins.split(",")
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserApplication.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserApplication.kt
deleted file mode 100644
index 8cb9364a..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserApplication.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package no.iktdev.mediaprocessing.processer
-
-import mu.KotlinLogging
-import no.iktdev.exfl.coroutines.CoroutinesDefault
-import no.iktdev.exfl.coroutines.CoroutinesIO
-import no.iktdev.exfl.observable.Observables
-import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig
-import no.iktdev.eventi.database.MySqlDataSource
-import no.iktdev.mediaprocessing.shared.common.database.cal.RunnerManager
-import no.iktdev.mediaprocessing.shared.common.database.cal.TasksManager
-import no.iktdev.mediaprocessing.shared.common.database.tables.runners
-import no.iktdev.mediaprocessing.shared.common.database.tables.tasks
-import no.iktdev.mediaprocessing.shared.common.getAppVersion
-import no.iktdev.mediaprocessing.shared.common.toEventsDatabase
-import org.jetbrains.exposed.sql.transactions.TransactionManager
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.runApplication
-import org.springframework.scheduling.annotation.EnableScheduling
-import org.springframework.scheduling.annotation.Scheduled
-import org.springframework.transaction.annotation.Transactional
-import javax.annotation.PreDestroy
-
-
-private val logger = KotlinLogging.logger {}
-val ioCoroutine = CoroutinesIO()
-val defaultCoroutine = CoroutinesDefault()
-
-
-@SpringBootApplication
-class ProcesserApplication {
-
-    @PreDestroy
-    fun onShutdown() {
-        doTransactionalCleanup()
-    }
-
-    @Transactional
-    fun doTransactionalCleanup() {
-        runnerManager.unlist()
-    }
-
-}
-
-private lateinit var eventsDatabase: MySqlDataSource
-fun getEventsDatabase(): MySqlDataSource {
-    return eventsDatabase
-}
-
-
-lateinit var taskManager: TasksManager
-lateinit var runnerManager: RunnerManager
-
-private val log = KotlinLogging.logger {}
-
-
-fun main(args: Array<String>) {
-    ioCoroutine.addListener(listener = object: Observables.ObservableValue.ValueListener<Throwable> {
-        override fun onUpdated(value: Throwable) {
-            value.printStackTrace()
-        }
-    })
-    defaultCoroutine.addListener(listener = object: Observables.ObservableValue.ValueListener<Throwable> {
-        override fun onUpdated(value: Throwable) {
-            value.printStackTrace()
-        }
-    })
-
-    eventsDatabase = DatabaseEnvConfig.toEventsDatabase()
-    eventsDatabase.createDatabase()
-    eventsDatabase.createTables(tasks, runners)
-
-    taskManager = TasksManager(eventsDatabase)
-
-    runnerManager = RunnerManager(dataSource = getEventsDatabase(), applicationName = ProcesserApplication::class.java.simpleName)
-    runnerManager.assignRunner()
-
-    runApplication<ProcesserApplication>(*args)
-    log.info { "App Version: ${getAppVersion()}" }
-
-}
-
-@EnableScheduling
-class DatabaseReconnect() {
-    var lostConnectionCount = 0
-    @Scheduled(fixedDelay = (100_000))
-    fun checkIfConnected() {
-        if (TransactionManager.currentOrNull() == null) {
-            lostConnectionCount++
-            eventsDatabase.toDatabase()
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserEnv.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserEnv.kt
deleted file mode 100644
index 5ca0385c..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserEnv.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package no.iktdev.mediaprocessing.processer
-
-import no.iktdev.exfl.using
-import java.io.File
-
-class ProcesserEnv {
-    companion object {
-        val wsAllowedOrigins: String = System.getenv("AllowedOriginsWebsocket")?.takeIf { it.isNotBlank() } ?: ""
-
-        val ffmpeg: String = System.getenv("SUPPORTING_EXECUTABLE_FFMPEG") ?: "ffmpeg"
-        val allowOverwrite = System.getenv("ALLOW_OVERWRITE").toBoolean() ?: false
-
-        val logDirectory = if (!System.getenv("LOG_DIR").isNullOrBlank()) File(System.getenv("LOG_DIR")) else
-            File("data").using("logs")
-
-        val encodeLogDirectory = logDirectory.using("encode")
-        val extractLogDirectory = logDirectory.using("extract")
-
-        val fullLogging = System.getenv("FullLogging").toBoolean()
-    }
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Reporter.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Reporter.kt
deleted file mode 100644
index b0e91843..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Reporter.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package no.iktdev.mediaprocessing.processer
-
-import mu.KotlinLogging
-import no.iktdev.mediaprocessing.shared.common.SharedConfig
-import no.iktdev.mediaprocessing.shared.common.contract.dto.ProcesserEventInfo
-import no.iktdev.mediaprocessing.shared.common.task.Task
-import no.iktdev.mediaprocessing.shared.common.tryPost
-import no.iktdev.mediaprocessing.shared.common.trySend
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.messaging.simp.SimpMessagingTemplate
-import org.springframework.stereotype.Service
-import org.springframework.web.client.RestTemplate
-
-@Service
-class Reporter() {
-    @Autowired
-    lateinit var restTemplate: RestTemplate
-    @Autowired
-    lateinit var messageTemplate: SimpMessagingTemplate
-
-    private val log = KotlinLogging.logger {}
-
-
-    fun encodeTaskAssigned(task: Task) {
-        messageTemplate.trySend("/topic/encode/assigned", task)
-    }
-
-    fun extractTaskAssigned(task: Task) {
-        messageTemplate.trySend("/topic/extract/assigned", task)
-    }
-
-    fun sendEncodeProgress(progress: ProcesserEventInfo) {
-        restTemplate.tryPost<String>(SharedConfig.uiUrl + "/encode/progress", progress)
-        messageTemplate.trySend("/topic/encode/progress", progress)
-    }
-
-    fun sendExtractProgress(progress: ProcesserEventInfo) {
-        restTemplate.tryPost<String>(SharedConfig.uiUrl + "/extract/progress", progress)
-        messageTemplate.trySend("/topic/extract/progress", progress)
-    }
-
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/TaskCoordinator.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/TaskCoordinator.kt
deleted file mode 100644
index 7b514eb3..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/TaskCoordinator.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-package no.iktdev.mediaprocessing.processer
-
-import mu.KotlinLogging
-import no.iktdev.mediaprocessing.shared.common.*
-import no.iktdev.mediaprocessing.shared.common.database.cal.ActiveMode
-import no.iktdev.mediaprocessing.shared.common.database.cal.RunnerManager
-import no.iktdev.mediaprocessing.shared.common.task.TaskType
-import no.iktdev.mediaprocessing.shared.common.contract.data.Event
-import org.springframework.scheduling.annotation.EnableScheduling
-import org.springframework.stereotype.Service
-
-@Service
-@EnableScheduling
-class TaskCoordinator(): TaskCoordinatorBase() {
-    private val log = KotlinLogging.logger {}
-    lateinit var runnerManager: RunnerManager
-
-    override fun onCoordinatorReady() {
-        super.onCoordinatorReady()
-        runnerManager = RunnerManager(dataSource = getEventsDatabase(), applicationName = ProcesserApplication::class.java.simpleName)
-        runnerManager.assignRunner()
-    }
-
-
-    override val taskAvailabilityEventListener: MutableMap<TaskType, MutableList<TaskQueueListener>> = mutableMapOf(
-        TaskType.Encode to mutableListOf(),
-        TaskType.Extract to mutableListOf()
-    )
-
-    private val taskListeners: MutableSet<TaskEvents> = mutableSetOf()
-    fun getTaskListeners(): List<TaskEvents> {
-        return taskListeners.toList()
-    }
-    fun addTaskEventListener(listener: TaskEvents) {
-        taskListeners.add(listener)
-    }
-
-    fun addEncodeTaskListener(listener: TaskQueueListener) {
-        addTaskListener(TaskType.Encode, listener)
-    }
-    fun addExtractTaskListener(listener: TaskQueueListener) {
-        addTaskListener(TaskType.Extract, listener)
-    }
-
-    override fun addTaskListener(type: TaskType, listener: TaskQueueListener) {
-        super.addTaskListener(type, listener)
-        pullForAvailableTasks()
-    }
-
-
-    override fun pullForAvailableTasks() {
-        if (runnerManager.iAmSuperseded()) {
-            // This will let the application complete but not consume new
-            val prevState = taskMode
-            taskMode = ActiveMode.Passive
-            if (taskMode != prevState && taskMode == ActiveMode.Passive) {
-                log.warn { "A newer version has been detected. Changing mode to $taskMode, no new tasks will be processed" }
-            }
-            return
-        }
-        val available = taskManager.getClaimableTasks().asClaimable()
-        available.forEach { (type, list) ->
-            taskAvailabilityEventListener[type]?.forEach {  listener ->
-                list.foreachOrUntilClaimed {
-                    listener.onTaskAvailable(it)
-                }
-            }
-        }
-    }
-
-    override fun onProduceEvent(event: Event) {
-        taskManager.produceEvent(event)
-    }
-
-    override fun getEnabledState(): Boolean {
-        return runnerManager.amIEnabled()
-    }
-
-    override fun clearExpiredClaims() {
-        val expiredClaims = taskManager.getTasksWithExpiredClaim().filter { it.task in listOf(TaskType.Encode, TaskType.Extract) }
-        expiredClaims.forEach {
-            log.info { "Found event with expired claim: ${it.referenceId}::${it.eventId}::${it.task}" }
-        }
-        expiredClaims.forEach {
-            val result = taskManager.deleteTaskClaim(referenceId = it.referenceId, eventId = it.eventId)
-            if (result) {
-                log.info { "Released claim on ${it.referenceId}::${it.eventId}::${it.task}" }
-            } else {
-                log.error { "Failed to release claim on ${it.referenceId}::${it.eventId}::${it.task}" }
-            }
-        }
-    }
-
-    interface TaskEvents {
-        fun onCancelOrStopProcess(eventId: String)
-    }
-
-}
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/controller/CancelController.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/controller/CancelController.kt
deleted file mode 100644
index be4cc2df..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/controller/CancelController.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package no.iktdev.mediaprocessing.processer.controller
-
-import no.iktdev.mediaprocessing.processer.TaskCoordinator
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.http.HttpStatus
-import org.springframework.http.ResponseEntity
-import org.springframework.stereotype.Controller
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-
-@Controller
-class CancelController(@Autowired var task: TaskCoordinator) {
-
-    @RequestMapping(path = ["/cancel"])
-    fun cancelProcess(@RequestBody eventId: String? = null): ResponseEntity<String> {
-        if (eventId.isNullOrBlank()) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("No eventId provided!")
-        }
-        task.getTaskListeners().forEach { it.onCancelOrStopProcess(eventId) }
-        return ResponseEntity.ok(null)
-    }
-
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegArgumentsBuilder.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegArgumentsBuilder.kt
deleted file mode 100644
index 2cb6bfaf..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegArgumentsBuilder.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package no.iktdev.mediaprocessing.processer.ffmpeg
-
-class FfmpegArgumentsBuilder() {
-    private val defaultArguments = listOf(
-        "-nostdin",
-        "-nostats",
-        "-hide_banner"
-    )
-    private var inputFile: String? = null
-    private var outputFile: String? = null
-    private var overwrite: Boolean = false
-    private var progress: Boolean = false
-    private var suppliedArgs: List<String> = emptyList()
-
-    fun inputFile(inputFile: String) = apply {
-        this.inputFile = inputFile
-    }
-
-    fun outputFile(outputFile: String) = apply {
-        this.outputFile = outputFile
-    }
-
-    fun allowOverwrite(allowOverwrite: Boolean) = apply {
-        this.overwrite = allowOverwrite
-    }
-
-    fun withProgress(withProgress: Boolean) = apply {
-        this.progress = withProgress
-    }
-
-    fun args(args: List<String>) = apply {
-        this.suppliedArgs = args
-    }
-
-    fun build(): List<String> {
-        val args = mutableListOf<String>()
-        val inFile = if (inputFile == null || inputFile?.isBlank() == true) {
-            throw RuntimeException("Inputfile is required")
-        } else this.inputFile!!
-        val outFile: String = if (outputFile == null || outputFile?.isBlank() == true) {
-            throw RuntimeException("Outputfile is required")
-        } else this.outputFile!!
-
-        if (overwrite) {
-            args.add("-y")
-        }
-        args.addAll(defaultArguments)
-        args.addAll(listOf("-i", inFile))
-        args.addAll(suppliedArgs)
-        args.add(outFile)
-        if (progress) {
-            args.addAll(listOf("-progress", "pipe:1"))
-        }
-
-
-
-        return args
-    }
-
-
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegListener.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegListener.kt
deleted file mode 100644
index 958186ad..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegListener.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package no.iktdev.mediaprocessing.processer.ffmpeg
-
-import no.iktdev.mediaprocessing.processer.ffmpeg.progress.FfmpegDecodedProgress
-
-interface FfmpegListener {
-    fun onStarted(inputFile: String)
-    fun onCompleted(inputFile: String, outputFile: String)
-    fun onProgressChanged(inputFile: String, progress: FfmpegDecodedProgress)
-    fun onError(inputFile: String, message: String) {}
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegRunner.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegRunner.kt
deleted file mode 100644
index abb15062..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegRunner.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-package no.iktdev.mediaprocessing.processer.ffmpeg
-
-import com.fasterxml.jackson.core.io.UTF8Writer
-import com.github.pgreze.process.Redirect
-import com.github.pgreze.process.process
-import kotlinx.coroutines.*
-import mu.KotlinLogging
-import no.iktdev.exfl.using
-import no.iktdev.mediaprocessing.processer.ProcesserEnv
-import no.iktdev.mediaprocessing.processer.ffmpeg.progress.FfmpegDecodedProgress
-import no.iktdev.mediaprocessing.processer.ffmpeg.progress.FfmpegProgressDecoder
-import java.io.File
-import java.io.FileOutputStream
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-import java.util.*
-
-private val log = KotlinLogging.logger {}
-class FfmpegRunner(
-    val inputFile: String,
-    val outputFile: String,
-    val arguments: List<String>,
-    private val listener: FfmpegListener,
-    val logDir: File
-) {
-    val workOutputFile = File(outputFile).let {
-        File(it.parentFile.absoluteFile, "${it.nameWithoutExtension}.work.${it.extension}")
-    }.absolutePath
-
-
-    val currentDateTime = LocalDateTime.now()
-    val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd.HH.mm")
-    val formattedDateTime = currentDateTime.format(formatter)
-
-    val logFile = logDir.using("$formattedDateTime-${File(inputFile).nameWithoutExtension}.log")
-
-    val scope = CoroutineScope(Dispatchers.Unconfined + Job())
-    private var job: Job? = null
-
-    val decoder = FfmpegProgressDecoder()
-    private val outputCache = mutableListOf<String>()
-
-    fun isWorking(): Boolean {
-        return job != null && (job?.isCompleted != true) && scope.isActive
-    }
-
-    fun run(progress: Boolean = false) {
-        log.info { "Work file can be found at $workOutputFile" }
-        val args = FfmpegArgumentsBuilder()
-            .inputFile(inputFile)
-            .outputFile(workOutputFile)
-            .args(arguments)
-            .allowOverwrite(ProcesserEnv.allowOverwrite)
-            .withProgress(progress)
-            .build()
-        log.info { "Starting ffmpeg on file $inputFile with arguments:\n\t ${args.joinToString(" ")}" }
-
-        job = scope.launch {
-            execute(args)
-        }
-    }
-
-    fun isAlive(): Boolean {
-        return scope.isActive && job?.isCompleted != true
-    }
-
-    private suspend fun execute(args: List<String>) {
-        withContext(Dispatchers.IO) {
-            logFile.createNewFile()
-        }
-        listener.onStarted(inputFile)
-        val processOp = process(
-            ProcesserEnv.ffmpeg, *args.toTypedArray(),
-            stdout = Redirect.CAPTURE,
-            stderr = Redirect.CAPTURE,
-            consumer = {
-                if (ProcesserEnv.fullLogging) {
-                    log.info { it }
-                }
-                onOutputChanged(it)
-            },
-            destroyForcibly = true
-        )
-
-        val result = processOp
-        onOutputChanged("Received exit code: ${result.resultCode}")
-        if (result.resultCode != 0) {
-            log.warn { "Work outputfile is orphaned and could be found using this path:\n$workOutputFile" }
-            listener.onError(inputFile, result.output.joinToString("\n"))
-        } else {
-            log.info { "Converting work file to output file: $workOutputFile -> $outputFile" }
-            val success = File(workOutputFile).renameTo(File(outputFile))
-            if (!success) {
-                val outMessage = "Could not convert file $workOutputFile -> $outputFile"
-                log.error { outMessage }
-                listener.onError(inputFile, outMessage)
-            } else {
-                listener.onCompleted(inputFile, outputFile)
-            }
-
-        }
-    }
-
-    fun cancel(message: String = "Work was interrupted as requested") {
-        job?.cancel()
-        scope.cancel(message)
-        listener.onError(inputFile, message)
-    }
-
-    private var progress: FfmpegDecodedProgress? = null
-    fun onOutputChanged(line: String) {
-        outputCache.add(line)
-        writeToLog(line)
-        decoder.defineDuration(line)
-        decoder.parseVideoProgress(outputCache.toList())?.let { decoded ->
-            try {
-                val _progress = decoder.getProgress(decoded)
-                if (progress == null || _progress.progress > (progress?.progress ?: -1)) {
-                    progress = _progress
-                    listener.onProgressChanged(inputFile, _progress)
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
-
-    }
-
-    fun writeToLog(line: String) {
-        FileOutputStream(logFile, true).bufferedWriter(Charsets.UTF_8).use {
-            it.appendLine(line)
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegTaskService.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegTaskService.kt
deleted file mode 100644
index 71ee8d69..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegTaskService.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package no.iktdev.mediaprocessing.processer.ffmpeg
-
-import kotlinx.coroutines.cancel
-import mu.KLogger
-import no.iktdev.exfl.using
-import no.iktdev.mediaprocessing.processer.taskManager
-import no.iktdev.mediaprocessing.shared.common.ClaimableTask
-import no.iktdev.mediaprocessing.shared.common.SharedConfig
-import no.iktdev.mediaprocessing.shared.common.TaskQueueListener
-import no.iktdev.mediaprocessing.shared.common.getComputername
-import no.iktdev.mediaprocessing.shared.common.services.TaskService
-import no.iktdev.mediaprocessing.shared.common.task.Task
-import java.io.File
-import java.util.*
-import javax.annotation.PostConstruct
-
-abstract class FfmpegTaskService: TaskService(), FfmpegListener {
-    abstract override val logDir: File
-    abstract override val log: KLogger
-
-    protected var runner: FfmpegRunner? = null
-
-    fun getTemporaryStoreFile(fileName: String): File {
-        return SharedConfig.cachedContent.using(fileName)
-    }
-
-    override fun onTaskAvailable(data: ClaimableTask) {
-        if (runner?.isWorking() == true) {
-            //log.info { "Worker is already running.., will not consume" }
-            return
-        }
-
-        if (assignedTask != null) {
-            log.info { "Assigned task is not unassigned.., will not consume" }
-            return
-        }
-
-
-        val task = data.consume()
-        if (task == null) {
-            log.error { "Task is already consumed!" }
-            return
-        }
-        val isAlreadyClaimed = taskManager.isTaskClaimed(referenceId = task.referenceId, eventId = task.eventId)
-        if (isAlreadyClaimed) {
-            log.warn { "Process is already claimed!" }
-            return
-        }
-        task.let {
-            this.assignedTask = it
-            onTaskAssigned(it)
-        }
-    }
-
-
-    @PostConstruct
-    private fun onCreated() {
-        log.info { "Starting with id: $serviceId" }
-        onAttachListener()
-    }
-
-    fun clearWorker() {
-        this.runner?.scope?.cancel()
-        this.assignedTask = null
-        this.runner = null
-    }
-
-    fun cancelWorkIfRunning(eventId: String) {
-        if (assignedTask?.eventId == eventId) {
-            runner?.cancel()
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/progress/FfmpegDecodedProgress.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/progress/FfmpegDecodedProgress.kt
deleted file mode 100644
index aa05f06f..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/progress/FfmpegDecodedProgress.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package no.iktdev.mediaprocessing.processer.ffmpeg.progress
-
-import no.iktdev.mediaprocessing.shared.common.contract.dto.ProcesserProgress
-
-data class FfmpegDecodedProgress(
-    val progress: Int = -1,
-    val time: String,
-    val duration: String,
-    val speed: String,
-    val estimatedCompletionSeconds: Long = -1,
-    val estimatedCompletion: String = "Unknown",
-) {
-    fun toProcessProgress(): ProcesserProgress {
-        return ProcesserProgress(
-            progress = this.progress,
-            speed = this.speed,
-            timeWorkedOn = this.time,
-            timeLeft = this.estimatedCompletion
-        )
-
-    }
-}
-
-data class ECT(val day: Int = 0, val hour: Int = 0, val minute: Int = 0, val second: Int = 0)
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/progress/FfmpegProgressDecoder.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/progress/FfmpegProgressDecoder.kt
deleted file mode 100644
index 7a17e439..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/progress/FfmpegProgressDecoder.kt
+++ /dev/null
@@ -1,176 +0,0 @@
-package no.iktdev.mediaprocessing.processer.ffmpeg.progress
-
-import mu.KotlinLogging
-import java.lang.StringBuilder
-import java.time.LocalTime
-import java.time.format.DateTimeFormatter
-import java.util.concurrent.TimeUnit
-import kotlin.math.floor
-
-class FfmpegProgressDecoder {
-    private val log = KotlinLogging.logger {}
-
-    data class DecodedProgressData(
-        val frame: Int?,
-        val fps: Double?,
-        val stream_0_0_q: Double?,
-        val bitrate: String?,
-        val total_size: Int?,
-        val out_time_us: Long?,
-        val out_time_ms: Long?,
-        val out_time: String?,
-        val dup_frames: Int?,
-        val drop_frames: Int?,
-        val speed: Double?,
-        val progress: String?
-    )
-
-    val expectedKeys = listOf<String>(
-        "frame=",
-        "fps=",
-        "stream_0_0_q=",
-        "bitrate=",
-        "total_size=",
-        "out_time_us=",
-        "out_time_ms=",
-        "out_time=",
-        "dup_frames=",
-        "drop_frames=",
-        "speed=",
-        "progress="
-    )
-    var duration: Int? = null
-        set(value) {
-            if (field == null || field == 0)
-                field = value
-        }
-    var durationTime: String = "NA"
-    fun parseVideoProgress(lines: List<String>): DecodedProgressData? {
-        var frame: Int? = null
-        var progress: String? = null
-        val metadataMap = mutableMapOf<String, String>()
-
-        try {
-            val eqValue = Regex("=")
-            for (line in lines) {
-                val keyValuePairs = Regex("=\\s*").replace(line, "=").split(" ").filter { it.isNotBlank() }.filter { eqValue.containsMatchIn(it) }
-                for (keyValuePair in keyValuePairs) {
-                    val (key, value) = keyValuePair.split("=")
-                    metadataMap[key] = value
-                }
-
-                if (frame == null) {
-                    frame = metadataMap["frame"]?.toIntOrNull()
-                }
-
-                progress = metadataMap["progress"]
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-
-        return if (progress != null) {
-            // When "progress" is found, build and return the VideoMetadata object
-            DecodedProgressData(
-                frame, metadataMap["fps"]?.toDoubleOrNull(), metadataMap["stream_0_0_q"]?.toDoubleOrNull(),
-                metadataMap["bitrate"], metadataMap["total_size"]?.toIntOrNull(), metadataMap["out_time_us"]?.toLongOrNull(),
-                metadataMap["out_time_ms"]?.toLongOrNull(), metadataMap["out_time"], metadataMap["dup_frames"]?.toIntOrNull(),
-                metadataMap["drop_frames"]?.toIntOrNull(), metadataMap["speed"]?.replace("x", "", ignoreCase = true)?.toDoubleOrNull(), progress
-            )
-        } else {
-            null // If "progress" is not found, return null
-        }
-    }
-
-
-    val parsedDurations: MutableList<String> = mutableListOf()
-    var hasReadContinue: Boolean = false
-    fun defineDuration(value: String) {
-        if (hasReadContinue) {
-            return
-        }
-        if (value.contains(Regex("progress=continue"))) {
-            hasReadContinue = true
-        }
-
-        val results = Regex("Duration:\\s*([^,]+),").find(value)?.groupValues?.firstOrNull() ?: return
-        log.info { "Identified duration for estimation $results" }
-
-        val parsedDuration = Regex("[0-9]+:[0-9]+:[0-9]+.[0-9]+").find(results.toString())?.value ?: return
-
-        if (!parsedDurations.contains(parsedDuration)) {
-            parsedDurations.add(parsedDuration)
-        }
-
-        val longestDuration = parsedDurations.mapNotNull {
-            timeSpanToSeconds(it)
-        }.maxOrNull() ?: return
-
-        duration = longestDuration
-    }
-
-    private fun timeSpanToSeconds(time: String?): Int?
-    {
-        time ?: return null
-        val timeString = Regex("[0-9]+:[0-9]+:[0-9]+.[0-9]+").find(time) ?: return null
-        val strippedMS = Regex("[0-9]+:[0-9]+:[0-9]+").find(timeString.value) ?: return null
-        val outTime = LocalTime.parse(strippedMS.value, DateTimeFormatter.ofPattern("HH:mm:ss"))
-        return outTime.toSecondOfDay()
-    }
-
-
-    fun getProgress(decoded: DecodedProgressData): FfmpegDecodedProgress {
-        if (duration == null)
-            return FfmpegDecodedProgress(duration = durationTime, time = "NA", speed = "NA")
-        val progressTime = timeSpanToSeconds(decoded.out_time) ?: 0
-        val progress = floor((progressTime.toDouble() / duration!!.toDouble()) *100).toInt()
-
-        val ect = getEstimatedTimeRemaining(decoded)
-
-        return FfmpegDecodedProgress(
-            progress = progress,
-            estimatedCompletionSeconds = ect,
-            estimatedCompletion = getETA(ect),
-            duration = durationTime,
-            time = decoded.out_time ?: "NA",
-            speed = decoded.speed?.toString() ?: "NA"
-        )
-    }
-
-    fun getEstimatedTimeRemaining(decoded: DecodedProgressData): Long {
-        val position = timeSpanToSeconds(decoded.out_time) ?: 0
-        return if(duration == null || decoded.speed == null) -1 else
-            Math.round(Math.round(duration!!.toDouble() - position.toDouble()) / decoded.speed)
-    }
-
-    fun getECT(time: Long): ECT {
-        var seconds = time
-        val day = TimeUnit.SECONDS.toDays(seconds)
-        seconds -= java.util.concurrent.TimeUnit.DAYS.toSeconds(day)
-
-        val hour = TimeUnit.SECONDS.toHours(seconds)
-        seconds -= java.util.concurrent.TimeUnit.HOURS.toSeconds(hour)
-
-        val minute = TimeUnit.SECONDS.toMinutes(seconds)
-        seconds -= java.util.concurrent.TimeUnit.MINUTES.toSeconds(minute)
-
-        return ECT(day.toInt(), hour.toInt(), minute.toInt(), seconds.toInt())
-    }
-    private fun getETA(time: Long): String {
-        val etc = getECT(time) ?: return "Unknown"
-        val str = StringBuilder()
-        if (etc.day > 0) {
-            str.append("${etc.day}d").append(" ")
-        }
-        if (etc.hour > 0) {
-            str.append("${etc.hour}h").append(" ")
-        }
-        if (etc.day == 0 && etc.minute > 0) {
-            str.append("${etc.minute}m").append(" ")
-        }
-        if (etc.hour == 0 && etc.second > 0) {
-            str.append("${etc.second}s").append(" ")
-        }
-        return str.toString().trim()
-    }
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeService.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeService.kt
deleted file mode 100644
index 77022241..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeService.kt
+++ /dev/null
@@ -1,229 +0,0 @@
-package no.iktdev.mediaprocessing.processer.services
-
-import com.google.gson.Gson
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import mu.KotlinLogging
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.mediaprocessing.processer.ProcesserEnv
-import no.iktdev.mediaprocessing.processer.Reporter
-import no.iktdev.mediaprocessing.processer.TaskCoordinator
-import no.iktdev.mediaprocessing.processer.ffmpeg.FfmpegRunner
-import no.iktdev.mediaprocessing.processer.ffmpeg.FfmpegTaskService
-import no.iktdev.mediaprocessing.processer.ffmpeg.progress.FfmpegDecodedProgress
-import no.iktdev.mediaprocessing.processer.taskManager
-import no.iktdev.mediaprocessing.shared.common.database.cal.Status
-import no.iktdev.mediaprocessing.shared.common.task.Task
-import no.iktdev.mediaprocessing.shared.common.contract.data.EncodeArgumentData
-import no.iktdev.mediaprocessing.shared.common.contract.data.EncodeWorkPerformedEvent
-import no.iktdev.mediaprocessing.shared.common.contract.data.EncodedData
-import no.iktdev.mediaprocessing.shared.common.contract.dto.ProcesserEventInfo
-import no.iktdev.mediaprocessing.shared.common.contract.dto.WorkStatus
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import java.io.File
-import java.time.Duration
-
-@Service
-class EncodeService(
-    @Autowired var tasks: TaskCoordinator,
-    @Autowired private val reporter: Reporter
-) : FfmpegTaskService(), TaskCoordinator.TaskEvents {
-
-    fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    override val log = KotlinLogging.logger {}
-    override val logDir = ProcesserEnv.encodeLogDirectory
-
-    override fun getServiceId(serviceName: String): String {
-        return super.getServiceId(this::class.java.simpleName)
-    }
-
-    override fun onAttachListener() {
-        tasks.addEncodeTaskListener(this)
-        tasks.addTaskEventListener(this)
-    }
-
-    override fun isReadyToConsume(): Boolean {
-        return runner?.isWorking() == false
-    }
-
-    override fun isTaskClaimable(task: Task): Boolean {
-        return !taskManager.isTaskClaimed(referenceId = task.referenceId, eventId = task.eventId)
-    }
-
-    override fun onTaskAssigned(task: Task) {
-        reporter.encodeTaskAssigned(task)
-        startEncode(task)
-    }
-
-
-    fun startEncode(event: Task) {
-        val ffwrc = event.data as EncodeArgumentData
-        val outFile = getTemporaryStoreFile(ffwrc.outputFileName)
-        outFile.parentFile.mkdirs()
-        if (!logDir.exists()) {
-            logDir.mkdirs()
-        }
-
-        val setClaim =
-            taskManager.markTaskAsClaimed(referenceId = event.referenceId, eventId = event.eventId, claimer = serviceId)
-
-        if (setClaim) {
-            log.info { "Claim successful for ${event.referenceId} encode" }
-            runner = FfmpegRunner(
-                inputFile = ffwrc.inputFile,
-                outputFile = outFile.absolutePath,
-                arguments = ffwrc.arguments,
-                logDir = logDir, listener = this
-            )
-            if (outFile.exists()) {
-                val reason = "${this::class.java.simpleName} identified the file as already existing, either allow overwrite or delete the offending file: ${outFile.absolutePath}"
-                if (ffwrc.arguments.firstOrNull() != "-y") {
-                    this.onError(
-                        ffwrc.inputFile,
-                        reason
-                    )
-                    // Setting consumed to prevent spamming
-                    taskManager.markTaskAsCompleted(event.referenceId, event.eventId, Status.ERROR, reason)
-                    return
-                }
-            }
-            runner?.run(true)
-
-        } else {
-            log.error { "Failed to set claim on referenceId: ${event.referenceId} on event ${event.task}" }
-        }
-    }
-
-    override fun onStarted(inputFile: String) {
-        val task = assignedTask ?: return
-        taskManager.markTaskAsClaimed(task.referenceId, task.eventId, serviceId)
-        sendProgress(
-            task.referenceId, task.eventId, status = WorkStatus.Started, FfmpegDecodedProgress(
-                progress = 0,
-                time = "Unkown",
-                duration = "Unknown",
-                speed = "0",
-            )
-        )
-        log.info { "Encode started for ${task.referenceId}" }
-
-        runner?.scope?.launch {
-            log.info { "Encode keep-alive started for ${task.referenceId}" }
-            while (runner?.isAlive() == true) {
-                delay(Duration.ofMinutes(5).toMillis())
-                taskManager.refreshTaskClaim(task.referenceId, task.eventId, serviceId)
-            }
-        }
-    }
-
-    override fun onCompleted(inputFile: String, outputFile: String) {
-        val task = assignedTask ?: return
-        log.info { "Encode completed for ${task.referenceId}" }
-        val claimSuccessful = taskManager.markTaskAsCompleted(task.referenceId, task.eventId)
-        runBlocking {
-            delay(1000)
-            if (!claimSuccessful) {
-                taskManager.markTaskAsCompleted(task.referenceId, task.eventId)
-                delay(1000)
-            }
-            var readbackIsSuccess = taskManager.isTaskCompleted(task.referenceId, task.eventId)
-            while (!readbackIsSuccess) {
-                delay(1000)
-                readbackIsSuccess = taskManager.isTaskCompleted(task.referenceId, task.eventId)
-            }
-
-            tasks.onProduceEvent(
-                EncodeWorkPerformedEvent(
-                    metadata = EventMetadata(
-                        referenceId = task.referenceId,
-                        derivedFromEventId = task.eventId,
-                        status = EventStatus.Success,
-                        source = getProducerName()
-                    ),
-                    data = EncodedData(
-                        outputFile
-                    )
-                )
-            )
-            sendProgress(
-                task.referenceId, task.eventId, status = WorkStatus.Completed, FfmpegDecodedProgress(
-                    progress = 100,
-                    time = "",
-                    duration = "",
-                    speed = "0",
-                )
-            )
-            clearWorker()
-        }
-    }
-
-    override fun onError(inputFile: String, message: String) {
-        val task = assignedTask ?: return
-
-        taskManager.markTaskAsCompleted(task.referenceId, task.eventId, Status.ERROR, message)
-
-        log.error { "Encode failed for ${task.referenceId}\n$message" }
-        tasks.onProduceEvent(EncodeWorkPerformedEvent(
-            metadata = EventMetadata(
-                referenceId = task.referenceId,
-                derivedFromEventId = task.eventId,
-                status = EventStatus.Failed,
-                source = getProducerName()
-            )
-        ))
-        sendProgress(
-            task.referenceId, task.eventId, status = WorkStatus.Failed, progress = FfmpegDecodedProgress(
-                progress = 0,
-                time = "",
-                duration = "",
-                speed = "0",
-            )
-        )
-        clearWorker()
-    }
-
-
-    override fun onProgressChanged(inputFile: String, progress: FfmpegDecodedProgress) {
-        val task = assignedTask ?: return
-        sendProgress(task.referenceId, task.eventId, WorkStatus.Working, progress)
-    }
-
-
-    fun sendProgress(
-        referenceId: String,
-        eventId: String,
-        status: WorkStatus,
-        progress: FfmpegDecodedProgress? = null
-    ) {
-        val runner = runner ?: return
-
-        val processerEventInfo = ProcesserEventInfo(
-            referenceId = referenceId,
-            eventId = eventId,
-            status = status,
-            inputFile = runner.inputFile,
-            outputFiles = listOf(runner.outputFile),
-            progress = progress?.toProcessProgress()
-        )
-        try {
-            log.info { "Reporting encode progress ${Gson().toJson(processerEventInfo)}" }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        try {
-            reporter.sendEncodeProgress(processerEventInfo)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    override fun onCancelOrStopProcess(eventId: String) {
-        cancelWorkIfRunning(eventId)
-    }
-}
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ExtractService.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ExtractService.kt
deleted file mode 100644
index a77cb4de..00000000
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ExtractService.kt
+++ /dev/null
@@ -1,204 +0,0 @@
-package no.iktdev.mediaprocessing.processer.services
-
-import kotlinx.coroutines.runBlocking
-import mu.KotlinLogging
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.mediaprocessing.processer.ProcesserEnv
-import no.iktdev.mediaprocessing.processer.Reporter
-import no.iktdev.mediaprocessing.processer.TaskCoordinator
-import no.iktdev.mediaprocessing.processer.ffmpeg.FfmpegRunner
-import no.iktdev.mediaprocessing.processer.ffmpeg.FfmpegTaskService
-import no.iktdev.mediaprocessing.processer.ffmpeg.progress.FfmpegDecodedProgress
-import no.iktdev.mediaprocessing.processer.taskManager
-import no.iktdev.mediaprocessing.shared.common.limitedWhile
-import no.iktdev.mediaprocessing.shared.common.database.cal.Status
-import no.iktdev.mediaprocessing.shared.common.task.Task
-import no.iktdev.mediaprocessing.shared.common.contract.data.ExtractArgumentData
-import no.iktdev.mediaprocessing.shared.common.contract.data.ExtractWorkCreatedEvent
-import no.iktdev.mediaprocessing.shared.common.contract.data.ExtractWorkPerformedEvent
-import no.iktdev.mediaprocessing.shared.common.contract.data.ExtractedData
-import no.iktdev.mediaprocessing.shared.common.contract.dto.ProcesserEventInfo
-import no.iktdev.mediaprocessing.shared.common.contract.dto.WorkStatus
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-import java.io.File
-
-@Service
-class ExtractService(
-    @Autowired var tasks: TaskCoordinator,
-    @Autowired private val reporter: Reporter
-) : FfmpegTaskService(), TaskCoordinator.TaskEvents {
-
-    fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    override val log = KotlinLogging.logger {}
-    override val logDir = ProcesserEnv.encodeLogDirectory
-
-    override fun getServiceId(serviceName: String): String {
-        return super.getServiceId(this::class.java.simpleName)
-    }
-
-    override fun onAttachListener() {
-        tasks.addExtractTaskListener(this)
-        tasks.addTaskEventListener(this)
-    }
-
-    override fun isReadyToConsume(): Boolean {
-        return runner?.isWorking() == false
-    }
-
-    override fun isTaskClaimable(task: Task): Boolean {
-        return !taskManager.isTaskClaimed(referenceId = task.referenceId, eventId = task.eventId)
-    }
-
-    override fun onTaskAssigned(task: Task) {
-        reporter.extractTaskAssigned(task)
-        startExtract(task)
-    }
-
-
-    fun startExtract(event: Task) {
-        val ffwrc = event.data as ExtractArgumentData
-        val outputFile = getTemporaryStoreFile(ffwrc.outputFileName)
-        if (!logDir.exists()) {
-            logDir.mkdirs()
-        }
-
-        val setClaim =
-            taskManager.markTaskAsClaimed(referenceId = event.referenceId, eventId = event.eventId, claimer = serviceId)
-        if (setClaim) {
-            log.info { "Claim successful for ${event.referenceId} extract" }
-            runner = FfmpegRunner(
-                inputFile = ffwrc.inputFile,
-                outputFile = outputFile.absolutePath,
-                arguments = ffwrc.arguments,
-                logDir = logDir,
-                listener = this
-            )
-            if (outputFile.exists()) {
-                val reason =
-                    "${this::class.java.simpleName} identified the file as already existing, either allow overwrite or delete the offending file: ${outputFile.absolutePath}"
-                if (ffwrc.arguments.firstOrNull() != "-y") {
-                    this.onError(
-                        ffwrc.inputFile,
-                        reason
-                    )
-                    // Setting consumed to prevent spamming
-                    taskManager.markTaskAsCompleted(event.referenceId, event.eventId, Status.ERROR, reason)
-                    return
-                }
-            }
-            runner?.run()
-        } else {
-            log.error { "Failed to set claim on referenceId: ${event.referenceId} on event ${event.task}" }
-        }
-    }
-
-    override fun onStarted(inputFile: String) {
-        val task = assignedTask ?: return
-        taskManager.markTaskAsClaimed(task.referenceId, task.eventId, serviceId)
-        sendProgress(task.referenceId, task.eventId, WorkStatus.Started)
-    }
-
-    override fun onCompleted(inputFile: String, outputFile: String) {
-        val task = assignedTask ?: return
-        assert(task.data is ExtractArgumentData) { "Wrong data type found!" }
-        val taskData = task.data as ExtractArgumentData
-        log.info { "Extract completed for ${task.referenceId}" }
-        runBlocking {
-            var successfulComplete = false
-            limitedWhile({ !successfulComplete }, 1000 * 10, 1000) {
-                taskManager.markTaskAsCompleted(task.referenceId, task.eventId)
-                successfulComplete = taskManager.isTaskCompleted(task.referenceId, task.eventId)
-            }
-
-            tasks.onProduceEvent(
-                ExtractWorkPerformedEvent(
-                    metadata = EventMetadata(
-                        referenceId = task.referenceId,
-                        derivedFromEventId = task.eventId,
-                        status = EventStatus.Success,
-                        source = getProducerName()
-                    ),
-                    data = ExtractedData(
-                        language = taskData.language,
-                        outputFile = outputFile,
-                        storeFileName = taskData.storeFileName
-                    )
-                )
-            )
-            sendProgress(
-                task.referenceId, task.eventId, status = WorkStatus.Completed, FfmpegDecodedProgress(
-                    progress = 100,
-                    time = "",
-                    duration = "",
-                    speed = "0",
-                )
-            )
-            clearWorker()
-        }
-    }
-
-    override fun onError(inputFile: String, message: String) {
-        val task = assignedTask ?: return
-
-        taskManager.markTaskAsCompleted(task.referenceId, task.eventId, Status.ERROR, message)
-
-        log.error { "Extract failed for ${task.referenceId}\n$message" }
-        tasks.onProduceEvent(
-            ExtractWorkPerformedEvent(
-                metadata = EventMetadata(
-                    referenceId = task.referenceId,
-                    derivedFromEventId = task.eventId,
-                    status = EventStatus.Failed,
-                    source = getProducerName()
-                )
-            )
-        )
-        sendProgress(
-            task.referenceId, task.eventId, status = WorkStatus.Failed, progress = FfmpegDecodedProgress(
-                progress = 0,
-                time = "",
-                duration = "",
-                speed = "0",
-            )
-        )
-        clearWorker()
-    }
-
-    override fun onProgressChanged(inputFile: String, progress: FfmpegDecodedProgress) {
-        val task = assignedTask ?: return
-        sendProgress(task.referenceId, task.eventId, WorkStatus.Working, progress)
-    }
-
-
-    fun sendProgress(
-        referenceId: String,
-        eventId: String,
-        status: WorkStatus,
-        progress: FfmpegDecodedProgress? = null
-    ) {
-        val runner = runner ?: return
-
-        val processerEventInfo = ProcesserEventInfo(
-            referenceId = referenceId,
-            eventId = eventId,
-            status = status,
-            inputFile = runner.inputFile,
-            outputFiles = listOf(runner.outputFile),
-            progress = progress?.toProcessProgress()
-        )
-        try {
-            reporter.sendExtractProgress(processerEventInfo)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    override fun onCancelOrStopProcess(eventId: String) {
-        cancelWorkIfRunning(eventId)
-    }
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt
deleted file mode 100644
index fd3394b6..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-package no.iktdev.mediaprocessing.ui
-
-import no.iktdev.mediaprocessing.shared.common.Defaults
-import no.iktdev.mediaprocessing.shared.common.socket.SocketImplementation
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.boot.web.client.RestTemplateBuilder
-import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory
-import org.springframework.boot.web.server.WebServerFactoryCustomizer
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.core.io.Resource
-import org.springframework.messaging.converter.MappingJackson2MessageConverter
-import org.springframework.messaging.converter.StringMessageConverter
-import org.springframework.stereotype.Component
-import org.springframework.stereotype.Service
-import org.springframework.web.bind.annotation.RestController
-import org.springframework.web.client.RestTemplate
-import org.springframework.web.method.HandlerTypePredicate
-import org.springframework.web.servlet.config.annotation.*
-import org.springframework.web.servlet.resource.PathResourceResolver
-import org.springframework.web.socket.CloseStatus
-import org.springframework.web.socket.TextMessage
-import org.springframework.web.socket.WebSocketSession
-import org.springframework.web.socket.handler.TextWebSocketHandler
-import org.springframework.web.util.DefaultUriBuilderFactory
-import java.util.concurrent.ConcurrentHashMap
-
-
-@Configuration
-class WebConfig: WebMvcConfigurer {
-    override fun addCorsMappings(registry: CorsRegistry) {
-        registry.addMapping("/**")
-            .allowedOrigins("localhost", "*://localhost:3000", "localhost:80")
-            .allowCredentials(true)
-    }
-
-    override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
-
-        registry.addResourceHandler("/**")
-            .addResourceLocations("classpath:/static/")
-            .resourceChain(true)
-            .addResolver(object: PathResourceResolver() {
-                override fun getResource(resourcePath: String, location: Resource): Resource? {
-                    // Show index.html if no resource was found
-                    return if (!location.createRelative(resourcePath).exists() && !location.createRelative(resourcePath).isReadable) {
-                        location.createRelative("index.html");
-                    } else {
-                        location.createRelative(resourcePath);
-                    }
-                }
-            })
-
-    }
-
-    override fun configurePathMatch(configurer: PathMatchConfigurer) {
-        configurer.addPathPrefix("/api", HandlerTypePredicate.forAnnotation(RestController::class.java))
-    }
-
-
-    @Value("\${APP_DEPLOYMENT_PORT:8080}")
-    private val deploymentPort = 8080
-
-    @Bean
-    fun webServerFactoryCustomizer(): WebServerFactoryCustomizer<TomcatServletWebServerFactory>? {
-        return WebServerFactoryCustomizer { factory: TomcatServletWebServerFactory ->
-            factory.port = deploymentPort
-        }
-    }
-}
-
-@Configuration
-class ApiCommunicationConfig {
-
-    @Bean
-    fun coordinatorTemplate(builder: RestTemplateBuilder): RestTemplate {
-        try {
-            val url = UIEnv.coordinatorUrl
-            log.info { "CoordinatorUrl: $url" }
-            require(url.isNotBlank()) { "UIEnv.coordinatorUrl er ikke satt!" }
-            return builder
-                .uriTemplateHandler(DefaultUriBuilderFactory(url)) // Bruker den returnerte instansen
-                .build()
-
-        } catch (e: Exception) {
-            throw IllegalStateException("Feil ved opprettelse av coordinatorTemplate: ${e.message}", e)
-        }
-    }
-
-}
-
-
-@Configuration
-class SocketImplemented: SocketImplementation() {
-    override var additionalOrigins: List<String> = UIEnv.wsAllowedOrigins.split(",")
-}
-
-@Service
-class WebSocketMonitoringService() {
-    private val clients = ConcurrentHashMap.newKeySet<WebSocketSession>()
-    fun anyListening() = clients.isNotEmpty()
-
-    fun addClient(session: WebSocketSession) {
-        clients.add(session)
-    }
-    fun removeClient(session: WebSocketSession) {
-        clients.remove(session)
-    }
-}
-
-@Component
-class WebSocketHandler(private val webSocketPollingService: WebSocketMonitoringService) : TextWebSocketHandler() {
-
-    // Kalles når en WebSocket-klient kobler til
-    override fun afterConnectionEstablished(session: WebSocketSession) {
-        webSocketPollingService.addClient(session) // Legg til klienten i service
-    }
-
-    // Kalles når en WebSocket-klient kobler fra
-    override fun afterConnectionClosed(session: WebSocketSession, status: CloseStatus) {
-        webSocketPollingService.removeClient(session) // Fjern klienten fra service
-    }
-
-    // Håndterer meldinger fra WebSocket-klientene hvis nødvendig
-    override fun handleTextMessage(session: WebSocketSession, message: TextMessage) {
-        // Håndter meldinger fra klienten
-    }
-}
-
-@Configuration
-class DefaultConfiguration: Defaults()
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIApplication.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIApplication.kt
deleted file mode 100644
index 3b54ecd5..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIApplication.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package no.iktdev.mediaprocessing.ui
-
-
-import mu.KotlinLogging
-import no.iktdev.eventi.database.MySqlDataSource
-import no.iktdev.exfl.coroutines.CoroutinesDefault
-import no.iktdev.exfl.coroutines.CoroutinesIO
-import no.iktdev.exfl.observable.ObservableMap
-import no.iktdev.exfl.observable.Observables
-import no.iktdev.exfl.observable.observableMapOf
-import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig
-import no.iktdev.mediaprocessing.shared.common.SharedConfig
-import no.iktdev.mediaprocessing.shared.common.database.EventsDatabase
-import no.iktdev.mediaprocessing.shared.common.database.cal.EventsManager
-import no.iktdev.mediaprocessing.shared.common.database.cal.RunnerManager
-import no.iktdev.mediaprocessing.shared.common.database.cal.TasksManager
-import no.iktdev.mediaprocessing.shared.common.getAppVersion
-import no.iktdev.mediaprocessing.shared.common.toEventsDatabase
-import no.iktdev.mediaprocessing.ui.dto.explore.ExplorerItem
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.runApplication
-import org.springframework.context.ApplicationContext
-import org.springframework.context.annotation.Bean
-
-val log = KotlinLogging.logger {}
-lateinit var eventDatabase: EventsDatabase
-lateinit var eventsManager: EventsManager
-
-
-@SpringBootApplication
-class UIApplication {
-
-    @Bean
-    fun eventManager(): EventsManager {
-        return eventsManager
-    }
-}
-
-
-val ioCoroutine = CoroutinesIO()
-val defaultCoroutine = CoroutinesDefault()
-
-
-fun main(args: Array<String>) {
-
-
-    ioCoroutine.addListener(listener = object: Observables.ObservableValue.ValueListener<Throwable> {
-        override fun onUpdated(value: Throwable) {
-            value.printStackTrace()
-        }
-    })
-    defaultCoroutine.addListener(listener = object: Observables.ObservableValue.ValueListener<Throwable> {
-        override fun onUpdated(value: Throwable) {
-            value.printStackTrace()
-        }
-    })
-
-    eventDatabase = EventsDatabase().also {
-        eventsManager = EventsManager(it.database)
-    }
-
-
-    runApplication<UIApplication>(*args)
-    log.info { "App Version: ${getAppVersion()}" }
-}
-
-
-
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIEnv.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIEnv.kt
deleted file mode 100644
index 66e159b0..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIEnv.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package no.iktdev.mediaprocessing.ui
-
-import java.io.File
-
-object UIEnv {
-    val socketEncoder: String = System.getenv("EncoderWs")?.takeIf { it.isNotBlank() } ?: "ws://encoder:8080/ws"
-    val coordinatorUrl: String = System.getenv("Coordinator")?.takeIf { it.isNotBlank() } ?: "http://coordinator"
-    val wsAllowedOrigins: String = System.getenv("AllowedOriginsWebsocket")?.takeIf { it.isNotBlank() } ?: ""
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventChain.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventChain.kt
deleted file mode 100644
index 1c7b3f00..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventChain.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package no.iktdev.mediaprocessing.ui.dto
-
-data class EventHolder(
-    val referenceId: String,
-    val fileName: String?,
-    val events: List<EventChain>,
-    val created: Long
-)
-
-data class EventChain(
-    val eventId: String,
-    val eventName: String,
-    val created: Long,
-    val success: Boolean,
-    val failure: Boolean,
-    val skipped: Boolean,
-    val events: MutableList<EventChain> = mutableListOf()
-)
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventDataDto.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventDataDto.kt
deleted file mode 100644
index a50a7df3..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventDataDto.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package no.iktdev.mediaprocessing.ui.dto
-
-enum class SimpleEventDataState {
-    NA,
-    QUEUED,
-    STARTED,
-    ENDED,
-    FAILED
-}
-
-fun toSimpleEventDataStateFromStatus(state: String?): SimpleEventDataState {
-    return when(state) {
-        "QUEUED" -> SimpleEventDataState.QUEUED
-        "STARTED" -> SimpleEventDataState.STARTED
-        "UPDATED" -> SimpleEventDataState.STARTED
-        "FAILURE" -> SimpleEventDataState.FAILED
-        "ENDED" -> SimpleEventDataState.ENDED
-        else -> SimpleEventDataState.NA
-    }
-}
-
-data class SimpleEventDataObject(
-    val id: String,
-    val name: String?,
-    val path: String?,
-    val givenTitle: String? = null,
-    val givenSanitizedName: String? = null,
-    val givenCollection: String? = null,
-    val determinedType: String? = null,
-    val eventEncoded: SimpleEventDataState = SimpleEventDataState.NA,
-    val eventExtracted: SimpleEventDataState = SimpleEventDataState.NA,
-    val eventConverted: SimpleEventDataState = SimpleEventDataState.NA,
-    val eventCollected: SimpleEventDataState = SimpleEventDataState.NA,
-    var encodingProgress: Int? = null,
-    val encodingTimeLeft: Long? = null
-)
-
-
-data class EventDataObject(
-    val id: String,
-    var details: Details? = null,
-    var metadata: Metadata? = null,
-    var encode: Encode? = null,
-    var io: IO? = null,
-    var events: List<String> = emptyList()
-) {
-    fun toSimple() = SimpleEventDataObject(
-        id = id,
-        name = details?.name,
-        path = details?.file,
-        givenTitle = details?.title,
-        givenSanitizedName = details?.sanitizedName,
-        givenCollection = details?.collection,
-        determinedType = details?.type,
-        eventEncoded = toSimpleEventDataStateFromStatus(encode?.state),
-        encodingProgress = encode?.progress,
-        encodingTimeLeft = encode?.timeLeft
-    )
-}
-
-data class Details(
-    val name: String,
-    val file: String,
-    var title: String? = null,
-    val sanitizedName: String,
-    var collection: String? = null,
-    var type: String? = null
-)
-
-data class Metadata(
-    val source: String
-)
-
-interface ProcessableItem {
-    var state: String
-}
-
-data class IO(
-    val inputFile: String,
-    val outputFile: String
-)
-
-data class Encode(
-    override var state: String,
-    var progress: Int = 0,
-    var timeLeft: Long? = null
-) : ProcessableItem
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventSummary.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventSummary.kt
deleted file mode 100644
index 381bc576..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/EventSummary.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package no.iktdev.mediaprocessing.ui.dto
-
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class EventSummary(
-    val referenceId: String,
-    val baseName: String? = null,
-    val collection: String? = null,
-    val events: List<Events> = emptyList(),
-    val status: SummaryState = SummaryState.Started,
-    val activeEvens: Map<String, EventSummarySubItem>
-)
-
-data class EventSummarySubItem(
-    val eventId: String,
-    val status: SummaryState,
-    val progress: Int = 0
-)
-
-enum class SummaryState {
-    Completed,
-    AwaitingStore,
-    Working,
-    Pending,
-    AwaitingConfirmation,
-    Preparing,
-    Metadata,
-    Analyzing,
-    Read,
-    Started
-
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/explore/ExplorerAttr.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/explore/ExplorerAttr.kt
deleted file mode 100644
index c1527077..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/explore/ExplorerAttr.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package no.iktdev.mediaprocessing.ui.dto.explore
-
-interface ExplorerAttr {
-    val created: Long
-}
-
-data class ExplorerAttributes(
-    override val created: Long
-): ExplorerAttr
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/explore/ExplorerCursor.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/explore/ExplorerCursor.kt
deleted file mode 100644
index c1165ace..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/dto/explore/ExplorerCursor.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package no.iktdev.mediaprocessing.ui.dto.explore
-
-data class ExplorerCursor (
-    val name: String,
-    val path: String,
-    val items: List<ExplorerItem>,
-)
-enum class ExplorerItemType {
-    FILE,
-    FOLDER
-}
-
-data class ExplorerItem(
-    val name: String,
-    val path: String,
-    val extension: String? = null,
-    val created: Long,
-    val type: ExplorerItemType
-)
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/explorer/ExplorerCore.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/explorer/ExplorerCore.kt
deleted file mode 100644
index 99a7b017..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/explorer/ExplorerCore.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package no.iktdev.mediaprocessing.ui.explorer
-
-import no.iktdev.mediaprocessing.shared.common.SharedConfig
-import no.iktdev.mediaprocessing.ui.dto.explore.ExplorerAttributes
-import no.iktdev.mediaprocessing.ui.dto.explore.ExplorerCursor
-import no.iktdev.mediaprocessing.ui.dto.explore.ExplorerItem
-import no.iktdev.mediaprocessing.ui.dto.explore.ExplorerItemType
-import java.io.File
-import java.io.FileFilter
-import java.nio.file.Files
-import java.nio.file.attribute.BasicFileAttributeView
-
-class ExplorerCore {
-
-    fun getCursor(path: String): ExplorerCursor? {
-        val file = File(path)
-        if (!file.exists() || file.isFile) {
-            return null
-        }
-        return ExplorerCursor(
-            name = file.name,
-            path = file.absolutePath,
-            items = getFiles(file) + getFolders(file),
-        )
-    }
-
-    fun fromFile(file: File): ExplorerItem? {
-        if (!file.exists())
-            return null
-        val attr = getAttr(file)
-        return ExplorerItem(
-            path = file.absolutePath,
-            name = file.nameWithoutExtension,
-            extension = file.extension,
-            created = attr.created,
-            type = ExplorerItemType.FILE
-        )
-    }
-
-    private fun getFiles(inDirectory: File): List<ExplorerItem> {
-        return inDirectory.listFiles(FileFilter { it.isFile })?.map {
-            val attr = getAttr(it)
-            ExplorerItem(
-                path = it.absolutePath,
-                name = it.nameWithoutExtension,
-                extension = it.extension,
-                created = attr.created,
-                type = ExplorerItemType.FILE
-            )
-        } ?: emptyList()
-    }
-
-    private fun getFolders(inDirectory: File): List<ExplorerItem> {
-        return inDirectory.listFiles(FileFilter { it.isDirectory })?.map {
-            val attr = getAttr(it)
-            ExplorerItem(
-                name = it.name,
-                path = it.absolutePath,
-                created = attr.created,
-                type = ExplorerItemType.FOLDER
-            )
-        } ?: emptyList()
-    }
-
-    private fun getAttr(item: File): ExplorerAttributes {
-        val attrView = Files.getFileAttributeView(item.toPath(), BasicFileAttributeView::class.java).readAttributes()
-        return ExplorerAttributes(
-            created = attrView.creationTime().toMillis()
-        )
-    }
-
-    fun getHomeCursor(): ExplorerCursor? {
-        return getCursor(SharedConfig.inputRoot.absolutePath)
-    }
-
-    fun getRoots(): ExplorerCursor {
-        return ExplorerCursor(
-            name = "root",
-            path = "",
-            items = File.listRoots().map {
-                val attr = getAttr(it)
-                ExplorerItem(
-                    path = it.absolutePath,
-                    name = it.absolutePath,
-                    extension = it.extension,
-                    created = attr.created,
-                    type = ExplorerItemType.FOLDER
-                )
-            },
-        )
-    }
-
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/CompletedEventsService.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/CompletedEventsService.kt
deleted file mode 100644
index 83da335c..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/CompletedEventsService.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package no.iktdev.mediaprocessing.ui.service
-
-import no.iktdev.mediaprocessing.shared.common.database.cal.EventsManager
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.scheduling.annotation.EnableScheduling
-import org.springframework.stereotype.Service
-
-@Service
-@EnableScheduling
-class CompletedEventsService(
-    @Autowired eventsManager: EventsManager
-) {
-
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ChainedEventsTopic.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ChainedEventsTopic.kt
deleted file mode 100644
index 17a34e72..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ChainedEventsTopic.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package no.iktdev.mediaprocessing.ui.socket
-
-import no.iktdev.eventi.data.*
-import no.iktdev.eventi.database.toEpochSeconds
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.ui.dto.EventChain
-import no.iktdev.mediaprocessing.ui.dto.EventHolder
-import no.iktdev.mediaprocessing.ui.eventsManager
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.messaging.handler.annotation.MessageMapping
-import org.springframework.messaging.simp.SimpMessagingTemplate
-import org.springframework.stereotype.Controller
-import java.io.File
-
-@Controller
-class ChainedEventsTopic(
-    @Autowired private val template: SimpMessagingTemplate?,
-) {
-    @MessageMapping("/chained/all")
-    fun sendAllChainedEvents() {
-        val holders: MutableList<EventHolder> = mutableListOf()
-        eventsManager.getAllEvents().onEach { events ->
-            holders.add(EventHolder(
-                referenceId = events.first().referenceId(),
-                fileName = events.findFirstOf(Events.ProcessStarted)?.dataAs<StartEventData>()?.file?.let { File(it).name },
-                events = events.chained(),
-                created = events.chained().firstOrNull()?.created ?: 0
-            ))
-        }
-        template?.convertAndSend("/topic/chained/all", holders)
-    }
-
-
-    fun List<Event>.chained(): List<EventChain> {
-        val eventMap = this.associateBy { it.eventId() }
-        val chains = mutableMapOf<String, EventChain>()
-        val children = mutableSetOf<String>()
-
-        this.forEach { event ->
-            val eventId = event.metadata.eventId
-            val derivedFromEventId = event.metadata.derivedFromEventId
-            val created = event.metadata.created.toEpochSeconds() * 1000L
-            val chain = chains.getOrPut(eventId) {
-                EventChain(eventId, event.eventType.toString(), created, success = event.isSuccessful(), skipped = event.isSkipped(), failure = event.isFailed())
-            }
-
-            if (derivedFromEventId != null && eventMap.containsKey(derivedFromEventId)) {
-                val parentChain = chains.getOrPut(derivedFromEventId) {
-                    EventChain(derivedFromEventId, eventMap[derivedFromEventId]!!.eventType.toString(), created,  success = event.isSuccessful(), skipped = event.isSkipped(), failure = event.isFailed())
-                }
-                parentChain.events.add(chain)
-                children.add(eventId)
-            }
-        }
-
-        chains.values.forEach { chain -> chain.events.sortBy { it.created }}
-
-        return chains.values.filter { it.eventId !in children }
-            .sortedBy { it.created }
-    }
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ExplorerTopic.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ExplorerTopic.kt
deleted file mode 100644
index 1c56408f..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ExplorerTopic.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package no.iktdev.mediaprocessing.ui.socket
-
-import com.google.gson.Gson
-import mu.KotlinLogging
-import no.iktdev.mediaprocessing.shared.common.contract.dto.EventRequest
-import no.iktdev.mediaprocessing.ui.UIEnv
-import no.iktdev.mediaprocessing.ui.explorer.ExplorerCore
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.messaging.handler.annotation.MessageMapping
-import org.springframework.messaging.handler.annotation.Payload
-import org.springframework.messaging.simp.SimpMessagingTemplate
-import org.springframework.stereotype.Controller
-import org.springframework.web.client.RestTemplate
-
-val log = KotlinLogging.logger {}
-@Controller
-class ExplorerTopic(
-    @Autowired private val template: SimpMessagingTemplate?,
-    @Autowired private val coordinatorTemplate: RestTemplate,
-    val explorer: ExplorerCore = ExplorerCore()
-) {
-
-    @MessageMapping("/explorer/home")
-    fun goHome() {
-        explorer.getHomeCursor()?.let {
-            template?.convertAndSend("/topic/explorer/go", it)
-        }
-    }
-
-    @MessageMapping("/explorer/navigate")
-    fun navigateTo(@Payload path: String) {
-        val cursor = explorer.getCursor(path)
-        cursor?.let {
-            template?.convertAndSend("/topic/explorer/go", it)
-        }
-    }
-
-    @MessageMapping("/explorer/root")
-    fun goRoot() {
-        explorer.getRoots()?.let {
-            template?.convertAndSend("/topic/explorer/go", it)
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/FileRequestTopic.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/FileRequestTopic.kt
deleted file mode 100644
index bae80e7a..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/FileRequestTopic.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package no.iktdev.mediaprocessing.ui.socket
-
-import com.google.gson.Gson
-import mu.KotlinLogging
-import no.iktdev.mediaprocessing.shared.common.contract.dto.EventRequest
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.messaging.handler.annotation.MessageMapping
-import org.springframework.messaging.handler.annotation.Payload
-import org.springframework.messaging.simp.SimpMessagingTemplate
-import org.springframework.stereotype.Controller
-import org.springframework.web.client.RestTemplate
-
-@Controller
-class FileRequestTopic(
-    @Autowired private val template: SimpMessagingTemplate?,
-    @Autowired private val coordinatorTemplate: RestTemplate,
-) {
-    val log = KotlinLogging.logger {}
-
-    @MessageMapping("/request/encode")
-    fun requestEncode(@Payload data: EventRequest) {
-        val req = coordinatorTemplate.postForEntity("/request/encode", data, String::class.java)
-        log.info { req }
-    }
-
-    @MessageMapping("/request/extract")
-    fun requestExtract(@Payload data: EventRequest) {
-        val req = coordinatorTemplate.postForEntity("/request/extract", data, String::class.java)
-        log.info { req }
-    }
-
-    @MessageMapping("/request/convert")
-    fun requestConvert(@Payload data: EventRequest) {
-        val req = coordinatorTemplate.postForEntity("/request/convert", data, String::class.java)
-        log.info { req }
-    }
-
-    @MessageMapping("/request/all")
-    fun requestAllAvailableActions(@Payload data: EventRequest) {
-        log.info { "Sending data to coordinator: ${Gson().toJson(data)}" }
-        val req = coordinatorTemplate.postForEntity("/request/all", data, String::class.java)
-        log.info { req }
-    }
-
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ProcesserTasksTopic.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ProcesserTasksTopic.kt
deleted file mode 100644
index 1e295de3..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/ProcesserTasksTopic.kt
+++ /dev/null
@@ -1,166 +0,0 @@
-package no.iktdev.mediaprocessing.ui.socket
-
-import com.google.gson.Gson
-import no.iktdev.eventi.data.referenceId
-import no.iktdev.eventi.database.toEpochSeconds
-import no.iktdev.eventi.database.withDirtyRead
-import no.iktdev.eventi.database.withTransaction
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.ProcessType
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OperationEvents
-import no.iktdev.mediaprocessing.shared.common.contract.dto.ProcesserEventInfo
-import no.iktdev.mediaprocessing.shared.common.database.cal.toEvent
-import no.iktdev.mediaprocessing.shared.common.database.cal.toTask
-import no.iktdev.mediaprocessing.shared.common.database.tables.events
-import no.iktdev.mediaprocessing.shared.common.database.tables.tasks
-import no.iktdev.mediaprocessing.shared.common.task.Task
-import no.iktdev.mediaprocessing.shared.common.task.TaskType
-import no.iktdev.mediaprocessing.ui.WebSocketMonitoringService
-import no.iktdev.mediaprocessing.ui.eventDatabase
-import no.iktdev.mediaprocessing.ui.socket.a2a.ProcesserListenerService
-import org.jetbrains.exposed.sql.selectAll
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.messaging.handler.annotation.MessageMapping
-import org.springframework.messaging.simp.SimpMessagingTemplate
-import org.springframework.stereotype.Service
-import java.io.File
-
-@Service
-class ProcesserTasksTopic(
-    @Autowired a2AProcesserService: ProcesserListenerService,
-    @Autowired private val webSocketMonitoringService: WebSocketMonitoringService,
-    @Autowired private val message: SimpMessagingTemplate?,
-): SocketListener(message) {
-
-    private var referenceIds: List<String> = emptyList()
-
-    final val a2a = object : ProcesserListenerService.A2AProcesserListener {
-        override fun onExtractProgress(info: ProcesserEventInfo) {
-            if (referenceIds.none { it == info.referenceId }) {
-                updateTopicWithTasks()
-            }
-            log.info { "Forwarding extract progress ${Gson().toJson(info)}" }
-            message?.convertAndSend("/topic/processer/extract/progress", info)
-        }
-
-        override fun onEncodeProgress(info: ProcesserEventInfo) {
-            if (referenceIds.none { it == info.referenceId }) {
-                updateTopicWithTasks()
-            }
-            log.info { "Forwarding encode progress ${Gson().toJson(info)}" }
-            message?.convertAndSend("/topic/processer/encode/progress", info)
-        }
-
-        override fun onEncodeAssigned(task: Task) {
-            if (referenceIds.none { it == task.referenceId }) {
-                updateTopicWithTasks()
-            }
-        }
-
-        override fun onExtractAssigned(task: Task) {
-            if (referenceIds.none { it == task.referenceId }) {
-                updateTopicWithTasks()
-            }
-        }
-    }
-
-    init {
-        a2AProcesserService.attachListener(a2a)
-    }
-
-    enum class Status {
-        Skipped,
-        Awaiting, // Waiting for tasks to be created
-        NeedsApproval,
-        Pending,
-        InProgress,
-        Completed,
-        Failed,
-    }
-
-    data class ContentEventState(
-        val referenceId: String,
-        val title: String,
-        val encode: Status = Status.Skipped,
-        val extract: Status = Status.Skipped,
-        val convert: Status = Status.Skipped,
-        val created: Long
-    ) {}
-
-
-    @MessageMapping("/tasks/all")
-    fun updateTopicWithTasks() {
-        val states = update()
-        template?.convertAndSend("/topic/tasks/all", states)
-    }
-
-    fun getOperationState(tasks: List<Task>, hasOperation: Boolean, canStart: Boolean): Status {
-        if (!hasOperation) return Status.Skipped
-        if (tasks.isEmpty()) return Status.Awaiting
-
-        if (!canStart) return Status.NeedsApproval
-
-        if (tasks.any { it.consumed }) {
-            return Status.Completed
-        }
-        if (tasks.any { it.claimed }) {
-            return Status.InProgress
-        }
-        if (tasks.any{ it.status == "ERROR"}) {
-            return Status.Failed
-        }
-        return Status.Pending
-
-    }
-
-
-    fun update(): MutableList<ContentEventState> {
-        val eventStates: MutableList<ContentEventState> = mutableListOf()
-
-        val tasks = pullAllTasks()
-        val availableEvents = pullAllEvents().also {
-            referenceIds = it.keys.toList()
-        }
-
-        for ((referenceId, events) in availableEvents) {
-            val startEvent = events.findFirstEventOf<MediaProcessStartEvent>() ?: continue
-            val startData = startEvent.data ?: continue
-            val title = events.findFirstEventOf<BaseInfoEvent>()?.data?.sanitizedName ?: startData.file.let { File(it).nameWithoutExtension }
-            val canStart = if (startData.type == ProcessType.FLOW) true else {
-                events.findEventsOf<PermitWorkCreationEvent>().isNotEmpty()
-            }
-            val tasksCreated = tasks[referenceId]
-            val encode = tasksCreated?.filter { it.task == TaskType.Encode } ?: emptyList()
-            val extract = tasksCreated?.filter { it.task == TaskType.Extract } ?: emptyList()
-            val convert = tasksCreated?.filter { it.task == TaskType.Convert } ?: emptyList()
-
-            eventStates.add(ContentEventState(
-                title = title,
-                referenceId = referenceId,
-                encode = getOperationState(encode, startData.operations.contains(OperationEvents.ENCODE), canStart),
-                extract = getOperationState(extract, startData.operations.contains(OperationEvents.EXTRACT), canStart),
-                convert = getOperationState(convert, startData.operations.contains(OperationEvents.CONVERT), canStart),
-                created = startEvent.metadata.created.toEpochSeconds() * 1000L
-            ))
-        }
-        return eventStates
-    }
-
-    fun pullAllTasks(): Map<String, List<Task>> {
-        val result = withTransaction(eventDatabase.database) {
-            tasks.selectAll().toTask()
-                .groupBy { it.referenceId }
-        } ?: emptyMap()
-        return result
-    }
-
-    fun pullAllEvents(): Map<String, List<Event>> {
-        val result = withDirtyRead(eventDatabase.database) {
-            events.selectAll().toEvent()
-                .groupBy { it.referenceId() }
-        } ?: emptyMap()
-        return result
-    }
-
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketClient.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketClient.kt
deleted file mode 100644
index 6f81b1e5..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketClient.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-package no.iktdev.mediaprocessing.ui.socket
-
-import mu.KotlinLogging
-import org.springframework.messaging.simp.stomp.StompCommand
-import org.springframework.messaging.simp.stomp.StompHeaders
-import org.springframework.messaging.simp.stomp.StompSession
-import org.springframework.messaging.simp.stomp.StompSessionHandlerAdapter
-import org.springframework.web.socket.client.standard.StandardWebSocketClient
-import org.springframework.web.socket.messaging.WebSocketStompClient
-import java.util.concurrent.Executors
-import java.util.concurrent.ScheduledFuture
-import java.util.concurrent.TimeUnit
-
-class SocketClient(private val url: String, val listener: SocketEvents? = null) {
-    private val logger = KotlinLogging.logger {}
-
-    private val client = WebSocketStompClient(StandardWebSocketClient())
-    private val subscriptions: MutableList<SocketSubscription> = mutableListOf()
-    private var session: StompSession? = null
-    private val scheduler = Executors.newSingleThreadScheduledExecutor()
-    private var reconnectFuture: ScheduledFuture<*>? = null
-
-
-
-    fun subscribe(topic: String, handler: StompSessionHandlerAdapter) {
-        subscriptions.add(SocketSubscription(topic, handler))
-        session?.subscribe(topic, handler)
-    }
-
-
-    private fun reconnect() {
-        if (reconnectFuture != null && !reconnectFuture!!.isDone) return // Allerede reconnecting
-
-        reconnectFuture?.cancel(true) // Kansellerer tidligere reconnect-task hvis den kjører
-
-        logger.info { "Scheduling reconnect in 30 seconds" }
-
-        reconnectFuture = scheduler.scheduleWithFixedDelay({
-            try {
-                logger.info { "Attempting to reconnect... $url" }
-                listener?.onReconnecting()
-                connect()
-            } catch (e: Exception) {
-                logger.error(e) { "Reconnect attempt failed" }
-            }
-        }, 5, 30, TimeUnit.SECONDS) // Starter etter 5 sekunder, med 30 sekunders intervall
-    }
-
-    private fun resetReconnector() {
-        reconnectFuture?.cancel(true)
-        reconnectFuture = null
-    }
-
-    fun disconnect() {
-        if (!scheduler.isShutdown) {
-            try {
-                reconnectFuture?.cancel(true)
-                scheduler.shutdownNow()
-            } catch (e: Exception) {}
-        }
-        session?.disconnect()
-        listener?.onDisconnected()
-    }
-
-    private val connectAdapter = object: StompSessionHandlerAdapter() {
-        override fun afterConnected(session: StompSession, connectedHeaders: StompHeaders) {
-            super.afterConnected(session, connectedHeaders)
-            resetReconnector()
-            listener?.onConnected()
-            subscriptions.forEach {
-                session.subscribe(it.destination, it.handler)
-            }
-        }
-
-        override fun handleTransportError(session: StompSession, exception: Throwable) {
-            super.handleTransportError(session, exception)
-            listener?.onException(exception)
-            this@SocketClient.session = null
-            reconnect()
-        }
-
-        override fun handleException(
-            session: StompSession,
-            command: StompCommand?,
-            headers: StompHeaders,
-            payload: ByteArray,
-            exception: Throwable
-        ) {
-            super.handleException(session, command, headers, payload, exception)
-            listener?.onException(exception)
-        }
-    }
-
-    fun connect() {
-        client.connect(url, connectAdapter)
-    }
-
-    interface SocketEvents {
-        fun onConnected(): Unit {}
-        fun onReconnecting(): Unit {}
-        fun onDisconnected(): Unit {}
-        fun onException(e: Throwable) {}
-    }
-    data class SocketSubscription(
-        val destination: String,
-        val handler: StompSessionHandlerAdapter
-    )
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketListener.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketListener.kt
deleted file mode 100644
index 532421f9..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketListener.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.mediaprocessing.ui.socket
-
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.messaging.simp.SimpMessagingTemplate
-import org.springframework.stereotype.Controller
-
-@Controller
-class SocketListener(
-    @Autowired protected val template: SimpMessagingTemplate?,
-) {
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketMessageHandler.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketMessageHandler.kt
deleted file mode 100644
index 556684da..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/SocketMessageHandler.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package no.iktdev.mediaprocessing.ui.socket
-
-import org.springframework.messaging.simp.stomp.StompHeaders
-import org.springframework.messaging.simp.stomp.StompSessionHandlerAdapter
-import java.lang.reflect.Type
-
-open class SocketMessageHandler: StompSessionHandlerAdapter() {
-    override fun getPayloadType(headers: StompHeaders): Type {
-        return ByteArray::class.java
-    }
-
-    override fun handleFrame(headers: StompHeaders, payload: Any?) {
-        super.handleFrame(headers, payload)
-        if (payload is ByteArray) {
-            onMessage(String(payload))
-        } else if (payload is String) {
-            onMessage(payload)
-        }
-    }
-
-    open fun onMessage(socketMessage: String) {
-    }
-}
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/UnprocessedFilesTopic.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/UnprocessedFilesTopic.kt
deleted file mode 100644
index c8f3591e..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/UnprocessedFilesTopic.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-package no.iktdev.mediaprocessing.ui.socket
-
-import no.iktdev.eventi.database.withTransaction
-import no.iktdev.exfl.observable.ObservableList
-import no.iktdev.mediaprocessing.shared.common.contract.data.MediaProcessStartEvent
-import no.iktdev.mediaprocessing.shared.common.contract.data.az
-import no.iktdev.mediaprocessing.shared.common.contract.jsonToEvent
-import no.iktdev.mediaprocessing.shared.common.database.tables.events
-import no.iktdev.mediaprocessing.shared.common.database.tables.files
-import no.iktdev.mediaprocessing.shared.common.database.tables.filesProcessed
-import no.iktdev.mediaprocessing.ui.WebSocketMonitoringService
-import no.iktdev.mediaprocessing.ui.eventDatabase
-import no.iktdev.mediaprocessing.ui.socket.UnprocessedFilesTopic.DatabaseData.filesInProcess
-import no.iktdev.mediaprocessing.ui.socket.UnprocessedFilesTopic.DatabaseData.pullUnprocessedFiles
-import no.iktdev.mediaprocessing.ui.socket.UnprocessedFilesTopic.DatabaseData.unprocessedFiles
-import no.iktdev.mediaprocessing.ui.socket.UnprocessedFilesTopic.DatabaseData.update
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.selectAll
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.messaging.handler.annotation.MessageMapping
-import org.springframework.messaging.simp.SimpMessagingTemplate
-import org.springframework.scheduling.annotation.EnableScheduling
-import org.springframework.scheduling.annotation.Scheduled
-import org.springframework.stereotype.Controller
-import org.springframework.web.client.RestTemplate
-import org.springframework.web.socket.WebSocketSession
-import java.util.concurrent.ConcurrentHashMap
-
-@Controller
-@EnableScheduling
-class UnprocessedFilesTopic(
-    @Autowired private val template: SimpMessagingTemplate?,
-    @Autowired private val coordinatorTemplate: RestTemplate,
-    @Autowired private val webSocketMonitoringService: WebSocketMonitoringService
-) {
-
-
-    object DatabaseData {
-        private const val PULL_MIN_INTERVAL = 10_000 // 10 sekunder
-        private var lastPoll: Long = 0
-        var unprocessedFiles: List<FileInfo> = emptyList()
-            private set
-        var filesInProcess: List<FileInfo> = emptyList()
-            private set
-
-        // Funksjon som oppdaterer dataen hvis det har gått mer enn PULL_MIN_INTERVAL siden forrige oppdatering
-        fun update() {
-            val currentTime = System.currentTimeMillis()
-
-            // Sjekk om det har gått mer enn 10 sekunder (10000 ms) siden siste oppdatering
-            if (currentTime - lastPoll >= PULL_MIN_INTERVAL) {
-                // Oppdater tidspunktet for siste poll
-                lastPoll = currentTime
-
-                // Oppdater dataene ved å hente nye verdier
-                val filesNotCompleted = pullUnprocessedFiles()
-                filesInProcess = pullUncompletedFiles()
-                unprocessedFiles = filesNotCompleted.filter { u -> !filesInProcess.any { p -> p.checksum == u.checksum } }
-
-
-            }
-        }
-
-        private fun pullUnprocessedFiles(): List<FileInfo> = withTransaction(eventDatabase.database) {
-            val found = files.select {
-                files.checksum notInSubQuery filesProcessed.slice(filesProcessed.checksum).selectAll()
-            }.mapNotNull {
-                FileInfo(
-                    it[files.baseName],
-                    it[files.fileName],
-                    it[files.checksum],
-                )
-            }
-            unprocessedFiles = found
-            found//.filter { File(it.fileName).exists() }
-        } ?: emptyList()
-
-        private fun pullUncompletedFiles(): List<FileInfo> = withTransaction(eventDatabase.database) {
-            val eventStartedFiles = events.select {
-                events.event eq "ProcessStarted"
-            }.mapNotNull { it[events.data].jsonToEvent(it[events.event]) }
-                .mapNotNull { it.az<MediaProcessStartEvent>() }
-                .mapNotNull { it.data?.file }
-            unprocessedFiles.filter { it.fileName in eventStartedFiles }.also {
-                filesInProcess = it
-            }
-        } ?: emptyList()
-    }
-
-    data class UnprocessedFiles(
-        val available: List<FileInfo>,
-        val inProcess: List<FileInfo>
-    )
-
-    @MessageMapping("/files/unprocessed")
-    fun postUnProcessedFiles() {
-        update()
-        template?.convertAndSend("/topic/files/unprocessed", UnprocessedFiles(
-            available = unprocessedFiles,
-            inProcess = filesInProcess
-        ))
-    }
-}
-
-data class FileInfo(
-    val name: String,
-    val fileName: String,
-    val checksum: String
-)
\ No newline at end of file
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/a2a/ProcesserListenerService.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/a2a/ProcesserListenerService.kt
deleted file mode 100644
index 77bbb4c5..00000000
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/a2a/ProcesserListenerService.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-package no.iktdev.mediaprocessing.ui.socket.a2a
-
-import com.google.gson.Gson
-import mu.KotlinLogging
-import no.iktdev.mediaprocessing.shared.common.contract.dto.ProcesserEventInfo
-import no.iktdev.mediaprocessing.shared.common.task.Task
-import no.iktdev.mediaprocessing.ui.UIEnv
-import no.iktdev.mediaprocessing.ui.WebSocketMonitoringService
-import no.iktdev.mediaprocessing.ui.log
-import no.iktdev.mediaprocessing.ui.socket.SocketClient
-import no.iktdev.mediaprocessing.ui.socket.SocketMessageHandler
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.messaging.simp.SimpMessagingTemplate
-import org.springframework.stereotype.Service
-
-@Service
-class ProcesserListenerService(
-    @Autowired private val webSocketMonitoringService: WebSocketMonitoringService,
-) {
-    private val logger = KotlinLogging.logger {}
-    private val listeners: MutableList<A2AProcesserListener> = mutableListOf()
-
-    private var socketClient: SocketClient? = null
-
-    fun attachListener(listener: A2AProcesserListener) {
-        listeners.add(listener)
-    }
-
-    val gson = Gson()
-
-    private final val socketEvent = object : SocketClient.SocketEvents {
-        override fun onConnected() {
-            super.onConnected()
-            log.info { "EncoderWsUrl: ${UIEnv.socketEncoder}" }
-            logger.info { "Tilkoblet processer" }
-
-            socketClient?.subscribe("/topic/encode/progress", encodeProcessMessage)
-            socketClient?.subscribe("/topic/extract/progress", extractProcessFrameHandler)
-            socketClient?.subscribe("/topic/encode/assigned", encodeTaskAssignedMessage)
-            socketClient?.subscribe("/topic/extract/assigned", extractTaskAssignedMessage)
-        }
-    }
-
-    init {
-        SocketClient(UIEnv.socketEncoder, socketEvent).also {
-            it.connect()
-            this.socketClient = it
-        }
-    }
-
-    private val encodeTaskAssignedMessage = object: SocketMessageHandler() {
-        override fun onMessage(socketMessage: String) {
-            super.onMessage(socketMessage)
-            val response = gson.fromJson(socketMessage, Task::class.java)
-            listeners.forEach { listener ->
-                run {
-                    listener.onEncodeAssigned(response)
-                }
-            }
-        }
-    }
-
-    private val extractTaskAssignedMessage = object: SocketMessageHandler() {
-        override fun onMessage(socketMessage: String) {
-            super.onMessage(socketMessage)
-            val response = gson.fromJson(socketMessage, Task::class.java)
-            listeners.forEach { listener ->
-                run {
-                    listener.onExtractAssigned(response)
-                }
-            }
-        }
-    }
-
-
-    private val encodeProcessMessage = object : SocketMessageHandler() {
-        override fun onMessage(socketMessage: String) {
-            super.onMessage(socketMessage)
-            val response = gson.fromJson(socketMessage, ProcesserEventInfo::class.java)
-            listeners.forEach { listener ->
-                run {
-                    listener.onEncodeProgress(response)
-                }
-            }
-        }
-    }
-
-
-    private val extractProcessFrameHandler = object : SocketMessageHandler() {
-        override fun onMessage(socketMessage: String) {
-            super.onMessage(socketMessage)
-            if (webSocketMonitoringService.anyListening()) {
-            }
-            val response = gson.fromJson(socketMessage, ProcesserEventInfo::class.java)
-            listeners.forEach { listener ->
-                run {
-                    listener.onEncodeProgress(response)
-                }
-            }
-        }
-    }
-
-    interface A2AProcesserListener {
-        fun onExtractProgress(info: ProcesserEventInfo)
-        fun onEncodeProgress(info: ProcesserEventInfo)
-        fun onEncodeAssigned(task: Task)
-        fun onExtractAssigned(task: Task)
-    }
-
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/Defaults.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/Defaults.kt
deleted file mode 100644
index 1c372095..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/Defaults.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common
-
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.web.client.RestTemplate
-
-@Configuration
-open class Defaults {
-
-    @Bean
-    open fun restTemplate(): RestTemplate {
-        val restTemplate = RestTemplate()
-        return restTemplate
-    }
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/DownloadClient.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/DownloadClient.kt
deleted file mode 100644
index 4f704150..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/DownloadClient.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import mu.KotlinLogging
-import no.iktdev.exfl.using
-import java.io.File
-import java.io.FileOutputStream
-import java.net.HttpURLConnection
-import java.net.URL
-
-open class DownloadClient(val url: String, val outDir: File, val baseName: String) {
-    val log = KotlinLogging.logger {}
-    protected val http: HttpURLConnection = openConnection()
-    private val BUFFER_SIZE = 4096
-
-    private fun openConnection(): HttpURLConnection {
-        try {
-            return URL(url).openConnection() as HttpURLConnection
-        } catch (e: Exception) {
-            e.printStackTrace()
-            throw BadAddressException("Provided url is either not provided (null) or is not a valid http url")
-        }
-    }
-
-    protected fun getLength(): Int {
-        return http.contentLength
-    }
-
-    protected fun getProgress(read: Int, total: Int = getLength()): Int {
-        return ((read * 100) / total)
-    }
-
-    suspend fun getOutFile(): File? = withContext(Dispatchers.IO) {
-        val extension = getExtension()
-            ?: throw UnsupportedFormatException("Provided url does not contain a supported file extension")
-        val outFile = outDir.using("$baseName.$extension")
-        if (!outDir.exists()) {
-            log.error { "Unable to create parent folder for ${outFile.name}. Download skipped!" }
-            return@withContext null
-        }
-        return@withContext outFile
-    }
-
-    suspend fun download(outFile: File): File? = withContext(Dispatchers.IO) {
-        if (outFile.exists()) {
-            log.info { "${outFile.name} already exists. Download skipped!" }
-            return@withContext null
-        }
-
-        val inputStream = http.inputStream
-        val fos = FileOutputStream(outFile, false)
-
-        var totalBytesRead = 0
-        val buffer = ByteArray(BUFFER_SIZE)
-        inputStream.apply {
-            fos.use { fout ->
-                run {
-                    var bytesRead = read(buffer)
-                    while (bytesRead >= 0) {
-                        fout.write(buffer, 0, bytesRead)
-                        totalBytesRead += bytesRead
-                        bytesRead = read(buffer)
-                        // System.out.println(getProgress(totalBytesRead))
-                    }
-                }
-            }
-        }
-        inputStream.close()
-        fos.close()
-        return@withContext outFile
-    }
-
-    open fun getExtension(): String? {
-        val possiblyExtension = url.lastIndexOf(".") + 1
-        return if (possiblyExtension > 1) {
-            return url.toString().substring(possiblyExtension)
-        } else {
-            val mimeType = http.contentType ?: null
-            contentTypeToExtension()[mimeType]
-        }
-    }
-
-    open fun contentTypeToExtension(): Map<String, String> {
-        return mapOf(
-            "image/png" to "png",
-            "image/jpeg" to "jpg",
-            "image/webp" to "webp",
-            "image/bmp" to "bmp",
-            "image/tiff" to "tiff"
-        )
-    }
-
-
-    class BadAddressException : java.lang.Exception {
-        constructor() : super() {}
-        constructor(message: String?) : super(message) {}
-        constructor(message: String?, cause: Throwable?) : super(message, cause) {}
-    }
-
-    class UnsupportedFormatException : Exception {
-        constructor() : super() {}
-        constructor(message: String?) : super(message) {}
-        constructor(message: String?, cause: Throwable?) : super(message, cause) {}
-    }
-
-    class InvalidFileException : Exception {
-        constructor() : super() {}
-        constructor(message: String?) : super(message) {}
-        constructor(message: String?, cause: Throwable?) : super(message, cause) {}
-    }
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/LogHelper.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/LogHelper.kt
deleted file mode 100644
index a573494a..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/LogHelper.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common
-
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-
-data class LogKey(
-    val referenceId: String,
-    val listener: String,
-    val eventType: String
-)
-
-object EventDeadlockDetector {
-
-    private val stuckEvents = ConcurrentHashMap<LogKey, Int>()
-    private val suppressedEvents = ConcurrentHashMap<LogKey, Boolean>()
-    private val threshold = 5 // Antall ganger før det anses som deadlock
-    private val resetInterval = 10L // Reset telling hvert 10. sekund
-
-    init {
-        Executors.newScheduledThreadPool(1).scheduleAtFixedRate({
-            stuckEvents.clear()
-        }, resetInterval, resetInterval, TimeUnit.SECONDS)
-    }
-
-    fun detect(referenceId: String, listener: String, eventType: String): Boolean {
-        val key = LogKey(referenceId, listener, eventType)
-
-        if (suppressedEvents[key] == true) {
-            return false
-        }
-
-        val count = stuckEvents.merge(key, 1) { old, _ -> old + 1 } ?: 1
-
-        if (count > threshold) {
-            suppressedEvents[key] = true
-            onDeadlockDetected(key)
-            return false
-        }
-
-        return true
-    }
-
-    fun resolve(referenceId: String, listener: String, eventType: String) {
-        val key = LogKey(referenceId, listener, eventType)
-        stuckEvents.remove(key)
-        suppressedEvents.remove(key)
-    }
-
-    private fun onDeadlockDetected(key: LogKey) {
-        println("🚨 Deadlock detected! ReferenceId=${key.referenceId}, Listener=${key.listener}, EventType=${key.eventType}")
-        // Her kan du f.eks. sende et varsel, restarte prosess, etc.
-    }
-}
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/Preference.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/Preference.kt
deleted file mode 100644
index 6eb02106..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/Preference.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common
-
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import mu.KotlinLogging
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.PreferenceDto
-
-private val log = KotlinLogging.logger {}
-class Preference {
-
-    companion object {
-        private var prevPreference: PreferenceDto? = null
-        fun getPreference(): PreferenceDto {
-            val preference = readOrDefaultPreference()
-            if (preference != prevPreference) {
-                log.info { "[Audio]: Codec = " + preference.encodePreference.audio.codec }
-                log.info { "[Audio]: Language = " + preference.encodePreference.audio.language }
-                log.info { "[Audio]: Channels = " + preference.encodePreference.audio.channels }
-                log.info { "[Audio]: Sample rate = " + preference.encodePreference.audio.sample_rate }
-                log.info { "[Audio]: Use EAC3 for surround = " + preference.encodePreference.audio.convertToEac3OnUnsupportedSurround }
-
-                log.info { "[Video]: Codec = " + preference.encodePreference.video.codec }
-                log.info { "[Video]: Pixel format = " + preference.encodePreference.video.pixelFormat }
-                log.info { "[Video]: Pixel format pass-through = " + preference.encodePreference.video.pixelFormatPassthrough.joinToString(", ")  }
-                log.info { "[Video]: Threshold = " + preference.encodePreference.video.threshold }
-            }
-            return preference.also { prevPreference = it }
-        }
-
-        private fun readOrDefaultPreference(): PreferenceDto {
-            val preference = readPreferenceFromFile() ?: PreferenceDto()
-            return preference
-        }
-
-
-        private fun readPreferenceFromFile(): PreferenceDto? {
-            val prefFile = SharedConfig.preference
-            if (!prefFile.exists()) {
-                log.info("Preference file: ${prefFile.absolutePath} does not exists...")
-                log.info("Using default configuration")
-                silentTry {
-                    val gson = GsonBuilder().setPrettyPrinting().create()
-                    SharedConfig.preference.printWriter().use { out ->
-                        out.print(gson.toJson(PreferenceDto()))
-                    }
-                }
-                return null
-            }
-            else {
-                log.info("Preference file: ${prefFile.absolutePath} found")
-            }
-
-            return try {
-                val instr = prefFile.inputStream()
-                val text = instr.bufferedReader().use { it.readText() }
-                Gson().fromJson(text, PreferenceDto::class.java)
-            }
-            catch (e: Exception) {
-                log.error("Failed to read preference file: ${prefFile.absolutePath}.. Will use default configuration")
-                null
-            }
-        }
-    }
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/SharedConfig.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/SharedConfig.kt
deleted file mode 100644
index 902dfb3c..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/SharedConfig.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common
-
-import no.iktdev.eventi.database.DatabaseConnectionConfig
-import no.iktdev.eventi.database.MySqlDataSource
-import java.io.File
-
-object SharedConfig {
-    var inputRoot: File = if (!System.getenv("INPUT_ROOT").isNullOrBlank()) File(System.getenv("INPUT_ROOT")) else File("/src/input")
-    var incomingContent: List<File> = if (!System.getenv("DIRECTORY_CONTENT_INCOMING").isNullOrBlank()) {
-        System.getenv("DIRECTORY_CONTENT_INCOMING").split(",")
-            .map { File(it) }
-    } else listOf(File("/src/input"))
-    var cachedContent: File = if (!System.getenv("DIRECTORY_CONTENT_CACHE").isNullOrBlank()) File(System.getenv("DIRECTORY_CONTENT_CACHE")) else File("/src/cache")
-    val outgoingContent: File = if (!System.getenv("DIRECTORY_CONTENT_OUTGOING").isNullOrBlank()) File(System.getenv("DIRECTORY_CONTENT_OUTGOING")) else File("/src/output")
-
-    val ffprobe: String = System.getenv("SUPPORTING_EXECUTABLE_FFPROBE") ?: "ffprobe"
-    val ffmpeg: String = System.getenv("SUPPORTING_EXECUTABLE_FFMPEG") ?: "ffmpeg"
-    val uiUrl: String = System.getenv("APP_URL_UI") ?: "http://ui:8080"
-
-    val preference: File = File("/data/config/preference.json")
-    val verbose: Boolean = System.getenv("VERBOSE")?.let { it.toBoolean() } ?: false
-}
-
-object DatabaseEnvConfig {
-    val address: String? = System.getenv("DATABASE_ADDRESS")
-    val port: String? = System.getenv("DATABASE_PORT")
-    val username: String? = System.getenv("DATABASE_USERNAME")
-    val password: String? = System.getenv("DATABASE_PASSWORD")
-    val eventBasedDatabase: String? = System.getenv("DATABASE_NAME_E")
-    val storedDatabase: String? = System.getenv("DATABASE_NAME_S")
-}
-
-fun DatabaseEnvConfig.toStoredDatabase(): MySqlDataSource {
-    val config = DatabaseConnectionConfig(
-        databaseName = this.storedDatabase ?: "streamit",
-        address = this.address ?: "localhost",
-        port = this.port,
-        username = this.username ?: "root",
-        password = this.password ?: ""
-    )
-    return MySqlDataSource(config)
-}
-
-fun DatabaseEnvConfig.toEventsDatabase(): MySqlDataSource {
-    val config = DatabaseConnectionConfig(
-        databaseName = this.eventBasedDatabase ?: "persistentEvents",
-        address = this.address ?: "localhost",
-        port = this.port,
-        username = this.username ?: "root",
-        password = this.password ?: ""
-    )
-    return MySqlDataSource(config)
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/TaskCoordinatorBase.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/TaskCoordinatorBase.kt
deleted file mode 100644
index ad6ca7e2..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/TaskCoordinatorBase.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common
-
-import mu.KotlinLogging
-import no.iktdev.mediaprocessing.shared.common.database.cal.ActiveMode
-import no.iktdev.mediaprocessing.shared.common.task.Task
-import no.iktdev.mediaprocessing.shared.common.task.TaskType
-import no.iktdev.mediaprocessing.shared.common.contract.data.Event
-import org.springframework.scheduling.annotation.EnableScheduling
-import org.springframework.scheduling.annotation.Scheduled
-import javax.annotation.PostConstruct
-
-@EnableScheduling
-abstract class TaskCoordinatorBase() {
-    private val log = KotlinLogging.logger {}
-    var taskMode: ActiveMode = ActiveMode.Active
-    var isEnabled: Boolean = true
-    private var ready: Boolean = false
-    fun isReady() = ready
-
-    abstract fun onProduceEvent(event: Event)
-
-
-    abstract val taskAvailabilityEventListener: MutableMap<TaskType, MutableList<TaskQueueListener>>
-
-    open fun addTaskListener(type: TaskType, listener: TaskQueueListener) {
-        val listeners = taskAvailabilityEventListener[type] ?: mutableListOf<TaskQueueListener>().also { it ->
-            taskAvailabilityEventListener[type] = it
-        }
-        listeners.add(listener)
-    }
-
-
-    open fun onCoordinatorReady() {
-        ready = true
-    }
-
-    @PostConstruct
-    fun onInitializationCompleted() {
-        onCoordinatorReady()
-        pullAvailable()
-    }
-
-    abstract fun pullForAvailableTasks()
-
-    @Scheduled(fixedDelay = (5_000))
-    fun pullAvailable() {
-        if (taskMode != ActiveMode.Active || !isEnabled) {
-            return
-        }
-        pullForAvailableTasks()
-    }
-
-    abstract fun clearExpiredClaims()
-
-    abstract fun getEnabledState(): Boolean
-
-    @Scheduled(fixedDelay = 10_000)
-    fun pullEnabledState() {
-        val prevState = isEnabled
-        isEnabled = getEnabledState()
-        if (prevState != isEnabled) {
-            log.info { "State changed for coordinator: $prevState -> $isEnabled" }
-            if (isEnabled) {
-                log.info { "New tasks will now be processed" }
-            }
-        }
-    }
-
-    @Scheduled(fixedDelay = (300_000))
-    fun resetExpiredClaims() {
-        if (taskMode != ActiveMode.Active) {
-            return
-        }
-        clearExpiredClaims()
-    }
-}
-
-
-
-class ClaimableTask(private var task: Task) {
-    var isConsumed: Boolean = false
-        private set
-    fun consume(): Task? {
-        return if (!isConsumed) {
-            isConsumed = true
-            task
-        } else null
-    }
-}
-
-interface TaskQueueListener {
-    fun onTaskAvailable(data: ClaimableTask)
-}
-
-fun Map<TaskType, List<Task>>.asClaimable(): Map<TaskType, List<ClaimableTask>> {
-    return this.mapValues { v -> v.value.map { ClaimableTask(it) } }
-}
-
-fun List<ClaimableTask>.foreachOrUntilClaimed(block: (task: ClaimableTask) -> Unit) {
-    this.forEach {
-        if (!it.isConsumed) {
-            block(it)
-        }
-    }
-}
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/Events.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/Events.kt
deleted file mode 100644
index 12670315..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/Events.kt
+++ /dev/null
@@ -1,146 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract
-
-import com.google.gson.*
-import mu.KotlinLogging
-import no.iktdev.eventi.core.LocalDateTimeAdapter
-import no.iktdev.mediaprocessing.shared.common.contract.data.*
-import java.lang.reflect.Type
-import java.time.LocalDateTime
-
-private val log = KotlinLogging.logger {}
-
-
-enum class Events {
-    ProcessStarted,
-    StreamRead,
-    StreamParsed,
-    BaseInfoRead,
-    MetadataSearchPerformed,
-    ReadOutNameAndType,
-    ReadOutCover,
-    EncodeParameterCreated,
-    ExtractParameterCreated,
-    WorkProceedPermitted,
-    EncodeTaskCreated,
-    ExtractTaskCreated,
-    ConvertTaskCreated,
-    EncodeTaskCompleted,
-    ExtractTaskCompleted,
-    ConvertTaskCompleted,
-    CoverDownloaded,
-    PersistContent,
-    ProcessCompleted,
-    Unknown
-    ;
-
-    companion object {
-        fun toEvent(event: String): Events {
-            return Events.entries.find { it.name == event } ?: Unknown
-        }
-    }
-}
-
-fun Events.toEventClass(): Class<out Event> {
-    return when (this) {
-        Events.ProcessStarted -> MediaProcessStartEvent::class.java
-
-        Events.StreamRead -> MediaFileStreamsReadEvent::class.java
-        Events.StreamParsed -> MediaFileStreamsParsedEvent::class.java
-        Events.BaseInfoRead -> BaseInfoEvent::class.java
-        Events.MetadataSearchPerformed -> MediaMetadataReceivedEvent::class.java
-        Events.ReadOutNameAndType -> MediaOutInformationConstructedEvent::class.java
-        Events.ReadOutCover -> MediaCoverInfoReceivedEvent::class.java
-
-        Events.EncodeParameterCreated -> EncodeArgumentCreatedEvent::class.java
-        Events.ExtractParameterCreated -> ExtractArgumentCreatedEvent::class.java
-
-        Events.WorkProceedPermitted -> PermitWorkCreationEvent::class.java
-
-        Events.EncodeTaskCreated -> EncodeWorkCreatedEvent::class.java
-        Events.ExtractTaskCreated -> ExtractWorkCreatedEvent::class.java
-        Events.ConvertTaskCreated -> ConvertWorkCreatedEvent::class.java
-
-        Events.EncodeTaskCompleted -> EncodeWorkPerformedEvent::class.java
-        Events.ExtractTaskCompleted -> ExtractWorkPerformedEvent::class.java
-        Events.ConvertTaskCompleted -> ConvertWorkPerformed::class.java
-        Events.CoverDownloaded -> MediaCoverDownloadedEvent::class.java
-
-        Events.PersistContent -> PersistedContentEvent::class.java
-        Events.ProcessCompleted -> MediaProcessCompletedEvent::class.java
-        else -> UnknownEvent::class.java
-    }
-}
-
-fun String.jsonToEvent(eventType: String): Event {
-    val event = Events.toEvent(eventType)
-    return EventJson.fromJson(this, event)
-
-    /*val clazz = Events.toEvent(eventType)?.toEventClass()
-    clazz.let { eventClass ->
-        try {
-            val type = TypeToken.getParameterized(eventClass).type
-            return WGson.gson.fromJson(this, type)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-    try {
-        // Fallback
-        val type = object : TypeToken<Event>() {}.type
-        return WGson.gson.fromJson(this, type)
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-
-    // Default
-    val type = object : TypeToken<Event>() {}.type
-    log.error { "Failed to convert event: $eventType and data: $this to proper type!" }
-    return WGson.gson.fromJson(this, type)*/
-}
-
-object EventJson {
-    private val gson = GsonBuilder()
-        .registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
-        .create()
-
-    fun fromJson(json: String, event: Events): Event {
-        val gson = GsonBuilder()
-            .registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
-            .registerTypeAdapter(Event::class.java, EventDeserializer(event))
-            .create()
-        return gson.fromJson(json, Event::class.java)
-    }
-
-    fun toJson(data: Any?): String {
-        return gson.toJson(data)
-    }
-
-    class EventDeserializer(private val eventType: Events) : JsonDeserializer<Event> {
-        override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Event {
-            // 🔥 Finn riktig klasse basert på eventType (som kommer eksternt fra databasen)
-            val eventClass = eventType.toEventClass()
-
-            if (eventType == Events.Unknown || eventClass.simpleName == Event::class.java.simpleName) {
-                val fallbackGson = GsonBuilder()
-                    .registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
-                    .create()
-
-                return fallbackGson.fromJson(json, eventClass)
-            }
-            // Deserialiser objektet til riktig klasse
-            val event = context.deserialize<Event>(json, eventClass)
-
-            // 🔥 Sett eventType eksplisitt etter deserialisering
-            if (event is Event) {
-                event::class.java.getDeclaredField("eventType").apply {
-                    isAccessible = true
-                    set(event, eventType)
-                }
-            }
-
-            return event
-        }
-    }
-
-
-}
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsListenerContract.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsListenerContract.kt
deleted file mode 100644
index a87a5768..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsListenerContract.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract
-
-import no.iktdev.eventi.implementations.EventCoordinator
-import no.iktdev.eventi.implementations.EventListenerImpl
-import no.iktdev.mediaprocessing.shared.common.contract.data.Event
-
-abstract class EventsListenerContract<E: EventsManagerContract, C: EventCoordinator<Event, E>>: EventListenerImpl<Event, E>() {
-    abstract override val produceEvent: Events
-    abstract override val listensForEvents: List<Events>
-    abstract override val coordinator: C?
-}
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsManagerContract.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsManagerContract.kt
deleted file mode 100644
index c66ce5a2..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsManagerContract.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract
-
-import no.iktdev.eventi.implementations.EventsManagerImpl
-import no.iktdev.eventi.database.DataSource
-import no.iktdev.mediaprocessing.shared.common.contract.data.Event
-
-abstract class EventsManagerContract(dataSource: DataSource) : EventsManagerImpl<Event>(dataSource) {
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsUtil.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsUtil.kt
deleted file mode 100644
index e227de34..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/EventsUtil.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract
-
-import mu.KotlinLogging
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.isSuccessful
-import no.iktdev.mediaprocessing.shared.common.contract.data.Event
-
-private val log = KotlinLogging.logger {}
-
-
-fun List<EventImpl>.lastOrSuccess(): EventImpl? {
-    return this.lastOrNull { it.isSuccessful() } ?: this.lastOrNull()
-}
-
-fun List<EventImpl>.lastOrSuccessOf(event: no.iktdev.mediaprocessing.shared.common.contract.Events): EventImpl? {
-    val validEvents = this.filter { it.eventType == event }
-    return validEvents.lastOrNull { it.isSuccessful() } ?: validEvents.lastOrNull()
-}
-
-fun List<EventImpl>.lastOrSuccessOf(event: no.iktdev.mediaprocessing.shared.common.contract.Events, predicate: (EventImpl) -> Boolean): EventImpl? {
-    val validEvents = this.filter { it.eventType == event && predicate(it) }
-    return validEvents.lastOrNull()
-}
-
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ProcessType.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ProcessType.kt
deleted file mode 100644
index 1d5e38fb..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ProcessType.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract
-
-enum class ProcessType {
-    FLOW,
-    MANUAL
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/BaseInfoEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/BaseInfoEvent.kt
deleted file mode 100644
index de41ee47..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/BaseInfoEvent.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class BaseInfoEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.BaseInfoRead,
-    override val data: BaseInfo? = null
-) : Event()
-
-data class BaseInfo(
-    val title: String,
-    val sanitizedName: String,
-    val searchTitles: List<String> = emptyList<String>(),
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ConvertWorkCreatedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ConvertWorkCreatedEvent.kt
deleted file mode 100644
index 5408d680..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ConvertWorkCreatedEvent.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.dto.SubtitleFormats
-import no.iktdev.mediaprocessing.shared.common.contract.dto.tasks.TaskData
-
-data class ConvertWorkCreatedEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.ConvertTaskCreated,
-    override val data: ConvertData? = null
-) : Event() {
-}
-
-data class ConvertData(
-    override val inputFile: String,
-    val language: String,
-    val outputDirectory: String,
-    val outputFileName: String,
-    val storeFileName: String,
-    val formats: List<SubtitleFormats> = emptyList(),
-    val allowOverwrite: Boolean
-): TaskData()
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ConvertWorkPerformed.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ConvertWorkPerformed.kt
deleted file mode 100644
index d4c771b5..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ConvertWorkPerformed.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-class ConvertWorkPerformed(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.ConvertTaskCompleted,
-    override val data: ConvertedData? = null,
-    val message: String? = null
-) : Event() {
-}
-
-data class ConvertedData(
-    val language: String,
-    val baseName: String,
-    val outputFiles: List<String>
-)
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeArgumentCreatedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeArgumentCreatedEvent.kt
deleted file mode 100644
index f5d34d87..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeArgumentCreatedEvent.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.dto.tasks.TaskData
-
-data class EncodeArgumentCreatedEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.EncodeParameterCreated,
-    override val data: EncodeArgumentData? = null
-) : Event() {
-
-}
-
-data class EncodeArgumentData(
-    val arguments: List<String>,
-    val outputFileName: String,
-    override val inputFile: String
-): TaskData()
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeWorkCreatedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeWorkCreatedEvent.kt
deleted file mode 100644
index e05b2eb6..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeWorkCreatedEvent.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class EncodeWorkCreatedEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.EncodeTaskCreated,
-    override val data: EncodeArgumentData? = null
-) : Event()
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeWorkPerformedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeWorkPerformedEvent.kt
deleted file mode 100644
index 7ddb7bda..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/EncodeWorkPerformedEvent.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class EncodeWorkPerformedEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.EncodeTaskCompleted,
-    override val data: EncodedData? = null,
-    val message: String? = null
-) : Event() {
-}
-
-data class EncodedData(
-    val outputFile: String
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/Event.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/Event.kt
deleted file mode 100644
index 112a3870..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/Event.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-abstract class Event: EventImpl() {
-    abstract override val eventType: Events
-}
-
-data class UnknownEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.Unknown,
-    override val data: Any? = null,
-): Event() {
-}
-
-inline fun <reified T: Event> Event.az(): T? {
-    return if (this !is T) {
-        System.err.println("${this::class.java.name} is not a type of ${T::class.java.name}")
-        null
-    } else this
-}
-
-inline fun <reified T: Event> List<Event>.findFirstEventOf(): T? {
-    val first = this.firstOrNull { it is T }
-    return if (first != null) {
-        first as T
-    } else null
-}
-
-fun Event.isOfEvent(eventType: Events): Boolean {
-    return this.eventType == eventType
-}
-
-inline fun <reified T: Event> List<Event>.findEventOf(): T? {
-    return this.filterIsInstance<T>().firstOrNull()
-}
-
-inline fun List<Event>.findFirstOf(events: Events): Event? {
-    return this.firstOrNull { it.eventType == events }
-}
-
-inline fun <reified T: Event> List<Event>.findEventsOf(): List<T> {
-    return this.filterIsInstance<T>().map { it }
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractArgumentCreatedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractArgumentCreatedEvent.kt
deleted file mode 100644
index afb45707..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractArgumentCreatedEvent.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.dto.tasks.TaskData
-
-data class ExtractArgumentCreatedEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.ExtractParameterCreated,
-    override val data: List<ExtractArgumentData>? = null
-
-): Event()
-
-data class ExtractArgumentData(
-    val arguments: List<String>,
-    val language: String,
-    val storeFileName: String,
-    val outputFileName: String,
-    override val inputFile: String
-): TaskData()
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractWorkCreatedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractWorkCreatedEvent.kt
deleted file mode 100644
index dc73045f..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractWorkCreatedEvent.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class ExtractWorkCreatedEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.ExtractTaskCreated,
-    override val data: ExtractArgumentData? = null
-) : Event() {
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractWorkPerformedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractWorkPerformedEvent.kt
deleted file mode 100644
index de0c3454..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/ExtractWorkPerformedEvent.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class ExtractWorkPerformedEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.ExtractTaskCompleted,
-    override val data: ExtractedData? = null,
-    val message: String? = null
-) : Event() {
-}
-
-data class ExtractedData(
-    val language: String,
-    val storeFileName: String,
-    val outputFile: String
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaCoverDownloadedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaCoverDownloadedEvent.kt
deleted file mode 100644
index f39fee3e..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaCoverDownloadedEvent.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class MediaCoverDownloadedEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.CoverDownloaded,
-    override val data: DownloadedCover? = null
-) : Event() {
-}
-
-data class DownloadedCover(
-    val absoluteFilePath: String
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaCoverInfoReceivedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaCoverInfoReceivedEvent.kt
deleted file mode 100644
index 2f5230ed..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaCoverInfoReceivedEvent.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class MediaCoverInfoReceivedEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.ReadOutCover,
-    override val data: CoverDetails? = null
-) : Event() {
-}
-
-data class CoverDetails(
-    val url: String,
-    val outFileBaseName: String,
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaFileStreamsParsedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaFileStreamsParsedEvent.kt
deleted file mode 100644
index 8583de0e..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaFileStreamsParsedEvent.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.ffmpeg.ParsedMediaStreams
-
-class MediaFileStreamsParsedEvent(
-    override val metadata: EventMetadata,
-    override val data: ParsedMediaStreams? = null,
-    override val eventType: Events = Events.StreamParsed
-
-) : Event()
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaFileStreamsReadEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaFileStreamsReadEvent.kt
deleted file mode 100644
index 518e3242..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaFileStreamsReadEvent.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import com.google.gson.JsonObject
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-class MediaFileStreamsReadEvent(
-    override val metadata: EventMetadata,
-    override val data: JsonObject? = null,
-    override val eventType: Events = Events.StreamRead
-) : Event()
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaMetadataReceivedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaMetadataReceivedEvent.kt
deleted file mode 100644
index 4ea8218c..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaMetadataReceivedEvent.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class MediaMetadataReceivedEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.MetadataSearchPerformed,
-    override val data: pyMetadata? = null,
-    ): Event() {
-}
-
-data class pyMetadata(
-    val title: String,
-    val altTitle: List<String> = emptyList(),
-    val cover: String? = null,
-    val type: String,
-    val summary: List<pySummary> = emptyList(),
-    val genres: List<String> = emptyList()
-)
-
-data class pySummary(
-    val summary: String?,
-    val language: String = "eng"
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaOutInformationConstructedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaOutInformationConstructedEvent.kt
deleted file mode 100644
index a7d857ea..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaOutInformationConstructedEvent.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import com.google.gson.Gson
-import com.google.gson.JsonObject
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class MediaOutInformationConstructedEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.ReadOutNameAndType,
-    override val data: MediaInfoReceived? = null
-) : Event() {
-}
-
-data class MediaInfoReceived(
-    val info: JsonObject,
-) {
-    fun toValueObject(): MediaInfo? {
-        val type = info.get("type").asString
-        return when (type) {
-            "movie" -> Gson().fromJson(info.toString(), MovieInfo::class.java)
-            "serie" -> Gson().fromJson(info.toString(), EpisodeInfo::class.java)
-            else -> null
-        }
-    }
-}
-
-
-data class EpisodeInfo(
-    override val type: String = "serie",
-    override val title: String,
-    val episode: Int,
-    val season: Int,
-    val episodeTitle: String?,
-    override val fullName: String
-): MediaInfo(type, title, fullName)
-
-data class MovieInfo(
-    override val type: String = "movie",
-    override val title: String,
-    override val fullName: String
-) : MediaInfo(type, title, fullName)
-
-data class SubtitleInfo(
-    val inputFile: String,
-    val collection: String,
-    val language: String
-)
-
-open class MediaInfo(
-    @Transient open val type: String,
-    @Transient open val title: String,
-    @Transient open val fullName: String
-) {
-    fun toJsonObject(): JsonObject {
-        return Gson().toJsonTree(this).asJsonObject
-    }
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaProcessCompletedEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaProcessCompletedEvent.kt
deleted file mode 100644
index cc965e47..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaProcessCompletedEvent.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.reader.SummaryInfo
-
-data class MediaProcessCompletedEvent(
-    override val metadata: EventMetadata,
-    override val data: CompletedData?,
-    override val eventType: Events = Events.ProcessCompleted
-): Event()
-
-data class CompletedData(
-    val eventIdsCollected: List<String>,
-    val metadataStored: MetadataStored
-)
-
-data class MetadataStored(
-    val title: String,
-    val titles: List<String>,
-    val type: String,
-    val cover: String? = null,
-    val collection: String,
-    val summary: List<SummaryInfo> = emptyList(),
-    val foundTitles: List<String>,
-    val genres: List<String>,
-    val genreIds: String? = null
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaProcessStartEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaProcessStartEvent.kt
deleted file mode 100644
index 76f0a047..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/MediaProcessStartEvent.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.ProcessType
-import no.iktdev.mediaprocessing.shared.common.contract.dto.OperationEvents
-
-data class MediaProcessStartEvent(
-    override val metadata: EventMetadata,
-    override val data: StartEventData?,
-    override val eventType: Events = Events.ProcessStarted
-): Event()
-
-data class StartEventData(
-    val type: ProcessType = ProcessType.FLOW,
-    val operations: List<OperationEvents> = listOf(
-        OperationEvents.ENCODE,
-        OperationEvents.EXTRACT,
-        OperationEvents.CONVERT
-    ),
-    val file: String // AbsolutePath
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/PermitWorkCreationEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/PermitWorkCreationEvent.kt
deleted file mode 100644
index c184e7d3..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/PermitWorkCreationEvent.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class PermitWorkCreationEvent(
-    override val metadata: EventMetadata,
-    override val eventType: Events = Events.WorkProceedPermitted,
-    override val data: String?
-) : Event() {
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/PersistedContentEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/PersistedContentEvent.kt
deleted file mode 100644
index e8479bf2..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/data/PersistedContentEvent.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.data
-
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-
-data class PersistedContentEvent(
-    override val eventType: Events = Events.PersistContent,
-    override val metadata: EventMetadata,
-    override val data: PersistedContent?
-
-): Event() {}
-
-data class PersistedContent(
-    val cover: PersistedItem?,
-    val video: PersistedItem?,
-    val subtitles: List<PersistedItem>
-)
-
-data class PersistedItem(
-    val cacheSourceFileName: String,
-    val storeDestinationFileName: String
-)
-
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Enums.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Enums.kt
deleted file mode 100644
index 35b6df57..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Enums.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.dto
-
-enum class WorkStatus {
-    Pending,
-    Started,
-    Working,
-    Completed,
-    Failed
-}
-
-
-enum class SubtitleFormats {
-    ASS,
-    SRT,
-    VTT,
-    SMI
-}
-
-enum class OperationEvents {
-    ENCODE,
-    EXTRACT,
-    CONVERT
-}
-
-fun List<OperationEvents>.isOnly(expected: OperationEvents): Boolean {
-    return this.size == 1 && this.all { it == expected }
-}
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/EventRequest.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/EventRequest.kt
deleted file mode 100644
index cfb1a5ce..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/EventRequest.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.dto
-
-import no.iktdev.mediaprocessing.shared.common.contract.ProcessType
-
-data class EventRequest(
-    val file: String, // FullPath
-    override val source: String,
-    val mode: ProcessType = ProcessType.MANUAL
-): Requester()
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/EventSummary.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/EventSummary.kt
deleted file mode 100644
index 584bba32..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/EventSummary.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.dto
-
-data class EventSummary(
-    val operationsSummary: OperationsSummary,
-    val inputFile: String,
-    val inputFileChecksum: String,
-    val outputFiles: OutputFiles
-)
-
-
-data class OperationsSummary(
-    val requestedOperations: List<OperationEvents>,
-    val completedOperations: List<OperationEvents>,
-)
-
-data class OutputFiles(
-    val encoded: List<String>,
-    val extracted: List<String>,
-    val converted: List<String>
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/ProcesserEventInfo.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/ProcesserEventInfo.kt
deleted file mode 100644
index 7253caf6..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/ProcesserEventInfo.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.dto
-
-data class ProcesserEventInfo(
-    val referenceId: String,
-    val eventId: String,
-    val status: WorkStatus = WorkStatus.Pending,
-    val progress: ProcesserProgress? = null,
-    val inputFile: String,
-    val outputFiles: List<String>
-)
-
-data class ProcesserProgress(
-    val progress: Int = -1,
-    val speed: String? = null,
-    val timeWorkedOn: String? = null,
-    val timeLeft: String? = "Unknown", // HH mm
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/RequestWorkProceed.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/RequestWorkProceed.kt
deleted file mode 100644
index af847b60..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/RequestWorkProceed.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.dto
-
-data class RequestWorkProceed(
-    val referenceId: String,
-    override val source: String
-): Requester()
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Requester.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Requester.kt
deleted file mode 100644
index 96ae25f2..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Requester.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.dto
-
-abstract class Requester {
-    open val source: String = "Unset"
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/tasks/TaskData.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/tasks/TaskData.kt
deleted file mode 100644
index 7f6566f2..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/tasks/TaskData.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.dto.tasks
-
-import java.io.Serializable
-
-abstract class TaskData(): Serializable {
-    abstract val inputFile: String
-
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/AudioArgumentsDto.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/AudioArgumentsDto.kt
deleted file mode 100644
index 662280e6..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/AudioArgumentsDto.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.ffmpeg
-
-data class AudioArgumentsDto(
-    val index: Int,
-    val codecParameters: List<String> = listOf("-acodec", "copy"),
-    val optionalParameters: List<String> = listOf()
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/MediaStreams.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/MediaStreams.kt
deleted file mode 100644
index 80ee082e..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/MediaStreams.kt
+++ /dev/null
@@ -1,191 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.ffmpeg
-
-data class ParsedMediaStreams(
-    val videoStream: List<VideoStream> = listOf(),
-    val audioStream: List<AudioStream> = listOf(),
-    val subtitleStream: List<SubtitleStream> = listOf()
-)
-
-data class MediaStreams(
-    val streams: List<Stream>
-)
-
-sealed class Stream(
-    @Transient open val index: Int,
-    @Transient open val codec_name: String,
-    @Transient open val codec_long_name: String,
-    @Transient open val codec_type: String,
-    @Transient open val codec_tag_string: String,
-    @Transient open val codec_tag: String,
-    @Transient open val r_frame_rate: String,
-    @Transient open val avg_frame_rate: String,
-    @Transient open val time_base: String,
-    @Transient open val start_pts: Long,
-    @Transient open val start_time: String,
-    @Transient open val duration_ts: Long? = null,
-    @Transient open val duration: String? = null,
-    @Transient open val disposition: Disposition? = null,
-    @Transient open val tags: Tags
-)
-
-data class VideoStream(
-    override val index: Int,
-    override val codec_name: String,
-    override val codec_long_name: String,
-    override val codec_type: String,
-    override val codec_tag_string: String,
-    override val codec_tag: String,
-    override val r_frame_rate: String,
-    override val avg_frame_rate: String,
-    override val time_base: String,
-    override val start_pts: Long,
-    override val start_time: String,
-    override val disposition: Disposition,
-    override val tags: Tags,
-    override val duration: String?,
-    override val duration_ts: Long?,
-    val profile: String,
-    val width: Int,
-    val height: Int,
-    val coded_width: Int,
-    val coded_height: Int,
-    val closed_captions: Int,
-    val has_b_frames: Int,
-    val sample_aspect_ratio: String,
-    val display_aspect_ratio: String,
-    val pix_fmt: String,
-    val level: Int,
-    val color_range: String,
-    val color_space: String,
-    val color_transfer: String,
-    val color_primaries: String,
-    val chroma_location: String,
-    val refs: Int
-) : Stream(
-    index,
-    codec_name,
-    codec_long_name,
-    codec_type,
-    codec_tag_string,
-    codec_tag,
-    r_frame_rate,
-    avg_frame_rate,
-    time_base,
-    start_pts,
-    start_time,
-    duration_ts,
-    duration,
-    disposition,
-    tags
-)
-
-data class AudioStream(
-    override val index: Int,
-    override val codec_name: String,
-    override val codec_long_name: String,
-    override val codec_type: String,
-    override val codec_tag_string: String,
-    override val codec_tag: String,
-    override val r_frame_rate: String,
-    override val avg_frame_rate: String,
-    override val time_base: String,
-    override val start_pts: Long,
-    override val start_time: String,
-    override val duration: String?,
-    override val duration_ts: Long?,
-    override val disposition: Disposition,
-    override val tags: Tags,
-    val profile: String,
-    val sample_fmt: String,
-    val sample_rate: String,
-    val channels: Int,
-    val channel_layout: String,
-    val bits_per_sample: Int
-) : Stream(
-    index,
-    codec_name,
-    codec_long_name,
-    codec_type,
-    codec_tag_string,
-    codec_tag,
-    r_frame_rate,
-    avg_frame_rate,
-    time_base,
-    start_pts,
-    start_time,
-    duration_ts,
-    duration,
-    disposition,
-    tags
-)
-
-data class SubtitleStream(
-    override val index: Int,
-    override val codec_name: String,
-    override val codec_long_name: String,
-    override val codec_type: String,
-    override val codec_tag_string: String,
-    override val codec_tag: String,
-    override val r_frame_rate: String,
-    override val avg_frame_rate: String,
-    override val time_base: String,
-    override val start_pts: Long,
-    override val start_time: String,
-    override val duration: String?,
-    override val duration_ts: Long?,
-    override val disposition: Disposition? = null,
-    override val tags: Tags,
-    val subtitle_tags: SubtitleTags
-) : Stream(
-    index,
-    codec_name,
-    codec_long_name,
-    codec_type,
-    codec_tag_string,
-    codec_tag,
-    r_frame_rate,
-    avg_frame_rate,
-    time_base,
-    start_pts,
-    start_time,
-    duration_ts,
-    duration,
-    disposition,
-    tags
-)
-
-data class Disposition(
-    val default: Int,
-    val dub: Int,
-    val original: Int,
-    val comment: Int,
-    val lyrics: Int,
-    val karaoke: Int,
-    val forced: Int,
-    val hearing_impaired: Int,
-    val captions: Int,
-    val visual_impaired: Int,
-    val clean_effects: Int,
-    val attached_pic: Int,
-    val timed_thumbnails: Int
-)
-
-data class Tags(
-    val title: String?,
-    val BPS: String?,
-    val DURATION: String?,
-    val NUMBER_OF_FRAMES: Int? = 0,
-    val NUMBER_OF_BYTES: String?,
-    val _STATISTICS_WRITING_APP: String?,
-    val _STATISTICS_WRITING_DATE_UTC: String?,
-    val _STATISTICS_TAGS: String?,
-    val language: String?,
-    val filename: String?,
-    val mimetype: String?
-)
-
-data class SubtitleTags(
-    val language: String?,
-    val filename: String?,
-    val mimetype: String?
-)
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/PreferenceDto.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/PreferenceDto.kt
deleted file mode 100644
index 75bbe23b..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/PreferenceDto.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.ffmpeg
-
-data class PreferenceDto(
-    val encodePreference: EncodingPreference = EncodingPreference(video = VideoPreference(), audio = AudioPreference()),
-    val convertPreference: ConvertPreference = ConvertPreference()
-)
-
-
-data class EncodingPreference(
-    val video: VideoPreference,
-    val audio: AudioPreference
-)
-
-enum class SubtitleTypes {
-    SRT,
-    VTT,
-    SMI
-}
-
-data class ConvertPreference(
-    val cleanup: Boolean = true,
-    val merge: Boolean = false,
-    val subtitleTypes: List<SubtitleTypes> = listOf(
-        SubtitleTypes.SRT, SubtitleTypes.VTT, SubtitleTypes.SMI
-    )
-)
-
-data class VideoPreference(
-    val codec: String = "h264",
-    val pixelFormat: String = "yuv420p",
-    val pixelFormatPassthrough: List<String> = listOf<String>("yuv420p", "yuv420p10le"),
-    val threshold: Int = 16,
-    val useAnnexB: Boolean = false,
-    val reencodeOnIncorrectMetadataForChromecast: Boolean = false,
-    val h264Level: Double = 4.2
-)
-
-data class AudioPreference(
-    val codec: String = "aac",
-    val sample_rate: Int? = null,
-    val channels: Int? = null,
-    val language: String = "eng", //ISO3 format
-    val preserveChannels: Boolean = true,
-    val passthroughOnGenerallySupportedSurroundSound: Boolean = true,
-    val convertToEac3OnUnsupportedSurround: Boolean = true,
-    val forceStereo: Boolean = false
-)
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/SubtitleArgumentsDto.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/SubtitleArgumentsDto.kt
deleted file mode 100644
index 45e2a140..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/SubtitleArgumentsDto.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.ffmpeg
-
-data class SubtitleArgumentsDto(
-    val mediaIndex: Int,
-    val index: Int,
-    val language: String,
-    val format: String, // Extension as well
-    val codecParameters: List<String> = listOf("-c:s", "copy"),
-    val optionalParameters: List<String> = listOf()
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/VideoAndAudioDto.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/VideoAndAudioDto.kt
deleted file mode 100644
index 3c8f4c12..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/VideoAndAudioDto.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.ffmpeg
-
-
-data class VideoAndAudioDto(
-    val video: VideoArgumentsDto,
-    val audio: AudioArgumentsDto,
-    val outFile: String // Absolute path to file
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/VideoArgumentsDto.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/VideoArgumentsDto.kt
deleted file mode 100644
index 1e5b9354..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/ffmpeg/VideoArgumentsDto.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.ffmpeg
-
-data class VideoArgumentsDto(
-    val index: Int,
-    val codecParameters: List<String> = listOf("-vcodec", "copy"),
-    val optionalParameters: List<String> = listOf()
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/MetadataDto.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/MetadataDto.kt
deleted file mode 100644
index 67dddc19..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/MetadataDto.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.reader
-
-data class MetadataDto(
-    val title: String,
-    val collection: String,
-    val type: String,
-    val cover: String?,
-    val summary: List<SummaryInfo> = emptyList(),
-    val genres: List<String>,
-    val titles: List<String> = emptyList()
-)
-
-data class SummaryInfo(
-    val summary: String,
-    val language: String = "eng"
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/SubtitlesDto.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/SubtitlesDto.kt
deleted file mode 100644
index d9659050..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/SubtitlesDto.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.reader
-
-data class SubtitlesDto(
-    val collection: String,
-    val language: String,
-    val subtitleFile: String,
-    val format: String,
-    val associatedWithVideo: String
-)
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/VideoDetails.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/VideoDetails.kt
deleted file mode 100644
index 7d41b6b0..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/reader/VideoDetails.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.contract.reader
-
-data class VideoDetails(
-    val serieInfo: SerieInfo? = null,
-    val type: String,
-    val fileName: String
-)
-
-data class SerieInfo(
-    val episodeTitle: String? = null,
-    val episodeNumber: Int,
-    val seasonNumber: Int,
-    val title: String
-)
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/EventsDatabase.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/EventsDatabase.kt
deleted file mode 100644
index 6a9b1193..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/EventsDatabase.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.database
-
-import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig
-import no.iktdev.mediaprocessing.shared.common.database.tables.allEvents
-import no.iktdev.mediaprocessing.shared.common.database.tables.events
-import no.iktdev.mediaprocessing.shared.common.database.tables.runners
-import no.iktdev.mediaprocessing.shared.common.database.tables.tasks
-import no.iktdev.mediaprocessing.shared.common.toEventsDatabase
-
-class EventsDatabase() {
-    val database = DatabaseEnvConfig.toEventsDatabase()
-    val tables = listOf(
-        events, // For kafka
-        allEvents,
-        tasks,
-        runners
-    )
-
-    init {
-        database.createDatabase()
-        database.createTables(*tables.toTypedArray())
-    }
-
-
-}
\ No newline at end of file
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
deleted file mode 100644
index 5d3a0adf..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/EventsManager.kt
+++ /dev/null
@@ -1,187 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.database.cal
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.PersistentMessageHelper
-import no.iktdev.eventi.data.eventId
-import no.iktdev.eventi.data.referenceId
-import no.iktdev.eventi.data.toJson
-import no.iktdev.eventi.database.DataSource
-import no.iktdev.eventi.database.isCausedByDuplicateError
-import no.iktdev.eventi.database.isExposedSqlException
-import no.iktdev.eventi.database.withDirtyRead
-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.jsonToEvent
-import org.jetbrains.exposed.exceptions.ExposedSQLException
-import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-
-class EventsManager(dataSource: DataSource) : EventsManagerContract(dataSource) {
-    val log = KotlinLogging.logger {}
-
-    override fun storeEvent(event: Event): Boolean {
-
-        no.iktdev.eventi.database.withTransaction(dataSource.database) {
-            allEvents.insert {
-                it[referenceId] = event.referenceId()
-                it[eventId] = event.eventId()
-                it[events.event] = event.eventType.name
-                it[data] = event.toJson()
-            }
-        }
-
-        val existing = getEventsWith(event.referenceId())
-
-        val derivedId = event.metadata.derivedFromEventId
-        if (derivedId != null) {
-            val isNewEventOrphan = existing.none { it.eventId() == derivedId }
-            if (isNewEventOrphan) {
-                log.warn { "Message not saved! ${event.referenceId()} with eventId(${event.eventId()}) for event ${event.eventType} has derivedEventId($derivedId) which does not exist!" }
-                return false
-            }
-        }
-
-
-        val exception = no.iktdev.eventi.database.executeOrException(dataSource.database) {
-            events.insert {
-                it[referenceId] = event.referenceId()
-                it[eventId] = event.eventId()
-                it[events.event] = event.eventType.name
-                it[data] = event.toJson()
-            }
-        }
-        val success = if (exception != null) {
-            if (exception.isExposedSqlException()) {
-                if ((exception as ExposedSQLException).isCausedByDuplicateError()) {
-                    log.debug { "Error is of SQLIntegrityConstraintViolationException" }
-                    log.error { exception.message }
-                    exception.printStackTrace()
-                } else {
-                    log.debug { "Error code is: ${exception.errorCode}" }
-                    log.error { exception.message }
-                    exception.printStackTrace()
-                }
-            } else {
-                log.error { exception.message }
-                exception.printStackTrace()
-            }
-            false
-        } else {
-            true
-        }
-        if (success) {
-            //deleteSupersededEvents(referenceId = event.referenceId(), eventId = event.eventId(), event = event.eventType, derivedFromId = event.derivedFromEventId())
-        }
-        return success
-    }
-
-
-    private val exemptedFromSingleEvent = listOf(
-        Events.ConvertTaskCreated,
-        Events.ExtractTaskCreated,
-        Events.ConvertTaskCompleted,
-        Events.ExtractTaskCompleted
-    )
-
-    private fun isExempted(event: Events): Boolean {
-        return event in exemptedFromSingleEvent
-    }
-
-     override fun getAvailableReferenceIds(): List<String> {
-        return withDirtyRead(dataSource.database) {
-            val completedEvents = events
-                .slice(events.referenceId)
-                .select { events.event eq Events.ProcessCompleted.name }
-
-            events
-                .slice(events.referenceId)
-                .select { events.referenceId notInSubQuery completedEvents }
-                .withDistinct()
-                .map { it[events.referenceId] } ?: emptyList()
-        } ?: emptyList()
-    }
-
-    override fun readAvailableEvents(): List<List<Event>> {
-        return withDirtyRead(dataSource.database) {
-            events.selectAll()
-                .groupBy { it[events.referenceId] }
-                .mapNotNull { it.value.mapNotNull { v -> v.toEvent() } }.filter { it.none { e -> e.eventType == Events.ProcessCompleted } }
-        } ?: emptyList()
-    }
-
-    override fun readAvailableEventsFor(referenceId: String): List<Event> {
-        val events = withDirtyRead(dataSource.database) {
-            events.select { events.referenceId eq referenceId }
-                .mapNotNull { it.toEvent() }
-        } ?: emptyList()
-        return if (events.any { it.eventType == Events.ProcessCompleted  }) emptyList() else events
-    }
-
-    override fun getAllEvents(): List<List<Event>> {
-        val events = no.iktdev.eventi.database.withTransaction(dataSource.database) {
-            events.selectAll()
-                .groupBy { it[events.referenceId] }
-                .mapNotNull { it.value.mapNotNull { v -> v.toEvent() } }
-        } ?: emptyList()
-        return events
-    }
-
-
-    override fun getEventsWith(referenceId: String): List<Event> {
-        return no.iktdev.eventi.database.withTransaction(dataSource.database) {
-            events.select {
-                (events.referenceId eq referenceId)
-            }
-                .orderBy(events.created, SortOrder.ASC)
-                .mapNotNull { it.toEvent() }
-        } ?: emptyList()
-    }
-
-
-
-    /**
-     * @param referenceId Reference
-     * @param eventId Current eventId for the message, required to prevent deletion of itself
-     * @param event Current event for the message
-     */
-    private fun deleteSupersededEvents(referenceId: String, eventId: String, event: Events, derivedFromId: String?) {
-        val forRemoval = mutableListOf<Event>()
-
-        val present = getEventsWith(referenceId).filter { it.metadata.derivedFromEventId != null }
-        val helper = PersistentMessageHelper<Event>(present)
-
-        val replaced = if (!isExempted(event)) present.find { it.eventId() != eventId && it.eventType == event } else null
-        val orphaned = replaced?.let { helper.getEventsRelatedTo(it.eventId()) }?.toMutableSet() ?: mutableSetOf()
-        //orphaned.addAll(helper.findOrphanedEvents())
-
-        forRemoval.addAll(orphaned)
-
-        deleteSupersededEvents(forRemoval)
-
-    }
-
-
-    /**
-     * Deletes the events
-     */
-    private fun deleteSupersededEvents(superseded: List<Event>) {
-        no.iktdev.eventi.database.withTransaction(dataSource) {
-            superseded.forEach { duplicate ->
-                events.deleteWhere {
-                    (referenceId eq duplicate.referenceId()) and
-                            (eventId eq duplicate.eventId()) and
-                            (event eq duplicate.eventType.name)
-                }
-            }
-        }
-    }
-
-
-    private fun ResultRow.toEvent(): Event {
-        return this[events.data].jsonToEvent(this[events.event])
-    }
-
-}
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/RunnerManager.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/RunnerManager.kt
deleted file mode 100644
index e298ebce..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/RunnerManager.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.database.cal
-
-import mu.KotlinLogging
-import no.iktdev.eventi.database.DataSource
-import no.iktdev.eventi.database.executeOrException
-import no.iktdev.eventi.database.withDirtyRead
-import no.iktdev.eventi.database.withTransaction
-import no.iktdev.mediaprocessing.shared.common.database.tables.runners
-import no.iktdev.mediaprocessing.shared.common.getAppVersion
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.sql.insert
-import org.jetbrains.exposed.sql.select
-import java.util.UUID
-
-class RunnerManager(private val dataSource: DataSource, val startId: String = UUID.randomUUID().toString(), val applicationName: String) {
-    private val log = KotlinLogging.logger {}
-
-    fun assignRunner(): Boolean {
-        return executeOrException(dataSource.database) {
-            runners.insert {
-                it[runners.startId] = this@RunnerManager.startId
-                it[runners.application] = this@RunnerManager.applicationName
-                it[runners.version] = getAppVersion()
-            }
-        } == null
-    }
-
-    fun amIEnabled(): Boolean {
-        return withDirtyRead(dataSource.database) {
-            runners.select {
-                (runners.application eq applicationName) and
-                        (runners.startId eq startId)
-            }.singleOrNull()?.get(runners.enabled)
-        } ?: run {
-            log.error { "Failed to get a response, reporting false for enabled" }
-            false
-        }
-    }
-
-    fun iAmSuperseded(): Boolean {
-        return withDirtyRead(dataSource.database) {
-            val runnerVersionCodes = runners.select {
-                (runners.application eq this@RunnerManager.applicationName) and
-                (runners.startId neq this@RunnerManager.startId)
-
-            }.map { it[runners.version] }
-
-            val myVersion = getAppVersion()
-            myVersion.let {
-                (runnerVersionCodes.any { rv -> rv > it })
-            } ?: true
-        } ?: true
-    }
-
-    fun unlist() {
-        withTransaction(dataSource.database) {
-            runners.deleteWhere { (runners.startId eq startId) and (runners.application eq applicationName) }
-        }
-    }
-}
-
-enum class ActiveMode {
-    Active,
-    Passive
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/TasksManager.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/TasksManager.kt
deleted file mode 100644
index 7c665dc8..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/cal/TasksManager.kt
+++ /dev/null
@@ -1,207 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.database.cal
-
-import mu.KotlinLogging
-import no.iktdev.eventi.data.eventId
-import no.iktdev.eventi.data.referenceId
-import no.iktdev.eventi.data.toJson
-import no.iktdev.eventi.database.*
-import no.iktdev.mediaprocessing.shared.common.contract.Events
-import no.iktdev.mediaprocessing.shared.common.contract.data.Event
-import no.iktdev.mediaprocessing.shared.common.contract.jsonToEvent
-import no.iktdev.mediaprocessing.shared.common.database.tables.events
-import no.iktdev.mediaprocessing.shared.common.database.tables.tasks
-import no.iktdev.mediaprocessing.shared.common.task.Task
-import no.iktdev.mediaprocessing.shared.common.task.TaskType
-import no.iktdev.mediaprocessing.shared.common.task.TaskDoz
-import org.jetbrains.exposed.exceptions.ExposedSQLException
-import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.javatime.CurrentDateTime
-import java.security.MessageDigest
-import java.time.LocalDateTime
-import java.util.*
-
-enum class Status {
-    SKIPPED,
-    COMPLETED,
-    ERROR
-}
-
-class TasksManager(private val dataSource: DataSource) {
-    private val log = KotlinLogging.logger {}
-
-    fun getClaimableTasks(): Map<TaskType, List<Task>> {
-        return withTransaction(dataSource.database) {
-            tasks.select {
-                (tasks.consumed eq false) and
-                        (tasks.claimed eq false)
-            }.toTaskTypeGroup()
-        } ?: emptyMap()
-    }
-
-    fun getTasksFor(referenceId: String): List<Task> {
-        return withDirtyRead(dataSource) {
-            tasks.select {
-                (tasks.referenceId eq referenceId)
-            }.toTask()
-        } ?: emptyList()
-    }
-
-    fun getTaskWith(referenceId: String, eventId: String): Task? {
-        return withDirtyRead(dataSource.database) {
-            tasks.select {
-                (tasks.referenceId eq referenceId) and
-                        (tasks.eventId eq eventId)
-            }.toTask()
-        }?.singleOrNull()
-    }
-
-    fun getTasksWithExpiredClaim(): List<Task> {
-        val deadline = LocalDateTime.now()
-        return getUncompletedTasks()
-            .filter { it.claimed && if (it.lastCheckIn != null) it.lastCheckIn.plusMinutes(15) < deadline else true }
-    }
-
-    fun isTaskClaimed(referenceId: String, eventId: String): Boolean {
-        val info = getTaskWith(referenceId, eventId)
-        return info?.claimed ?: true && info?.consumed ?: true
-    }
-
-    fun isTaskCompleted(referenceId: String, eventId: String): Boolean {
-        return getTaskWith(referenceId, eventId)?.consumed ?: false
-    }
-
-    fun getUncompletedTasks(): List<Task> {
-        return withTransaction(dataSource.database) {
-            tasks.select {
-                (tasks.consumed eq false)
-            }.toTask()
-        } ?: emptyList()
-    }
-
-
-    fun markTaskAsClaimed(referenceId: String, eventId: String, claimer: String): Boolean {
-        return executeWithStatus(dataSource.database) {
-            tasks.update({
-                (tasks.referenceId eq referenceId) and
-                        (tasks.eventId eq eventId) and
-                        (tasks.claimed eq false) and
-                        (tasks.consumed eq false)
-            }) {
-                it[claimedBy] = claimer
-                it[lastCheckIn] = CurrentDateTime
-                it[claimed] = true
-            }
-        }
-    }
-
-    fun markTaskAsCompleted(referenceId: String, eventId: String, status: Status = Status.COMPLETED, message: String? = null): Boolean {
-        return executeWithStatus(dataSource) {
-            tasks.update({
-                (tasks.referenceId eq referenceId) and
-                        (tasks.eventId eq eventId)
-            }) {
-                it[consumed] = true
-                it[claimed] = true
-                it[tasks.status] = status.name
-                message?.let { msg ->
-                    it[tasks.taskResult] = msg
-                }
-            }
-        }
-    }
-
-    fun refreshTaskClaim(referenceId: String, eventId: String, claimer: String): Boolean {
-        return executeWithStatus(dataSource) {
-            tasks.update({
-                (tasks.referenceId eq referenceId) and
-                        (tasks.eventId eq eventId) and
-                        (tasks.claimed eq true) and
-                        (tasks.claimedBy eq claimer)
-            }) {
-                it[lastCheckIn] = CurrentDateTime
-            }
-        }
-    }
-
-    fun deleteTaskClaim(referenceId: String, eventId: String): Boolean {
-        return executeWithStatus(dataSource) {
-            tasks.update({
-                (tasks.referenceId eq referenceId) and
-                        (tasks.eventId eq eventId)
-            }) {
-                it[claimed] = false
-                it[claimedBy] = null
-                it[lastCheckIn] = null
-            }
-        }
-    }
-
-    fun createTask(referenceId: String, eventId: String = UUID.randomUUID().toString(), derivedFromEventId: String? = null, task: TaskType, data: String, inputFile: String): Boolean {
-        return executeWithStatus(dataSource) {
-            tasks.insert {
-                it[tasks.referenceId] = referenceId
-                it[tasks.eventId] = eventId
-                it[tasks.task] = task.name
-                it[tasks.data] = data
-                it[tasks.derivedFromEventId] = derivedFromEventId
-                it[tasks.inputFile] = inputFile
-            }
-        }
-    }
-
-
-    fun produceEvent(event: Event): Boolean {
-        val exception = executeOrException(dataSource.database) {
-            events.insert {
-                it[referenceId] = event.referenceId()
-                it[eventId] = event.eventId()
-                it[events.event] = event.eventType.name
-                it[data] = event.toJson()
-            }
-        }
-        val success = if (exception != null) {
-            if (exception.isExposedSqlException()) {
-                if ((exception as ExposedSQLException).isCausedByDuplicateError()) {
-                    log.debug { "Error is of SQLIntegrityConstraintViolationException" }
-                    log.error { exception.message }
-                    exception.printStackTrace()
-                } else {
-                    log.debug { "Error code is: ${exception.errorCode}" }
-                    log.error { exception.message }
-                    exception.printStackTrace()
-                }
-            } else {
-                log.error { exception.message }
-                exception.printStackTrace()
-            }
-            false
-        } else {
-            true
-        }
-        return success
-    }
-
-}
-
-val digest = MessageDigest.getInstance("MD5")
-@OptIn(ExperimentalStdlibApi::class)
-private fun getIntegrityOfData(data : String) : String {
-    return digest.digest(data.toByteArray(kotlin.text.Charsets.UTF_8))
-        .toHexString()
-}
-
-fun Query?.toTaskTypeGroup(): Map<TaskType, List<Task>> {
-    val dz = TaskDoz()
-    val res = this?.mapNotNull {  dz.deserializeTask(it) }?.groupBy { it.task } ?: emptyMap()
-    return res
-}
-
-fun Query?.toTask(): List<Task> {
-    val dz = TaskDoz()
-    val res = this?.mapNotNull {  dz.deserializeTask(it) } ?: emptyList()
-    return res
-}
-
-fun Query?.toEvent(): List<Event> {
-    return this?.mapNotNull { it[events.data].jsonToEvent(it[events.event]) } ?: emptyList()
-}
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/allEvents.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/allEvents.kt
deleted file mode 100644
index ce852637..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/allEvents.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.database.tables
-
-import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.javatime.CurrentDateTime
-import org.jetbrains.exposed.sql.javatime.datetime
-import java.time.LocalDateTime
-
-object allEvents: IntIdTable() {
-    val referenceId: Column<String> = varchar("referenceId", 50)
-    val eventId: Column<String> = varchar("eventId", 50)
-    val event: Column<String> = varchar("event",100)
-    val data: Column<String> = text("data")
-    //val success: Column<Boolean> = bool("success").default(false)
-    val created: Column<LocalDateTime> = datetime("created").defaultExpression(CurrentDateTime)
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/events.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/events.kt
deleted file mode 100644
index 4c31414d..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/events.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.database.tables
-
-import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.javatime.CurrentDateTime
-import org.jetbrains.exposed.sql.javatime.datetime
-import java.time.LocalDateTime
-
-object events: IntIdTable() {
-    val referenceId: Column<String> = varchar("referenceId", 50)
-    val eventId: Column<String> = varchar("eventId", 50)
-    val event: Column<String> = varchar("event",100)
-    val data: Column<String> = text("data")
-    //val success: Column<Boolean> = bool("success").default(false)
-    val created: Column<LocalDateTime> = datetime("created").defaultExpression(CurrentDateTime)
-
-    init {
-        uniqueIndex(referenceId, eventId, event)
-    }
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/files.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/files.kt
deleted file mode 100644
index b9f989fe..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/files.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.database.tables
-
-import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.sql.Column
-
-object files: IntIdTable() {
-    val baseName: Column<String> = varchar("baseName", 256)
-    val folder: Column<String> = varchar("folder", 256)
-    val fileName: Column<String> = varchar("fileName", 512)
-    val checksum: Column<String> = varchar("checksum", 256).uniqueIndex()
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/filesProcessed.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/filesProcessed.kt
deleted file mode 100644
index 8be4a86b..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/filesProcessed.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.database.tables
-
-import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.javatime.CurrentDateTime
-import org.jetbrains.exposed.sql.javatime.datetime
-import java.time.LocalDateTime
-
-object filesProcessed: IntIdTable() {
-    val title: Column<String> = varchar("title", 256)
-    val inputFile: Column<String> = text("fileName")
-    val data: Column<String> = text("data")
-    val created: Column<LocalDateTime> = datetime("created").defaultExpression(CurrentDateTime)
-    val checksum: Column<String?> = varchar("checksum", 256).nullable()
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/runners.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/runners.kt
deleted file mode 100644
index 58423274..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/runners.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.database.tables
-
-import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.javatime.CurrentDateTime
-import org.jetbrains.exposed.sql.javatime.datetime
-import java.time.LocalDateTime
-
-object runners: IntIdTable() {
-    val startId: Column<String> = varchar("startId", 50)
-    val application: Column<String> = varchar("application", 50)
-    val version: Column<Int> = integer("version")
-    val created: Column<LocalDateTime> = datetime("created").defaultExpression(CurrentDateTime)
-    val enabled: Column<Boolean> = bool("enabled").default(true)
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/tasks.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/tasks.kt
deleted file mode 100644
index c8c64806..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/database/tables/tasks.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.database.tables
-
-import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.javatime.CurrentDateTime
-import org.jetbrains.exposed.sql.javatime.datetime
-import org.w3c.dom.Text
-import java.time.LocalDateTime
-
-object tasks: IntIdTable() {
-    val referenceId: Column<String> = varchar("referenceId", 50)
-    val inputFile: Column<String?> = text("inputFile").nullable()
-    val status: Column<String?> = varchar("status", 10).nullable()
-    val claimed: Column<Boolean> = bool("claimed").default(false)
-    val claimedBy: Column<String?> = varchar("claimedBy", 100).nullable()
-    val consumed: Column<Boolean> = bool("consumed").default(false)
-    val task: Column<String> = varchar("task",50)
-    val eventId: Column<String> = varchar("eventId", 50)
-    val derivedFromEventId: Column<String?> = varchar("derivedFromEventId", 50).nullable()
-    val data: Column<String> = text("data")
-    val created: Column<LocalDateTime> = datetime("created").defaultExpression(CurrentDateTime)
-    val lastCheckIn: Column<LocalDateTime?> = datetime("lastCheckIn").nullable()
-    val taskResult: Column<String?> = text("taskResult").nullable()
-
-
-    init {
-        uniqueIndex(referenceId, task, eventId)
-    }
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/extended/FileExt.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/extended/FileExt.kt
deleted file mode 100644
index af8e0fb4..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/extended/FileExt.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.extended
-
-import java.io.File
-
-val validVideoFiles = listOf(
-    "mkv",
-    "avi",
-    "mp4",
-    "wmv",
-    "webm",
-    "mov"
-)
-
-fun File.isSupportedVideoFile(): Boolean {
-    return this.isFile && validVideoFiles.contains(this.extension)
-}
-
-fun getSanitizedFileName(name: String): String {
-    /**
-     * Modifies the input value and removes "[Text]"
-     * @param text "[TEST] Dummy - 01 [AZ 1080p] "
-     */
-    fun removeBracketedText(text: String): String {
-        return Regex("\\[.*?]").replace(text, " ")
-    }
-
-    /**
-     *
-     */
-    fun removeParenthesizedText(text: String): String {
-        return Regex("\\(.*?\\)").replace(text, " ")
-    }
-
-    /**
-     *
-     */
-    fun removeResolutionAndTags(text: String): String {
-        return Regex("(.*?)(?=\\d+[pk]\\b)").replace(text, " ")
-    }
-
-    fun removeInBetweenCharacters(text: String): String {
-        return Regex("[.]").replace(text, " ")
-    }
-
-    /**
-     * @param text "example    text   with  extra   spaces"
-     * @return example text with extra spaces
-     */
-    fun removeExtraWhiteSpace(text: String): String {
-        return Regex("\\s{2,}").replace(text, " ")
-    }
-
-    return name
-        .let { removeBracketedText(it) }
-        .let { removeParenthesizedText(it) }
-        .let { removeResolutionAndTags(it) }
-        .let { removeInBetweenCharacters(it) }
-        .let { removeExtraWhiteSpace(it) }
-}
-
-
-fun File.getDesiredVideoFileName(): String? {
-    if (!this.isSupportedVideoFile()) return null
-    val cleanedFileName = getSanitizedFileName(this.nameWithoutExtension)
-    val parts = cleanedFileName.split(" - ")
-    return when {
-        parts.size == 2 && parts[1].matches(Regex("\\d{4}")) -> {
-            val title = parts[0]
-            val year = parts[1]
-            "$title ($year)"
-        }
-
-        parts.size >= 3 && parts[1].matches(Regex("S\\d+")) && parts[2].matches(Regex("\\d+[vV]\\d+")) -> {
-            val title = parts[0]
-            val episodeWithRevision = parts[2]
-            val episodeParts = episodeWithRevision.split("v", "V")
-            val episodeNumber = episodeParts[0].toInt()
-            val revisionNumber = episodeParts[1].toInt()
-            val seasonEpisode =
-                "S${episodeNumber.toString().padStart(2, '0')}E${revisionNumber.toString().padStart(2, '0')}"
-            val episodeTitle = if (parts.size > 3) parts[3] else ""
-            "$title - $seasonEpisode - $episodeTitle"
-        }
-
-        else -> cleanedFileName
-    }.trim()
-}
-
-fun File.getGuessedVideoTitle(): String? {
-    val desiredFileName = getDesiredVideoFileName() ?: return null
-    val seasonRegex = Regex("\\sS[0-9]+(\\s- [0-9]+|\\s[0-9]+)", RegexOption.IGNORE_CASE)
-    if (seasonRegex.containsMatchIn(desiredFileName)) {
-        return seasonRegex.replace(desiredFileName, "").trim()
-    } else {
-        val result = if (desiredFileName.contains(" - ")) {
-            return desiredFileName.split(" - ").firstOrNull() ?: desiredFileName
-        } else desiredFileName
-        return result.trim()
-    }
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/FileNameDeterminate.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/FileNameDeterminate.kt
deleted file mode 100644
index c92011b0..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/FileNameDeterminate.kt
+++ /dev/null
@@ -1,171 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.parsing
-
-import no.iktdev.mediaprocessing.shared.common.contract.data.EpisodeInfo
-import no.iktdev.mediaprocessing.shared.common.contract.data.MediaInfo
-import no.iktdev.mediaprocessing.shared.common.contract.data.MovieInfo
-
-
-class FileNameDeterminate(val title: String, val sanitizedName: String, val ctype: ContentType = ContentType.UNDEFINED)  {
-
-    enum class ContentType {
-        MOVIE,
-        SERIE,
-        UNDEFINED
-    }
-
-    fun getDeterminedVideoInfo(): MediaInfo? {
-        return when (ctype) {
-            ContentType.MOVIE -> determineMovieFileName()
-            ContentType.SERIE -> determineSerieFileName()
-            ContentType.UNDEFINED -> determineUndefinedFileName()
-        }
-    }
-
-    private fun determineMovieFileName(): MovieInfo? {
-        val movieEx = MovieEx(title, sanitizedName)
-        val stripped = when {
-            movieEx.isDefinedWithYear() -> sanitizedName.replace(movieEx.yearRegex(), "").trim()
-            movieEx.doesContainMovieKeywords() -> sanitizedName.replace(Regex("(?i)\\s*\\(\\s*movie\\s*\\)\\s*"), "").trim()
-            else -> sanitizedName
-        }
-        val nonResolutioned = movieEx.removeResolutionAndBeyond(stripped) ?: stripped
-        return MovieInfo(title = cleanup(nonResolutioned), fullName =  cleanup(nonResolutioned))
-    }
-
-    private fun determineSerieFileName(): EpisodeInfo? {
-        val serieEx = SerieEx(title, sanitizedName)
-
-        val (season, episode) = serieEx.findSeasonAndEpisode(sanitizedName)
-        val episodeNumberSingle = serieEx.findEpisodeNumber()
-
-        val seasonNumber = season ?: "1"
-        val episodeNumber = episode ?: (episodeNumberSingle ?: return null)
-        val seasonEpisodeCombined = serieEx.getSeasonEpisodeCombined(seasonNumber, episodeNumber)
-        val episodeTitle = serieEx.findEpisodeTitle()
-
-        val useTitle = if (title == sanitizedName) {
-            if (title.contains(" - ")) {
-                title.split(" - ").firstOrNull() ?: title
-            } else {
-                val seasonNumberIndex = if (title.indexOf(seasonNumber) < 0) title.length -1 else title.indexOf(seasonNumber)
-                val episodeNumberIndex = if (title.indexOf(episodeNumber) < 0) title.length -1 else title.indexOf(episodeNumber)
-                val closest = listOf<Int>(seasonNumberIndex, episodeNumberIndex).min()
-                val shrunkenTitle = title.substring(0, closest)
-                if (closest - shrunkenTitle.lastIndexOf(" ") < 3) {
-                    title.substring(0, shrunkenTitle.lastIndexOf(" "))
-                } else title.substring(0, closest)
-
-            }
-        } else title
-        val fullName = "${useTitle.trim()} - $seasonEpisodeCombined ${if (episodeTitle.isNullOrEmpty()) "" else " - $episodeTitle"}".trim()
-        return EpisodeInfo(title = title, episode = episodeNumber.toInt(), season =  seasonNumber.toInt(), episodeTitle =  episodeTitle, fullName =  cleanup(fullName))
-    }
-
-    private fun determineUndefinedFileName(): MediaInfo? {
-        val serieEx = SerieEx(title, sanitizedName)
-        val (season, episode) = serieEx.findSeasonAndEpisode(sanitizedName)
-        val episodeNumber = serieEx.findEpisodeNumber()
-        return if ((sanitizedName.contains(" - ") && episodeNumber != null) || season != null || episode != null) {
-            determineSerieFileName()
-        } else {
-            determineMovieFileName()
-        }
-    }
-
-    private fun cleanup(input: String): String {
-        var cleaned = Regex("(?<=\\w)[_.](?=\\w)").replace(input, " ")
-        cleaned = Regexes.illegalCharacters.replace(cleaned, " - ")
-        cleaned = Regexes.trimWhiteSpaces.replace(cleaned, " ")
-        return NameHelper.normalize(cleaned)
-    }
-
-    open internal class Base(val title: String, val sanitizedName: String) {
-        fun getMatch(regex: String): String? {
-            return Regex(regex, RegexOption.IGNORE_CASE).find(sanitizedName)?.value
-        }
-
-        fun removeResolutionAndBeyond(input: String): String? {
-            val removalValue = Regex("(i?)([0-9].*[pk]|[ ._-]+[UHD]+[ ._-])").find(input)?.value ?: return null
-            return input.substring(0, input.indexOf(removalValue))
-        }
-
-        fun yearRegex(): Regex {
-            return Regex("[ .(][0-9]{4}[ .)]")
-        }
-    }
-
-    internal class MovieEx(title: String, sanitizedName: String) : Base(title, sanitizedName) {
-        /**
-         * @return not null if matches " 2020 " or ".2020."
-         */
-        fun isDefinedWithYear(): Boolean {
-            return getMatch(yearRegex().pattern)?.isNotBlank() ?: false
-        }
-
-        /**
-         * Checks whether the filename contains the keyword movie, if so, default to movie
-         */
-        fun doesContainMovieKeywords(): Boolean {
-            return getMatch("[(](?<=\\()movie(?=\\))[)]")?.isNotBlank() ?: false
-        }
-    }
-
-    internal class SerieEx(title: String, sanitizedName: String) : Base(title, sanitizedName) {
-
-        fun getSeasonEpisodeCombined(season: String, episode: String): String {
-            return StringBuilder()
-                .append("S")
-                .append(if (season.length < 2) season.padStart(2, '0') else season)
-                .append("E")
-                .append(if (episode.length < 2) episode.padStart(2, '0') else episode)
-                .toString().trim()
-        }
-
-
-        /**
-         * Sjekken matcher tekst som dette:
-         *      Cool - Season 1 Episode 13
-         *      Cool - s1e13
-         *      Cool - S1E13
-         *      Cool - S1 13
-         */
-        fun findSeasonAndEpisode(inputText: String): Pair<String?, String?> {
-            val matchResult = Regexes.SeasonEpisodeBlock.find(inputText)
-            val season = matchResult?.groups?.get(1)?.value
-            val episode = matchResult?.groups?.get(2)?.value
-            return season to episode
-        }
-
-        fun findEpisodeNumber(): String? {
-            val regex = Regex("\\b(\\d+)\\b")
-            val matchResult = regex.findAll(sanitizedName)
-            val usabeNumber = if (matchResult.toList().size > 1) {
-                Regex("[-_] \\b(\\d+)\\b").find(sanitizedName)?.groups?.lastOrNull()?.value
-            } else {
-                matchResult.lastOrNull()?.value
-            }
-            return usabeNumber?.trim()
-        }
-
-        fun findEpisodeTitle(): String? {
-            var startPosition: Int = 0
-            startPosition = Regexes.SeasonEpisodeBlock.find(sanitizedName)?.value?.let { block ->
-                sanitizedName.indexOf(block) + block.length
-            } ?: 0
-
-            val seCombo = findSeasonAndEpisode(sanitizedName)
-            val episodeNumber = findEpisodeNumber()
-
-            startPosition = if (startPosition != 0) startPosition else if (seCombo.second != null) sanitizedName.indexOf(seCombo.second!!)+ seCombo.second!!.length
-            else if (episodeNumber != null) sanitizedName.indexOf(episodeNumber) + episodeNumber.length else 0
-            val availableText = sanitizedName.substring(startPosition)
-
-            val cleanedEpisodeTitle = availableText.replace(Regex("""(?i)\b(?:season|episode|ep)\b"""), "")
-                .replace(Regex("""^\s*-\s*"""), "")
-                .replace(Regex("""\s+"""), " ")
-                .trim()
-
-            return cleanedEpisodeTitle
-        }
-    }
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/FileNameParser.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/FileNameParser.kt
deleted file mode 100644
index 2dd5c5da..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/FileNameParser.kt
+++ /dev/null
@@ -1,146 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.parsing
-
-
-class FileNameParser(val fileName: String) {
-    var cleanedFileName: String
-        private set
-
-    init {
-        cleanedFileName = removeBracketedText(fileName)
-        cleanedFileName = removeParenthesizedText(cleanedFileName)
-        cleanedFileName = removeResolutionAndTrailing(cleanedFileName)
-        cleanedFileName = removeResolutionAndTags(cleanedFileName)
-        cleanedFileName = removeParenthesizedText(cleanedFileName)
-        cleanedFileName = removeYear(cleanedFileName)
-        cleanedFileName = removeDot(cleanedFileName)
-        cleanedFileName = removeExtraWhiteSpace(cleanedFileName)
-        cleanedFileName = removeTrailingAndLeadingCharacters(cleanedFileName).trim()
-    }
-
-    fun guessDesiredFileName(): String {
-        val parts = cleanedFileName.split(" - ")
-        return when {
-            parts.size == 2 && parts[1].matches(Regex("\\d{4}")) -> {
-                val title = parts[0]
-                val year = parts[1]
-                "$title ($year)"
-            }
-
-            parts.size >= 3 && parts[1].matches(Regex("S\\d+")) && parts[2].matches(Regex("\\d+[vV]\\d+")) -> {
-                val title = parts[0]
-                val episodeWithRevision = parts[2]
-                val episodeParts = episodeWithRevision.split("v", "V")
-                val episodeNumber = episodeParts[0].toInt()
-                val revisionNumber = episodeParts[1].toInt()
-                val seasonEpisode =
-                    "S${episodeNumber.toString().padStart(2, '0')}E${revisionNumber.toString().padStart(2, '0')}"
-                val episodeTitle = if (parts.size > 3) parts[3] else ""
-                "$title - $seasonEpisode - $episodeTitle"
-            }
-
-            else -> cleanedFileName
-        }.trim()
-            .replace(Regex("[-\\s]+$"), "") // fjern trailing "-" og whitespace
-    }
-
-    fun guessDesiredTitle(): String {
-        val desiredFileName = guessDesiredFileName()
-        return if (Regexes.season.containsMatchIn(desiredFileName)) {
-            Regexes.season.split(desiredFileName).firstOrNull()?.trim() ?: desiredFileName
-        } else {
-            val result = if (desiredFileName.contains(" - ")) {
-                desiredFileName.split(" - ").firstOrNull() ?: desiredFileName
-            } else desiredFileName
-            result.trim()
-        }.trim('.', '-').trim()
-            .replace(Regex("[-\\s]+$"), "") // fjern trailing "-" og whitespace
-    }
-
-    fun guessSearchableTitle(): MutableList<String> {
-        var cleaned = removeBracketedText(fileName)
-        cleaned = keepParanthesesWithYear(cleaned)
-        cleaned = removeResolutionAndTrailing(cleaned)
-        cleaned = removeResolutionAndTags(cleaned)
-        cleaned = removeDot(cleaned)
-
-        val titles = mutableListOf<String>()
-        var ch = cleaned.split('-').firstOrNull() ?: cleaned
-        ch = removeExtraWhiteSpace(ch)
-        ch = ch.trim('.', ',', ' ')
-        titles.add(ch)
-
-        return titles
-    }
-
-
-    /**
-     * Modifies the input value and removes "[Text]"
-     * @param text "[TEST] Dummy - 01 [AZ 1080p] "
-     */
-    fun removeBracketedText(text: String): String {
-        return Regex("\\[.*?]").replace(text, " ")
-    }
-
-    /**
-     *
-     */
-    fun removeParenthesizedText(text: String): String {
-        return Regex("\\(.*?\\)").replace(text, " ")
-    }
-
-    fun removeResolutionAndTrailing(text: String): String {
-        return Regex("[0-9]+[pP].*").replace(text, "")
-    }
-
-    fun removeTrailingAndLeadingCharacters(text: String): String {
-        return Regex("^[^a-zA-Z0-9!,]+|[^a-zA-Z0-9!~,]+\$").replace(text, " ")
-    }
-
-    /**
-     *
-     */
-    fun removeResolutionAndTags(input: String): String {
-        var text = Regex("(?i)(\\d+[pk]\\b|(hd|uhd))", RegexOption.IGNORE_CASE).replace(input, " ")
-        text = Regex("(?i)(bluray|laserdisc|dvd|web)", RegexOption.IGNORE_CASE).replace(text, " ")
-        return text
-    }
-
-
-    fun keepParanthesesWithYear(text: String): String {
-        val regex = "\\((?!\\d{4}\\))(?>[^()]+|\\b)\\)"
-        return Regex(regex).replace(text, "")
-    }
-
-    fun removeYear(text: String): String {
-        val match = Regex("\\b\\d{4}\\W").find(text, 0)?.value
-        if (match == null || text.indexOf(match) > 0) {
-            //return Regex("\\b\\d{4}\\b(.*)").replace(text, " ")
-            return Regex("\\b\\d{4}\\b").replace(text, "")
-        }
-        return text
-    }
-
-    fun removeDot(input: String): String {
-        //var text = Regex("(?<=\\s)\\.|\\.(?=\\s)").replace(input, "")
-        //return Regex("\\.(?<!(Dr|Mr|Ms|Mrs|Lt|Capt|Prof|St|Ave)\\.)\\b").replace(text, " ")
-        return Regex("(?<!\\b(?:Dr|Mr|Ms|Mrs|Lt|Capt|Prof|St|Ave))\\.").replace(input, " ")
-    }
-
-    fun removeInBetweenCharacters(text: String): String {
-        return Regex("[.]").replace(text, " ")
-    }
-
-    /**
-     * @param text "example    text   with  extra   spaces"
-     * @return example text with extra spaces
-     */
-    fun removeExtraWhiteSpace(text: String): String {
-        return Regex("\\s{2,}").replace(text, " ")
-    }
-
-
-    private fun getMatch(regex: String): String? {
-        return Regex(regex).find(fileName)?.value ?: return null
-    }
-
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/NameHelper.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/NameHelper.kt
deleted file mode 100644
index 0b33d7c0..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/NameHelper.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.parsing
-
-import org.apache.commons.lang3.StringUtils
-import java.text.Normalizer
-
-object NameHelper {
-    fun normalize(text: String): String {
-        val normalized = Normalizer.normalize(text, Normalizer.Form.NFC)
-        val result = normalized.replace("\\p{M}".toRegex(), "")
-        val cleaned = "[^A-Za-z0-9 -]".toRegex().replace(result, "")
-        return StringUtils.stripAccents(cleaned).trim()
-    }
-
-    fun cleanup(input: String): String {
-        var cleaned = Regex("(?<=\\w)[_.](?=\\w)").replace(input, " ")
-        cleaned = Regexes.illegalCharacters.replace(cleaned, " - ")
-        cleaned = Regexes.trimWhiteSpaces.replace(cleaned, " ")
-        return NameHelper.normalize(cleaned).trim()
-    }
-}
-
-fun String.isCharOnlyUpperCase(): Boolean {
-    return "[^A-Za-z]".toRegex().replace(this, "").all { it.isUpperCase() }
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/Regexes.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/Regexes.kt
deleted file mode 100644
index 778db243..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/parsing/Regexes.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.parsing
-
-object Regexes {
-    val illegalCharacters = Regex("""[\\\\\\/\\:\\*\\?\\\"\\<\\>|!`()\[\]]""")
-    val trimWhiteSpaces = Regex("\\s{2,}")
-    val SeasonEpisodeBlock = Regex("""(?i)\b(?:S|Season)\s*(\d+).*?(?:E|Episode)?\s*(\d+)\b""", RegexOption.IGNORE_CASE)
-    val season = Regex("""(?i)\b(?:S|Season)\s*-?\s*(\d+)""", RegexOption.IGNORE_CASE)
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/runner/ResultRunner.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/runner/ResultRunner.kt
deleted file mode 100644
index 7b411bdc..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/runner/ResultRunner.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.runner
-
-import com.github.pgreze.process.Redirect
-import com.github.pgreze.process.process
-
-data class CodeToOutput(
-    val statusCode: Int,
-    val output: List<String>
-)
-
-suspend fun getOutputUsing(executable: String, vararg arguments: String): CodeToOutput {
-    val result: MutableList<String> = mutableListOf()
-    val code = process(executable, *arguments,
-        stderr = Redirect.CAPTURE,
-        stdout = Redirect.CAPTURE,
-        consumer = {
-            result.add(it)
-        }).resultCode
-    return CodeToOutput(statusCode = code, result)
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/services/TaskService.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/services/TaskService.kt
deleted file mode 100644
index 655c833e..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/services/TaskService.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.services
-
-import mu.KLogger
-import no.iktdev.mediaprocessing.shared.common.ClaimableTask
-import no.iktdev.mediaprocessing.shared.common.TaskQueueListener
-import no.iktdev.mediaprocessing.shared.common.getComputername
-import no.iktdev.mediaprocessing.shared.common.task.Task
-import java.io.File
-import java.util.*
-import javax.annotation.PostConstruct
-
-abstract class TaskService: TaskQueueListener {
-    abstract val logDir: File
-    abstract val log: KLogger
-
-    lateinit var serviceId: String
-
-    open fun getServiceId(serviceName: String = this.javaClass.simpleName): String {
-        return "${getComputername()}::${serviceName}::${UUID.randomUUID()}"
-    }
-
-    protected var assignedTask: Task? = null
-
-    /**
-     * If there is a task that the service is working on, return false
-     */
-    abstract fun isReadyToConsume(): Boolean
-    abstract fun isTaskClaimable(task: Task): Boolean
-    abstract fun onTaskAssigned(task: Task)
-
-    abstract fun onAttachListener()
-
-    override fun onTaskAvailable(data: ClaimableTask) {
-        if (!isReadyToConsume()) {
-            return
-        }
-
-        if (assignedTask != null) {
-            log.info { "Assigned task is not unassigned.., will not consume" }
-            return
-        }
-
-
-        val task = data.consume()
-        if (task == null) {
-            log.error { "Task is already consumed!" }
-            return
-        }
-        if (!isTaskClaimable(task)) {
-            log.warn { "Process is already claimed!" }
-            return
-        }
-        task.let {
-            this.assignedTask = it
-            onTaskAssigned(it)
-        }
-    }
-
-    @PostConstruct
-    private fun onCreated() {
-        serviceId = getServiceId()
-        log.info { "Starting with id: $serviceId" }
-        onAttachListener()
-    }
-
-    open fun onClearTask() {
-        this.assignedTask = null
-    }
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/socket/SocketImplementation.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/socket/SocketImplementation.kt
deleted file mode 100644
index 0197e857..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/socket/SocketImplementation.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.socket
-
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.messaging.converter.MappingJackson2MessageConverter
-import org.springframework.messaging.converter.StringMessageConverter
-import org.springframework.messaging.simp.config.MessageBrokerRegistry
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry
-import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer
-
-@EnableWebSocketMessageBroker
-open class SocketImplementation: WebSocketMessageBrokerConfigurer {
-    open val defaultOrigins = listOf("*://localhost:*/*", "http://localhost:3000/")
-    open var additionalOrigins: List<String> = emptyList()
-
-    override fun registerStompEndpoints(registry: StompEndpointRegistry) {
-        val origins = (defaultOrigins + additionalOrigins).toTypedArray()
-        println("Allowing the following origins for websocket connection\n\t${origins.joinToString("\n\t")}")
-        registry.addEndpoint("/ws")
-            .setAllowedOrigins(*origins)
-    }
-
-    override fun configureMessageBroker(registry: MessageBrokerRegistry) {
-        registry.enableSimpleBroker("/topic")
-        registry.setApplicationDestinationPrefixes("/app")
-    }
-
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/Task.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/Task.kt
deleted file mode 100644
index 79d46195..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/Task.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.task
-
-import no.iktdev.mediaprocessing.shared.common.contract.dto.tasks.TaskData
-import java.time.LocalDateTime
-
-data class Task(
-    val referenceId: String,
-    val status: String? = null,
-    val claimed: Boolean = false,
-    val claimedBy: String? = null,
-    val consumed: Boolean = false,
-    val task: TaskType,
-    val eventId: String,
-    val derivedFromEventId: String? = null,
-    val data: TaskData? = null,
-    val created: LocalDateTime,
-    val lastCheckIn: LocalDateTime? = null
-)
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskDoz.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskDoz.kt
deleted file mode 100644
index 4cb86bf0..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskDoz.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.task
-
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-import no.iktdev.mediaprocessing.shared.common.database.tables.tasks
-import no.iktdev.mediaprocessing.shared.common.contract.data.ConvertData
-import no.iktdev.mediaprocessing.shared.common.contract.data.EncodeArgumentData
-import no.iktdev.mediaprocessing.shared.common.contract.data.ExtractArgumentData
-import no.iktdev.mediaprocessing.shared.common.contract.dto.tasks.TaskData
-import org.jetbrains.exposed.sql.ResultRow
-
-class TaskDoz {
-    val gson = Gson()
-
-    fun <T: TaskData> dzdata(type: TaskType, data: String): T? {
-        val clazz: Class<out TaskData> = when(type) {
-            TaskType.Encode -> EncodeArgumentData::class.java
-            TaskType.Extract -> ExtractArgumentData::class.java
-            TaskType.Convert -> ConvertData::class.java
-            else -> TaskData::class.java
-        }
-        val type = TypeToken.getParameterized(clazz).type
-        return gson.fromJson(data, type)
-    }
-
-    fun deserializeTask(row: ResultRow): Task? {
-        val taskType = row[tasks.task].let { TaskType.valueOf(it) }
-        val data = row[tasks.data]
-
-        return Task(
-            referenceId = row[tasks.referenceId],
-            status = row[tasks.status],
-            claimed = row[tasks.claimed],
-            claimedBy = row[tasks.claimedBy],
-            consumed = row[tasks.consumed],
-            task = taskType,
-            eventId = row[tasks.eventId],
-            derivedFromEventId = row[tasks.derivedFromEventId],
-            data = dzdata(taskType, data),
-            created = row[tasks.created],
-            lastCheckIn = row[tasks.lastCheckIn]
-        )
-    }
-}
\ No newline at end of file
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskType.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskType.kt
deleted file mode 100644
index 104fdadc..00000000
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskType.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package no.iktdev.mediaprocessing.shared.common.task
-
-enum class TaskType {
-    Encode,
-    Extract,
-    Convert
-}
\ No newline at end of file
diff --git a/shared/eventi/build.gradle.kts b/shared/eventi/build.gradle.kts
deleted file mode 100644
index 427a71ba..00000000
--- a/shared/eventi/build.gradle.kts
+++ /dev/null
@@ -1,63 +0,0 @@
-plugins {
-    id("java")
-    kotlin("jvm")
-    kotlin("plugin.spring") version "1.5.31"
-    id("org.springframework.boot") version "2.5.5"
-    id("io.spring.dependency-management") version "1.0.11.RELEASE"
-}
-
-group = "no.iktdev.mediaprocessing.shared"
-version = "1.0-SNAPSHOT"
-
-repositories {
-    mavenCentral()
-}
-
-val exposedVersion = "0.44.0"
-
-dependencies {
-
-    /*Spring boot*/
-    implementation("org.springframework.boot:spring-boot-starter:2.7.0")
-
-    implementation("io.github.microutils:kotlin-logging-jvm:2.0.11")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib")
-
-    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("com.google.code.gson:gson:2.8.9")
-
-
-    testImplementation("org.springframework.boot:spring-boot-starter-test:2.7.0")
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-    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")
-
-    implementation("org.jetbrains.kotlin:kotlin-reflect")
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-kotlin {
-    jvmToolchain(17)
-}
\ No newline at end of file
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/LogHelper.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/LogHelper.kt
deleted file mode 100644
index f12a6417..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/LogHelper.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package no.iktdev.eventi
-
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-
-data class LogKey(
-    val referenceId: String,
-    val listener: String,
-    val eventType: String
-)
-
-object EventDeadlockDetector {
-
-    private val stuckEvents = ConcurrentHashMap<LogKey, Int>()
-    private val suppressedEvents = ConcurrentHashMap<LogKey, Boolean>()
-    private val threshold = 5 // Antall ganger før det anses som deadlock
-    private val resetInterval = 10L // Reset telling hvert 10. sekund
-
-    init {
-        Executors.newScheduledThreadPool(1).scheduleAtFixedRate({
-            stuckEvents.clear()
-        }, resetInterval, resetInterval, TimeUnit.SECONDS)
-    }
-
-    fun detect(referenceId: String, listener: String, eventType: String): Boolean {
-        val key = LogKey(referenceId, listener, eventType)
-
-        if (suppressedEvents[key] == true) {
-            return false
-        }
-
-        val count = stuckEvents.merge(key, 1) { old, _ -> old + 1 } ?: 1
-
-        if (count > threshold) {
-            suppressedEvents[key] = true
-            onDeadlockDetected(key)
-            return false
-        }
-
-        return true
-    }
-
-    fun resolve(referenceId: String, listener: String, eventType: String) {
-        val key = LogKey(referenceId, listener, eventType)
-        stuckEvents.remove(key)
-        suppressedEvents.remove(key)
-    }
-
-    private fun onDeadlockDetected(key: LogKey) {
-        println("🚨 Deadlock detected! ReferenceId=${key.referenceId}, Listener=${key.listener}, EventType=${key.eventType}")
-        // Her kan du f.eks. sende et varsel, restarte prosess, etc.
-    }
-}
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/ConsumableEvent.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/ConsumableEvent.kt
deleted file mode 100644
index 46eae000..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/ConsumableEvent.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package no.iktdev.eventi.core
-
-import com.mysql.cj.protocol.Protocol.ProtocolEventListener.EventType
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.EventMetadata
-
-class ConsumableEvent<T: EventImpl>(private var event: T) {
-    var isConsumed: Boolean = false
-        private set
-    fun consume(): T? {
-        return if (!isConsumed) {
-            isConsumed = true
-            event
-        } else null
-    }
-
-    fun isOfEvent(eventType: Any): Boolean {
-        return event.eventType ==  eventType
-    }
-
-    fun metadata(): EventMetadata {
-        return event.metadata
-    }
-}
\ No newline at end of file
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/LocalDateTimeAdapter.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/LocalDateTimeAdapter.kt
deleted file mode 100644
index 46b32547..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/LocalDateTimeAdapter.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package no.iktdev.eventi.core
-
-import com.google.gson.*
-import java.lang.reflect.Type
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-class LocalDateTimeAdapter : JsonSerializer<LocalDateTime>, JsonDeserializer<LocalDateTime> {
-    private val formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME
-
-    override fun serialize(
-        src: LocalDateTime, typeOfSrc: Type, context: JsonSerializationContext
-    ): JsonElement {
-        return JsonPrimitive(src.format(formatter))
-    }
-
-    override fun deserialize(
-        json: JsonElement, typeOfT: Type, context: JsonDeserializationContext
-    ): LocalDateTime {
-        return LocalDateTime.parse(json.asString, formatter)
-    }
-}
\ No newline at end of file
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/PersistentMessageHelper.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/PersistentMessageHelper.kt
deleted file mode 100644
index 4b430d01..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/PersistentMessageHelper.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package no.iktdev.eventi.core
-
-import no.iktdev.eventi.data.EventImpl
-
-class PersistentMessageHelper<T: EventImpl>(val messages: List<T>) {
-
-    fun findOrphanedEvents(): List<T> {
-        val withDerivedId = messages.filter { it.metadata.derivedFromEventId != null }
-        val idsFlat = messages.map { it.metadata.eventId }
-        return withDerivedId.filter { it.metadata.derivedFromEventId !in idsFlat }
-    }
-
-    fun getEventsRelatedTo(eventId: String): List<T> {
-        val triggered = messages.firstOrNull { it.metadata.eventId == eventId } ?: return emptyList()
-        val usableEvents = messages.filter { it.metadata.eventId != eventId && it.metadata.derivedFromEventId != null }
-
-        val derivedEventsMap = mutableMapOf<String, MutableList<String>>()
-        for (event in usableEvents) {
-            derivedEventsMap.getOrPut(event.metadata.derivedFromEventId!!) { mutableListOf() }.add(event.metadata.eventId)
-        }
-        val eventsToFind = mutableSetOf<String>()
-
-        // Utfør DFS for å finne alle avledede hendelser som skal slettes
-        dfs(triggered.metadata.eventId, derivedEventsMap, eventsToFind)
-
-        return messages.filter { it.metadata.eventId in eventsToFind }
-    }
-
-    /**
-     * @param eventId Initial eventId
-     */
-    private fun dfs(eventId: String, derivedEventsMap: Map<String, List<String>>, eventsToFind: MutableSet<String>) {
-        eventsToFind.add(eventId)
-        derivedEventsMap[eventId]?.forEach { derivedEventId ->
-            dfs(derivedEventId, derivedEventsMap, eventsToFind)
-        }
-    }
-}
\ No newline at end of file
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/WGson.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/WGson.kt
deleted file mode 100644
index 4c9b283d..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/core/WGson.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package no.iktdev.eventi.core
-
-import com.google.gson.GsonBuilder
-import java.time.LocalDateTime
-
-object WGson {
-    val gson = GsonBuilder()
-        .registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
-        .create()
-    fun toJson(data: Any?): String {
-        return gson.toJson(data)
-    }
-}
\ No newline at end of file
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/data/EventImpl.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/data/EventImpl.kt
deleted file mode 100644
index ba34d132..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/data/EventImpl.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package no.iktdev.eventi.data
-
-import com.google.gson.Gson
-import no.iktdev.eventi.core.WGson
-import java.time.LocalDateTime
-import java.util.*
-
-abstract class EventImpl {
-    abstract val metadata: EventMetadata
-    abstract val data: Any?
-    abstract val eventType: Any
-}
-
-fun <T> EventImpl.dataAs(): T? {
-    return this.data as T
-}
-
-fun EventImpl.toJson(): String {
-    return WGson.gson.toJson(this)
-}
-
-data class EventMetadata(
-    val derivedFromEventId: String? = null, // Can be null but should not, unless its init event
-    val eventId: String = UUID.randomUUID().toString(),
-    val referenceId: String,
-    val status: EventStatus,
-    val created: LocalDateTime = LocalDateTime.now(),
-    val source: String = "Unknown producer"
-)
-
-enum class EventStatus {
-    Success,
-    Skipped,
-    Failed
-}
-
-fun EventImpl.isSuccessful(): Boolean {
-    return this.metadata.status == EventStatus.Success
-}
-
-fun EventImpl.isSkipped(): Boolean {
-    return this.metadata.status == EventStatus.Skipped
-}
-
-fun EventImpl.isFailed(): Boolean {
-    return this.metadata.status == EventStatus.Failed
-}
-
-fun EventImpl.referenceId(): String {
-    return this.metadata.referenceId
-}
-
-fun EventImpl.eventId(): String {
-    return this.metadata.eventId
-}
-
-fun EventImpl.derivedFromEventId(): String? {
-    return this.metadata.derivedFromEventId
-}
\ No newline at end of file
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/DataSource.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/DataSource.kt
deleted file mode 100644
index 064aa9d2..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/DataSource.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package no.iktdev.eventi.database
-
-import org.jetbrains.exposed.sql.Database
-import org.jetbrains.exposed.sql.Table
-import java.time.Instant
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.ZoneOffset
-
-abstract class DataSource(val config: DatabaseConnectionConfig) {
-    open var database: Database? = null
-
-    abstract fun connect()
-
-    abstract fun createDatabase(): Database?
-
-    abstract fun createTables(vararg tables: Table)
-
-    abstract fun createDatabaseStatement(): String
-
-    abstract fun toConnectionUrl(): String
-
-    abstract fun toDatabaseConnectionUrl(database: String): String
-
-    fun toPortedAddress(): String {
-        var baseAddress = config.address
-        if (!config.port.isNullOrBlank()) {
-            baseAddress += ":${config.port}"
-        }
-        return baseAddress
-    }
-
-    abstract fun toDatabase(): Database
-
-}
-
-fun timestampToLocalDateTime(timestamp: Int): LocalDateTime {
-    return Instant.ofEpochSecond(timestamp.toLong()).atZone(ZoneId.systemDefault()).toLocalDateTime()
-}
-
-fun LocalDateTime.toEpochSeconds(): Long {
-    return this.toEpochSecond(ZoneOffset.ofTotalSeconds(ZoneOffset.systemDefault().rules.getOffset(LocalDateTime.now()).totalSeconds))
-}
\ No newline at end of file
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/DatabaseConnectionConfig.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/DatabaseConnectionConfig.kt
deleted file mode 100644
index 4cb1a2a7..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/DatabaseConnectionConfig.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package no.iktdev.eventi.database
-
-data class DatabaseConnectionConfig(
-    val address: String,
-    val port: String?,
-    val username: String,
-    val password: String,
-    val databaseName: String
-)
\ No newline at end of file
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/MySqlDataSource.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/MySqlDataSource.kt
deleted file mode 100644
index 04d49c33..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/MySqlDataSource.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package no.iktdev.eventi.database
-
-import mu.KotlinLogging
-import org.jetbrains.exposed.sql.Database
-import org.jetbrains.exposed.sql.SchemaUtils
-import org.jetbrains.exposed.sql.Table
-import org.jetbrains.exposed.sql.transactions.TransactionManager
-import org.jetbrains.exposed.sql.transactions.transaction
-
-
-open class MySqlDataSource(conf: DatabaseConnectionConfig): DataSource(conf) {
-    val log = KotlinLogging.logger {}
-    override fun connect() {
-        this.toDatabase()
-    }
-
-    override fun createDatabase(): Database? {
-        val ok = transaction(toDatabaseServerConnection()) {
-            val tmc = TransactionManager.current().connection
-            val query = "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '${config.databaseName}';"
-            val stmt = tmc.prepareStatement(query, true)
-
-            val resultSet = stmt.executeQuery()
-            val databaseExists = resultSet.next()
-
-            if (!databaseExists) {
-                try {
-                    exec(createDatabaseStatement())
-                    log.info { "Database ${config.databaseName} created." }
-                    true
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            } else {
-                log.info { "Database ${config.databaseName} already exists." }
-                true
-            }
-        }
-
-        return if (ok) toDatabase() else {
-            log.error { "No database to create or connect to" }
-            null
-        }
-    }
-
-    override fun createTables(vararg tables: Table) {
-        transaction(this.database) {
-            SchemaUtils.createMissingTablesAndColumns(*tables)
-            log.info { "Database transaction completed" }
-        }
-    }
-
-    override fun createDatabaseStatement(): String {
-        return "CREATE DATABASE ${config.databaseName};"
-    }
-
-    protected fun toDatabaseServerConnection(): Database {
-        database = Database.connect(
-            toConnectionUrl(),
-            user = config.username,
-            password = config.password
-        )
-        return database!!
-    }
-
-    override fun toDatabase(): Database {
-        val database =  Database.connect(
-            toDatabaseConnectionUrl(config.databaseName),
-            user = config.username,
-            password = config.password
-        )
-        this.database = database
-        return database
-    }
-
-    override fun toDatabaseConnectionUrl(database: String): String {
-        return toConnectionUrl() + "/$database"
-    }
-
-    override fun toConnectionUrl(): String {
-        return "jdbc:mysql://${toPortedAddress()}"
-    }
-
-}
\ No newline at end of file
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/TableDefaultOperations.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/TableDefaultOperations.kt
deleted file mode 100644
index 9eaf89fa..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/database/TableDefaultOperations.kt
+++ /dev/null
@@ -1,153 +0,0 @@
-package no.iktdev.eventi.database
-
-import org.jetbrains.exposed.exceptions.ExposedSQLException
-import org.jetbrains.exposed.sql.Database
-import org.jetbrains.exposed.sql.Table
-
-import org.jetbrains.exposed.sql.transactions.transaction
-import java.sql.Connection
-import java.sql.SQLIntegrityConstraintViolationException
-
-open class TableDefaultOperations<T : Table> {
-
-}
-
-fun <T> withDirtyRead(db: Database? = null, block: () -> T): T? {
-    return try {
-        transaction(db = db, transactionIsolation = Connection.TRANSACTION_READ_UNCOMMITTED) {
-            try {
-                block()
-            } catch (e: Exception) {
-                e.printStackTrace()
-                // log the error here or handle the exception as needed
-                throw e // Optionally, you can rethrow the exception if needed
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-        // log the error here or handle the exception as needed
-        null
-    }
-}
-
-fun <T> withDirtyRead(db: DataSource? = null, block: () -> T): T? {
-    return withDirtyRead(db?.database, block)
-}
-
-
-fun <T> withTransaction(db: Database? = null, block: () -> T): T? {
-    return try {
-        transaction(db) {
-            try {
-                block()
-            } catch (e: Exception) {
-                e.printStackTrace()
-                // log the error here or handle the exception as needed
-                throw e // Optionally, you can rethrow the exception if needed
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-        // log the error here or handle the exception as needed
-        null
-    }
-}
-fun <T> withTransaction(db: DataSource? = null, block: () -> T): T? {
-    return withTransaction(db?.database, block)
-}
-
-
-
-fun <T> insertWithSuccess(db: Database? = null, block: () -> T): Boolean {
-    return try {
-        transaction(db) {
-            try {
-                block()
-                commit()
-            } catch (e: Exception) {
-                e.printStackTrace()
-                // log the error here or handle the exception as needed
-                throw e // Optionally, you can rethrow the exception if needed
-            }
-        }
-        true
-    } catch (e: Exception) {
-        e.printStackTrace()
-        false
-    }
-}
-
-fun <T> executeOrException(db: Database? = null, rollbackOnFailure: Boolean = false, block: () -> T): Exception? {
-    return try {
-        transaction(db) {
-            try {
-                block()
-                commit()
-                null
-            } catch (e: Exception) {
-                // log the error here or handle the exception as needed
-                if (rollbackOnFailure)
-                    rollback()
-                e
-
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-        return e
-    }
-}
-
-fun <T> executeWithResult(db: Database? = null, block: () -> T): Pair<T?, Exception?> {
-    return try {
-        transaction(db) {
-            try {
-                val res = block()
-                commit()
-                res to null
-            } catch (e: Exception) {
-                // log the error here or handle the exception as needed
-                rollback()
-                null to e
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-        return null to e
-    }
-}
-
-fun <T> executeWithStatus(db: Database? = null, block: () -> T): Boolean {
-    return try {
-        transaction(db) {
-            try {
-                block()
-                commit()
-            } catch (e: Exception) {
-                e.printStackTrace()
-                // log the error here or handle the exception as needed
-                throw e // Optionally, you can rethrow the exception if needed
-            }
-        }
-        true
-    } catch (e: Exception) {
-        e.printStackTrace()
-        false
-    }
-}
-
-fun <T> executeWithStatus(db: DataSource? = null, block: () -> T): Boolean {
-    return executeWithStatus(db?.database, block)
-}
-
-fun Exception.isExposedSqlException(): Boolean {
-    return this is ExposedSQLException
-}
-
-fun ExposedSQLException.isCausedByDuplicateError(): Boolean {
-    return if (this.cause is SQLIntegrityConstraintViolationException) {
-        return this.errorCode == 1062
-    } else false
-}
-
-
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventCoordinator.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventCoordinator.kt
deleted file mode 100644
index 5492f114..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventCoordinator.kt
+++ /dev/null
@@ -1,246 +0,0 @@
-package no.iktdev.eventi.implementations
-
-import kotlinx.coroutines.*
-import mu.KotlinLogging
-import no.iktdev.eventi.EventDeadlockDetector
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.referenceId
-import org.springframework.context.ApplicationContext
-import org.springframework.stereotype.Service
-import java.util.concurrent.atomic.AtomicLong
-import java.util.concurrent.atomic.AtomicReference
-
-abstract class EventCoordinator<T : EventImpl, E : EventsManagerImpl<T>> {
-    abstract var applicationContext: ApplicationContext
-    abstract var eventManager: E
-
-    val pullDelay: AtomicLong = AtomicLong(1000)
-    val fastPullDelay: AtomicLong = AtomicLong(500)
-    val slowPullDelay: AtomicLong = AtomicLong(2500)
-
-    //private val listeners: MutableList<EventListener<T>> = mutableListOf()
-
-    private val log = KotlinLogging.logger {}
-    private var coroutine = CoroutineScope(Dispatchers.IO + SupervisorJob())
-
-    open var ready: Boolean = false
-    fun isReady(): Boolean {
-        return ready
-    }
-
-    open fun onReady() {
-        ready = true
-        pullForEvents()
-    }
-
-
-    open var taskMode: ActiveMode = ActiveMode.Active
-    open var isEnabled: Boolean = true
-    private val referencePool: MutableMap<String, Deferred<Boolean>> = mutableMapOf()
-    private fun referencePoolIsReadyForEvents(): Boolean {
-        return (referencePool.isEmpty() || referencePool.any { !it.value.isActive })
-    }
-
-    private var newEventProduced: Boolean = false
-
-    abstract fun getActiveTaskMode(): ActiveMode
-    abstract fun updateEnabledState(): Boolean
-
-    private var activePolls: Int = 0
-    data class PollStats(val active: Int, val total: Int)
-    fun getActivePolls(): PollStats {
-        return PollStats(active = activePolls, total = referencePool.values.size)
-    }
-
-
-    private var wasActiveNotify: Boolean = true
-    private fun onEventCollectionReceived(referenceId: String, events: List<T>) {
-        val orphanedReferences = referencePool.filter { !it.value.isActive }.filter { id -> id.key !in referenceId }.map { it.key }
-        orphanedReferences.forEach { id -> referencePool.remove(id) }
-
-        activePolls = referencePool.values.filter { it.isActive }.size
-
-        val isAvailable = if (referenceId in referencePool.keys) {
-            referencePool[referenceId]?.isActive != true
-        } else true
-
-        if (isAvailable) {
-            referencePool[referenceId] = coroutine.async {
-                onEventsReceived(events)
-            }
-        }
-
-    }
-
-    val bashingReferenceObject: MutableMap<String, MutableList<Pair<String, Long>>> = mutableMapOf()
-
-    private suspend fun onEventsReceived(events: List<T>): Boolean = coroutineScope {
-        val listeners = getListeners()
-        log.debug("onEventsReceived called with ${events.size} events for referenceId: ${events.firstOrNull()?.referenceId() ?: "unknown"}")
-        events.forEach { event ->
-            log.debug { "Processing event: ${event.eventType} with referenceId: ${event.referenceId()}" }
-            listeners.forEach { listener ->
-                log.debug { "Checking listener: ${listener::class.java.simpleName} for event: ${event.eventType}" }
-                if (listener.shouldIProcessAndHandleEvent(event, events)) {
-                    val consumableEvent = ConsumableEvent(event)
-                    listener.onEventsReceived(consumableEvent, events)
-                    if (consumableEvent.isConsumed) {
-                        val referenceId = events.first().referenceId()
-                        val listenerName = listener::class.java.simpleName
-                        val eventId = consumableEvent.metadata().eventId
-                        val bashingId = "$eventId-$listenerName"
-                        bashingReferenceObject.computeIfAbsent(referenceId) { mutableListOf() }.add(Pair(bashingId, System.currentTimeMillis()))
-
-                        // 🚨 Suppress logging hvis det er en deadlock
-                        if (EventDeadlockDetector.detect(referenceId, listenerName, event.eventType.toString())) {
-                            log.info { "Consumption detected for $referenceId -> $listenerName on event ${event.eventType}" }
-                            EventDeadlockDetector.resolve(referenceId, listenerName, event.eventType.toString())
-                        }
-
-                        val bashed = bashingReferenceObject[referenceId]?.takeLast(10) ?: emptyList()
-                        if (bashed.size == 10 && bashed.all { it.first == bashed.first().first }) {
-                            // We have entered a deadlock here
-                            // Due to the nature of the deadlock the event will be determined to be dead
-                            log.error { "Producing Failure on $referenceId on event ${event.eventType} due to deadlock in $listenerName" }
-                            listener.produceFailure(event)
-                        }
-
-                        return@coroutineScope true
-                    }
-                }
-            }
-        }
-        val threshold = System.currentTimeMillis() - 300_000
-        bashingReferenceObject.entries.removeIf { entry ->
-            entry.value.removeIf { it.second < threshold }
-            entry.value.isEmpty() // Fjern oppføringen hvis listen nå er tom
-        }
-        log.debug { "No consumption detected for ${events.first().referenceId()}" }
-        false
-    }
-
-    private var newEventsProducedOnReferenceId: AtomicReference<List<String>> = AtomicReference(emptyList())
-    var cachedReferenceList: MutableList<String> = mutableListOf()
-    private fun pullForEvents() {
-        coroutine.launch {
-            while (taskMode == ActiveMode.Active && coroutine.isActive && isEnabled) {
-
-                if (referencePoolIsReadyForEvents()) {
-                    log.debug { "New pull on database" }
-                    val referenceIdsAvailable = eventManager.getAvailableReferenceIds()
-
-                    val newReferenceIds = referenceIdsAvailable.subtract(cachedReferenceList.toSet())
-                    cachedReferenceList = referenceIdsAvailable.toMutableList()
-
-                    if (newReferenceIds.isNotEmpty()) {
-                        log.info { "New referenceIds found:\n\t -> ${newReferenceIds.joinToString("\n\t -> ")}" }
-                    }
-
-                    for (referenceId in referenceIdsAvailable) {
-                        val events = eventManager.readAvailableEventsFor(referenceId)
-                        onEventCollectionReceived(referenceId, events)
-                    }
-
-                    if (referenceIdsAvailable.isNotEmpty()) {
-                        if (pullDelay.get() != fastPullDelay.get()) {
-                            log.info { "Available events found, switching to fast pull @ Delay -> ${fastPullDelay.get()}" }
-                        }
-                        pullDelay.set(fastPullDelay.get())
-                    } else {
-                        if (pullDelay.get() != slowPullDelay.get()) {
-                            log.info { "No events available, switching to slow pull @ Delay -> ${slowPullDelay.get()}" }
-                        }
-                        pullDelay.set(slowPullDelay.get())
-                    }
-                }
-                waitForConditionOrTimeout(pullDelay.get()) {
-                    newEventProduced
-                }
-                newEventProduced = false
-            }
-            taskMode = getActiveTaskMode()
-        }
-        coroutine.launch {
-            while (taskMode == ActiveMode.Active && coroutine.isActive) {
-                val previousState = isEnabled
-                val iminentStatus = updateEnabledState()
-                if (previousState != iminentStatus) {
-                    log.info { "Observed change to enabled state, changed $previousState -> $iminentStatus" }
-                    if (iminentStatus) {
-                        log.info { "Ovserved change to enabled state, new state is enabled\n\tRestarting pullForEvents!" }
-                        onReady()
-                        return@launch
-                    }
-                }
-                delay(10_000)
-            }
-        }
-    }
-
-    private var cachedListeners: List<String> = emptyList()
-    @SuppressWarnings("unchecked cast")
-    fun getListeners(): List<EventListenerImpl<T, *>> {
-        val serviceBeans: Map<String, Any> = applicationContext.getBeansWithAnnotation(Service::class.java)
-
-        val beans = serviceBeans.values.stream()
-            .filter { bean: Any? -> bean is EventListenerImpl<*, *> }
-            .map { it -> it as EventListenerImpl<*, *> }
-            .toList()
-        val eventListeners: List<EventListenerImpl<T, *>> = beans as List<EventListenerImpl<T, *>>
-        val listenerNames = eventListeners.map { it::class.java.name }
-        if (listenerNames != cachedListeners) {
-            listenerNames.filter { it !in cachedListeners }.forEach {
-                log.info { "Registered new listener $it" }
-            }
-        }
-        cachedListeners = listenerNames
-        return eventListeners
-    }
-
-    var doNotProduce = System.getenv("DISABLE_PRODUCE").toBoolean() ?: false
-    /**
-     * @return true if its stored
-     */
-    fun produceNewEvent(event: T): Boolean {
-        if (doNotProduce) {
-            log.warn { "Do not produce is enabled!" }
-            newEventProduced = true
-            return true
-        }
-
-        val isStored = eventManager.storeEvent(event)
-        if (isStored) {
-            log.debug { "Stored event: ${event.eventType}" }
-            newEventProduced = true
-        } else {
-            log.error { "Failed to store event: ${event.eventType}" }
-        }
-        return isStored
-    }
-
-    suspend fun waitForConditionOrTimeout(timeout: Long, condition: () -> Boolean) {
-        val startTime = System.currentTimeMillis()
-        log.debug("Waiting for condition with timeout: $timeout ms")
-        try {
-            withTimeout(timeout) {
-                while (!condition()) {
-                    delay(100)
-                    if (System.currentTimeMillis() - startTime >= timeout) {
-                        log.debug("Condition not met within timeout: $timeout ms")
-                        break
-                    }
-                }
-            }
-        } catch (e: TimeoutCancellationException) {
-            // Do nothing
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-}
-
-enum class ActiveMode {
-    Active,
-    Passive
-}
\ No newline at end of file
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventListenerImpl.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventListenerImpl.kt
deleted file mode 100644
index c5588769..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventListenerImpl.kt
+++ /dev/null
@@ -1,122 +0,0 @@
-package no.iktdev.eventi.implementations
-
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.data.*
-import javax.annotation.PostConstruct
-
-abstract class EventListenerImpl<T: EventImpl, E: EventsManagerImpl<T>> {
-    abstract val coordinator: EventCoordinator<T, E>?
-
-    abstract val produceEvent: Any
-    abstract val listensForEvents: List<Any>
-
-    protected var active: Boolean = false
-    open fun isActive(): Boolean {
-        return active
-    }
-
-    open fun onReady() {
-
-    }
-
-    @PostConstruct
-    fun onCreated() {
-        onReady()
-    }
-
-    abstract fun getProducerName(): String
-
-    protected open fun onProduceEvent(event: T) {
-        coordinator?.produceNewEvent(event) ?: {
-            println("No Coordinator set")
-        }
-    }
-
-    abstract fun produceFailure(incomingEvent: T)
-
-
-    open fun isOfEventsIListenFor(event: T): Boolean {
-        return listensForEvents.any { it == event.eventType }
-    }
-
-    open fun isPrerequisitesFulfilled(incomingEvent: T, events: List<T>): Boolean {
-        return true
-    }
-
-    open fun shouldIHandleFailedEvents(incomingEvent: T): Boolean {
-        return false
-    }
-
-    open fun canProduceMultipleEvents(): Boolean {
-        return false
-    }
-
-    open fun havProducedDerivedEventOnIncomingEvent(incomingEvent: T, events: List<T>): Boolean {
-        val eventId = incomingEvent.eventId()
-        val producedEventsByListener = events.filter { it.eventType == produceEvent }
-        val consumedEvent = producedEventsByListener.find { it.metadata.derivedFromEventId == eventId }
-        if (consumedEvent != null) {
-            return true
-        }
-        return false
-    }
-
-
-    open fun haveProducedExpectedMessageBasedOnEvent(incomingEvent: T, events: List<T>): Boolean {
-        val eventsProducedByListener = events.filter { it.eventType == produceEvent }
-        val triggeredBy = events.filter { it.eventType in listensForEvents }
-        return eventsProducedByListener.any { it.derivedFromEventId() in triggeredBy.map { t -> t.eventId() } }
-    }
-
-    open fun shouldIProcessAndHandleEvent(incomingEvent: T, events: List<T>): Boolean {
-        if (listensForEvents.isEmpty()) {
-            return true
-        }
-        if (!isOfEventsIListenFor(incomingEvent))
-            return false
-        if (!isPrerequisitesFulfilled(incomingEvent, events)) {
-            return false
-        }
-        if (!incomingEvent.isSuccessful() && !shouldIHandleFailedEvents(incomingEvent)) {
-            return false
-        }
-
-        val childOf = events.filter { it.derivedFromEventId() == incomingEvent.eventId() }
-        val haveListenerProduced = childOf.any { it.eventType == produceEvent }
-        if (haveListenerProduced)
-            return false
-
-        if (events.any { it.eventType == produceEvent } && !canProduceMultipleEvents()) {
-            return false
-        }
-
-        if (!havProducedDerivedEventOnIncomingEvent(incomingEvent, events) && canProduceMultipleEvents()) {
-            return true
-        }
-
-        if (haveProducedExpectedMessageBasedOnEvent(incomingEvent, events))
-            return false
-
-
-        return true
-    }
-
-
-    /**
-     * @param incomingEvent Can be a new event or iterated form sequence in order to re-produce events
-     * @param events Will be all available events for collection with the same reference id
-     * @return boolean if read or not
-     */
-    abstract fun onEventsReceived(incomingEvent: ConsumableEvent<T>, events: List<T>)
-
-    fun T.makeDerivedEventInfo(status: EventStatus, source: String): EventMetadata {
-        return EventMetadata(
-            referenceId = this.metadata.referenceId,
-            derivedFromEventId = this.metadata.eventId,
-            status = status,
-            source = source
-        )
-    }
-
-
-}
\ No newline at end of file
diff --git a/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventsManagerImpl.kt b/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventsManagerImpl.kt
deleted file mode 100644
index 1ac0e4ff..00000000
--- a/shared/eventi/src/main/kotlin/no/iktdev/eventi/implementations/EventsManagerImpl.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package no.iktdev.eventi.implementations
-
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.database.DataSource
-
-/**
- * Interacts with the database, needs to be within the Coordinator
- */
-abstract class EventsManagerImpl<T: EventImpl>(val dataSource: DataSource) {
-
-    abstract fun getAvailableReferenceIds(): List<String>
-    abstract fun readAvailableEvents(): List<List<T>>
-    abstract fun readAvailableEventsFor(referenceId: String): List<T>
-
-    abstract fun getAllEvents(): List<List<T>>
-    abstract fun getEventsWith(referenceId: String): List<T>
-
-    abstract fun storeEvent(event: T): Boolean
-}
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiApplication.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiApplication.kt
deleted file mode 100644
index cc0d37b2..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiApplication.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * This is only to run the code and verify behavior
- */
-
-package no.iktdev.eventi
-
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.implementations.EventsManagerImpl
-import no.iktdev.eventi.mock.MockEventManager
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.runApplication
-import org.springframework.context.ApplicationContext
-import org.springframework.context.annotation.Bean
-
-
-@SpringBootApplication
-class EventiApplication {
-    @Autowired
-    lateinit var applicationContext: ApplicationContext
-
-    @Bean
-    fun eventManager(): EventsManagerImpl<EventImpl> {
-        return MockEventManager()
-    }
-}
-
-fun main() {
-    runApplication<EventiApplication>()
-}
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiApplicationTests.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiApplicationTests.kt
deleted file mode 100644
index 1d414aaf..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiApplicationTests.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package no.iktdev.eventi
-
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.implementations.EventCoordinator
-import no.iktdev.eventi.mock.MockEventManager
-import org.assertj.core.api.Assertions
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.context.ApplicationContext
-
-@SpringBootTest(classes = [EventiApplication::class])
-class EventiApplicationTests {
-
-    @Autowired
-    lateinit var context: ApplicationContext
-
-    @Autowired
-    var coordinator: EventCoordinator<EventImpl, MockEventManager>? = null
-
-    @BeforeEach
-    fun awaitCreationOfCoordinator() {
-
-        runBlocking {
-            while (coordinator?.isReady() != true) {
-                delay(100)
-            }
-        }
-
-    }
-
-    @Test
-    fun contextLoads() {
-        Assertions.assertThat(coordinator?.getListeners()).isNotEmpty()
-    }
-
-}
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiImplementationBase.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiImplementationBase.kt
deleted file mode 100644
index 24771b31..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/EventiImplementationBase.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package no.iktdev.eventi
-
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.implementations.EventsManagerImpl
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.test.context.junit.jupiter.SpringExtension
-import java.util.concurrent.TimeUnit
-
-@ExtendWith(SpringExtension::class)
-open class EventiImplementationBase: EventiApplicationTests() {
-
-    @BeforeEach
-    fun clearData() {
-        coordinator!!.eventManager.events.clear()
-    }
-
-    @Autowired
-    var eventManager: EventsManagerImpl<EventImpl>? = null
-
-    @Test
-    fun validateCoordinatorConstruction() {
-        assertThat(eventManager).isNotNull()
-        assertThat(eventManager?.dataSource).isNotNull()
-        assertThat(coordinator).isNotNull()
-        assertThat(coordinator?.eventManager?.dataSource).isNotNull()
-    }
-
-    private val timeout = 3_00000
-    /**
-     * @return true when
-     */
-    fun runPull(condition: () -> Boolean): Boolean {
-        val startTime = System.currentTimeMillis()
-
-        while (System.currentTimeMillis() - startTime < timeout) {
-            if (condition()) {
-                return true
-            }
-            TimeUnit.MILLISECONDS.sleep(500)
-        }
-        return condition()
-    }
-
-    fun getEvents(): List<List<EventImpl>> {
-        return coordinator?.eventManager?.readAvailableEvents() ?: emptyList()
-    }
-
-
-}
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/TestConfig.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/TestConfig.kt
deleted file mode 100644
index f157ae4e..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/TestConfig.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package no.iktdev.eventi
-
-import org.springframework.beans.factory.support.DefaultListableBeanFactory
-import org.springframework.context.ApplicationContext
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider
-import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Primary
-import org.springframework.context.support.GenericApplicationContext
-import org.springframework.core.type.filter.AnnotationTypeFilter
-import org.springframework.stereotype.Service
-import java.util.*
-
-
-@Configuration
-class TestConfig {
-
-    companion object {
-        val persistentReferenceId: String = "00000000-0000-0000-0000-000000000000"
-    }
-
-}
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockDataEventListener.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockDataEventListener.kt
deleted file mode 100644
index 2ab0dd4a..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockDataEventListener.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.eventi.mock
-
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.implementations.EventCoordinator
-import no.iktdev.eventi.implementations.EventListenerImpl
-
-abstract class MockDataEventListener() : EventListenerImpl<EventImpl, MockEventManager>() {
-    abstract override val produceEvent: Any
-    abstract override val listensForEvents: List<Any>
-    abstract override val coordinator: MockEventCoordinator?
-}
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockDataSource.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockDataSource.kt
deleted file mode 100644
index bee6d53d..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockDataSource.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package no.iktdev.eventi.mock
-
-import no.iktdev.eventi.database.DatabaseConnectionConfig
-import no.iktdev.eventi.database.DataSource
-import org.jetbrains.exposed.sql.Database
-import org.jetbrains.exposed.sql.Table
-
-
-val fakeDatabasConfig = DatabaseConnectionConfig(
-    address = "0.0.0.0",
-    port = "3033",
-    username = "TST",
-    password = "TST",
-    databaseName = "events"
-)
-
-class MockDataSource(): DataSource(fakeDatabasConfig) {
-    override fun connect() {}
-
-    override fun createDatabase(): Database? { return null }
-
-    override fun createTables(vararg tables: Table) {}
-
-    override fun createDatabaseStatement(): String { return "" }
-
-    override fun toConnectionUrl(): String { return "" }
-
-    override fun toDatabaseConnectionUrl(database: String): String { return "" }
-
-    override fun toDatabase(): Database { TODO("Not yet implemented") }
-
-}
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventCoordinator.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventCoordinator.kt
deleted file mode 100644
index a15bb5d0..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventCoordinator.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package no.iktdev.eventi.mock
-
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.implementations.ActiveMode
-import no.iktdev.eventi.implementations.EventCoordinator
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.context.ApplicationContext
-import org.springframework.stereotype.Component
-
-
-@Component
-class MockEventCoordinator(
-    @Autowired
-    override var applicationContext: ApplicationContext,
-    @Autowired
-    override var eventManager: MockEventManager
-
-) : EventCoordinator<EventImpl, MockEventManager>() {
-    override fun getActiveTaskMode(): ActiveMode {
-        return ActiveMode.Active
-    }
-}
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventManager.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventManager.kt
deleted file mode 100644
index 3f777ed1..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/MockEventManager.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package no.iktdev.eventi.mock
-
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.implementations.EventsManagerImpl
-import org.springframework.stereotype.Component
-
-@Component
-class MockEventManager(dataSource: MockDataSource = MockDataSource()) : EventsManagerImpl<EventImpl>(dataSource) {
-    val events: MutableList<EventImpl> = mutableListOf()
-    override fun getAvailableReferenceIds(): List<String> {
-        throw RuntimeException("Not implemented")
-    }
-
-    override fun readAvailableEvents(): List<List<EventImpl>> {
-        return listOf(events)
-    }
-
-    override fun readAvailableEventsFor(referenceId: String): List<EventImpl> {
-        return events.filter { it.metadata.referenceId == referenceId }
-    }
-
-    override fun getAllEvents(): List<List<EventImpl>> {
-        return listOf(events)
-    }
-
-    override fun getEventsWith(referenceId: String): List<EventImpl> {
-        return events
-    }
-
-    override fun storeEvent(event: EventImpl): Boolean {
-        return events.add(event)
-    }
-}
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/FirstEvent.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/FirstEvent.kt
deleted file mode 100644
index e720b3cf..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/FirstEvent.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.eventi.mock.data
-
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.EventMetadata
-
-data class FirstEvent(
-    override val metadata: EventMetadata,
-    override val eventType: String = "First",
-    override val data: String
-): EventImpl() {
-}
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/InitEvent.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/InitEvent.kt
deleted file mode 100644
index eccc30e2..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/InitEvent.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.eventi.mock.data
-
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.EventMetadata
-
-data class InitEvent(
-    override val metadata: EventMetadata,
-    override val eventType: String = "Init",
-    override val data: String
-): EventImpl() {
-}
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/SecondEvent.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/SecondEvent.kt
deleted file mode 100644
index 9b49c016..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/SecondEvent.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package no.iktdev.eventi.mock.data
-
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.EventMetadata
-
-data class SecondEvent(
-    override val metadata: EventMetadata,
-    override val eventType: String = "Second",
-    override val data: ElementsToCreate = ElementsToCreate()
-): EventImpl() {
-}
-
-data class ElementsToCreate(
-    val elements: List<String> = listOf("eple", "banan", "appelsin", "drue", "pære")
-)
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/ThirdEvent.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/ThirdEvent.kt
deleted file mode 100644
index 6446d0ae..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/data/ThirdEvent.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.iktdev.eventi.mock.data
-
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.EventMetadata
-
-data class ThirdEvent(
-    override val metadata: EventMetadata,
-    override val eventType: String = "Third",
-    override val data: String
-): EventImpl() {
-}
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/FirstEventListener.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/FirstEventListener.kt
deleted file mode 100644
index ca50a2a5..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/FirstEventListener.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package no.iktdev.eventi.mock.listeners
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.mock.MockDataEventListener
-import no.iktdev.eventi.mock.MockEventCoordinator
-import no.iktdev.eventi.mock.data.FirstEvent
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class FirstEventListener() : MockDataEventListener() {
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: MockEventCoordinator? = null
-
-    private val log = KotlinLogging.logger {}
-
-    init {
-        log.info { "Created Service: ${this::class.java.simpleName}" }
-    }
-
-    override val produceEvent = this::class.java.simpleName
-    override val listensForEvents = listOf("Init")
-
-
-    override fun onProduceEvent(event: EventImpl) {
-        super.onProduceEvent(event)
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<EventImpl>, events: List<EventImpl>) {
-        val info = incomingEvent.consume()!!.makeDerivedEventInfo(EventStatus.Success, getProducerName())
-        onProduceEvent(FirstEvent(
-            eventType = produceEvent,
-            metadata = info,
-            data = "Potet"
-        ))
-    }
-
-
-}
-
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/ForthEventListener.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/ForthEventListener.kt
deleted file mode 100644
index 01968147..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/ForthEventListener.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package no.iktdev.eventi.mock.listeners
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.implementations.EventCoordinator
-import no.iktdev.eventi.implementations.EventListenerImpl
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.mock.MockDataEventListener
-import no.iktdev.eventi.mock.MockEventCoordinator
-import no.iktdev.eventi.mock.data.InitEvent
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class ForthEventListener() : MockDataEventListener() {
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: MockEventCoordinator? = null
-
-    private val log = KotlinLogging.logger {}
-
-    init {
-        log.info { "Created Service: ${this::class.java.simpleName}" }
-    }
-
-    override val produceEvent = this::class.java.simpleName
-    override val listensForEvents = listOf(ThirdEventListener::class.java.simpleName)
-
-
-    override fun onProduceEvent(event: EventImpl) {
-        super.onProduceEvent(event)
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<EventImpl>, events: List<EventImpl>) {
-        val event = incomingEvent.consume()
-        if (event == null)
-            return
-        val info = event.makeDerivedEventInfo(EventStatus.Success, getProducerName())
-        onProduceEvent(InitEvent(
-            eventType = produceEvent,
-            metadata = info,
-            data = event as String
-        ))
-
-    }
-
-}
-
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/SecondEventListener.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/SecondEventListener.kt
deleted file mode 100644
index 7a721174..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/SecondEventListener.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package no.iktdev.eventi.mock.listeners
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.mock.MockDataEventListener
-import no.iktdev.eventi.mock.MockEventCoordinator
-import no.iktdev.eventi.mock.data.SecondEvent
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class SecondEventListener() : MockDataEventListener() {
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: MockEventCoordinator? = null
-
-    private val log = KotlinLogging.logger {}
-
-    init {
-        log.info { "Created Service: ${this::class.java.simpleName}" }
-    }
-
-    override val produceEvent = this::class.java.simpleName
-    override val listensForEvents = listOf(FirstEventListener::class.java.simpleName)
-
-
-    override fun onProduceEvent(event: EventImpl) {
-        super.onProduceEvent(event)
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<EventImpl>, events: List<EventImpl>) {
-        val event = incomingEvent.consume()
-        if (event == null)
-            return
-        val info = event.makeDerivedEventInfo(EventStatus.Success,getProducerName())
-        onProduceEvent(SecondEvent(
-            eventType = produceEvent,
-            metadata = info
-        ))
-    }
-
-}
-
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/ThirdEventListener.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/ThirdEventListener.kt
deleted file mode 100644
index 60f10826..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/mock/listeners/ThirdEventListener.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package no.iktdev.eventi.mock.listeners
-
-import mu.KotlinLogging
-import no.iktdev.eventi.core.ConsumableEvent
-import no.iktdev.eventi.implementations.EventCoordinator
-import no.iktdev.eventi.implementations.EventListenerImpl
-import no.iktdev.eventi.data.EventImpl
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.mock.MockDataEventListener
-import no.iktdev.eventi.mock.MockEventCoordinator
-import no.iktdev.eventi.mock.data.SecondEvent
-import no.iktdev.eventi.mock.data.ThirdEvent
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class ThirdEventListener() : MockDataEventListener() {
-
-    override fun getProducerName(): String {
-        return this::class.java.simpleName
-    }
-
-    @Autowired
-    override var coordinator: MockEventCoordinator? = null
-
-    private val log = KotlinLogging.logger {}
-
-    init {
-        log.info { "Created Service: ${this::class.java.simpleName}" }
-    }
-
-    override val produceEvent = this::class.java.simpleName
-    override val listensForEvents = listOf(SecondEventListener::class.java.simpleName)
-
-
-    override fun  onProduceEvent(event: EventImpl) {
-        super.onProduceEvent(event)
-    }
-
-    override fun onEventsReceived(incomingEvent: ConsumableEvent<EventImpl>, events: List<EventImpl>) {
-        val event = incomingEvent.consume()
-        if (event == null)
-            return
-        val info = event.makeDerivedEventInfo(EventStatus.Success, getProducerName())
-        (event as SecondEvent).data.elements.forEach { element ->
-            onProduceEvent(ThirdEvent(
-                eventType = produceEvent,
-                metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
-                data = element
-            )
-            )
-        }
-
-    }
-
-}
-
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/FirstEventListenerImplTestBase.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/FirstEventListenerImplTestBase.kt
deleted file mode 100644
index cbd90948..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/FirstEventListenerImplTestBase.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package no.iktdev.eventi.tests
-
-import no.iktdev.eventi.EventiImplementationBase
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.mock.data.FirstEvent
-import no.iktdev.eventi.mock.data.InitEvent
-import no.iktdev.eventi.mock.listeners.FirstEventListener
-import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-/*
-
-class FirstEventListenerImplTestBase : EventiImplementationBase() {
-
-
-    @BeforeEach
-    fun validateCreationAndAccess() {
-        assertThat(
-            coordinator!!.getListeners()
-                .find { it::class.simpleName == FirstEventListener::class.simpleName }).isNotNull()
-        coordinator!!.eventManager.events.clear()
-        coordinator!!.produceNewEvent(
-            InitEvent(
-                metadata = EventMetadata(
-                    referenceId = "00000000-0000-0000-0000-000000000000",
-                    status = EventStatus.Success
-                ),
-                data = "Init data"
-            )
-        )
-    }
-
-    @Test
-    fun validate1() {
-        val events = coordinator?.eventManager?.readAvailableEvents() ?: emptyList()
-        assertThat(events.any { it is FirstEvent }).isTrue()
-    }
-
-    @Test
-    fun validate2() {
-        coordinator!!.produceNewEvent(
-            InitEvent(
-                metadata = EventMetadata(
-                    referenceId = "00000000-0000-0000-0000-000000000001",
-                    status = EventStatus.Success
-                ),
-                data = "Init data"
-            )
-        )
-        val events = coordinator?.eventManager?.readAvailableEvents() ?: emptyList()
-        assertThat(events.filterIsInstance<FirstEvent>().distinctBy { it.metadata.referenceId }).hasSize(2)
-    }
-}*/
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/ForthEventListenerImplTestBase.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/ForthEventListenerImplTestBase.kt
deleted file mode 100644
index 56dacd4a..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/ForthEventListenerImplTestBase.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package no.iktdev.eventi.tests
-
-import kotlinx.coroutines.runBlocking
-import no.iktdev.eventi.EventiImplementationBase
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.mock.data.ElementsToCreate
-import no.iktdev.eventi.mock.data.InitEvent
-import no.iktdev.eventi.mock.listeners.FirstEventListener
-import no.iktdev.eventi.mock.listeners.ForthEventListener
-import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-
-/*
-class ForthEventListenerImplTestBase : EventiImplementationBase() {
-
-
-    @BeforeEach
-    fun validateCreationAndAccess() {
-        assertThat(
-            coordinator!!.getListeners()
-                .find { it::class.simpleName == FirstEventListener::class.simpleName }).isNotNull()
-        coordinator!!.eventManager.events.clear()
-        coordinator!!.produceNewEvent(
-            InitEvent(
-                metadata = EventMetadata(
-                    referenceId = "00000000-0000-0000-0000-000000000000",
-                    status = EventStatus.Success
-                ),
-                data = "Init data"
-            )
-        )
-    }
-
-    @Test
-    fun validate1(): Unit = runBlocking {
-        runPull { getEvents().size > ElementsToCreate().elements.size *2 }
-        val events = getEvents()
-        assertThat(events.filter { it.eventType == ForthEventListener::class.java.simpleName }).hasSize(
-            ElementsToCreate().elements.size)
-    }
-}*/
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/SecondEventListenerImplTestBase.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/SecondEventListenerImplTestBase.kt
deleted file mode 100644
index 9df1f276..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/SecondEventListenerImplTestBase.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package no.iktdev.eventi.tests
-
-import no.iktdev.eventi.EventiImplementationBase
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.mock.data.InitEvent
-import no.iktdev.eventi.mock.data.SecondEvent
-import no.iktdev.eventi.mock.listeners.FirstEventListener
-import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-
-/*
-class SecondEventListenerImplTestBase : EventiImplementationBase() {
-
-
-    @BeforeEach
-    fun validateCreationAndAccess() {
-        assertThat(
-            coordinator!!.getListeners()
-                .find { it::class.simpleName == FirstEventListener::class.simpleName }).isNotNull()
-        coordinator!!.eventManager.events.clear()
-        coordinator!!.produceNewEvent(
-            InitEvent(
-                metadata = EventMetadata(
-                    referenceId = "00000000-0000-0000-0000-000000000000",
-                    status = EventStatus.Success
-                ),
-                data = "Init data"
-            )
-        )
-    }
-
-    @Test
-    fun validate1() {
-        runPull { getEvents().size > 2 }
-        val events = coordinator?.eventManager?.readAvailableEvents() ?: emptyList()
-        assertThat(events.filterIsInstance<SecondEvent>()).hasSize(2)
-        assertThat(events.filterIsInstance<SecondEvent>().distinctBy { it.metadata.referenceId }).hasSize(2)
-    }
-}*/
\ No newline at end of file
diff --git a/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/ThirdEventListenerImplTestBase.kt b/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/ThirdEventListenerImplTestBase.kt
deleted file mode 100644
index 24c04ca8..00000000
--- a/shared/eventi/src/test/kotlin/no/iktdev/eventi/tests/ThirdEventListenerImplTestBase.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package no.iktdev.eventi.tests
-
-import no.iktdev.eventi.EventiImplementationBase
-import no.iktdev.eventi.data.EventMetadata
-import no.iktdev.eventi.data.EventStatus
-import no.iktdev.eventi.mock.data.ElementsToCreate
-import no.iktdev.eventi.mock.data.InitEvent
-import no.iktdev.eventi.mock.listeners.FirstEventListener
-import no.iktdev.eventi.mock.listeners.ThirdEventListener
-import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-
-/*
-class ThirdEventListenerImplTestBase : EventiImplementationBase() {
-
-
-    @BeforeEach
-    fun validateCreationAndAccess() {
-        assertThat(
-            coordinator!!.getListeners()
-                .find { it::class.simpleName == FirstEventListener::class.simpleName }).isNotNull()
-        coordinator!!.eventManager.events.clear()
-        coordinator!!.produceNewEvent(
-            InitEvent(
-                metadata = EventMetadata(
-                    referenceId = "00000000-0000-0000-0000-000000000000",
-                    status = EventStatus.Success
-                ),
-                data = "Init data"
-            )
-        )
-    }
-
-    @Test
-    fun validate1() {
-        val events = coordinator?.eventManager?.readAvailableEvents() ?: emptyList()
-        assertThat(events).hasSize(3 + ElementsToCreate().elements.size)
-        assertThat(events.filter { it.eventType == ThirdEventListener::class.java.simpleName }).hasSize(ElementsToCreate().elements.size)
-    }
-}*/
\ No newline at end of file