diff --git a/Service/CMakeLists.txt b/Service/CMakeLists.txt
index f1282e8457656c8227c768ef261d89febaf9bae0..24ff600bbc724865bb12782e5710849a7b1fd3c2 100644
--- a/Service/CMakeLists.txt
+++ b/Service/CMakeLists.txt
@@ -1,3 +1,3 @@
-# add_subdirectory(EventSeeder)
+add_subdirectory(EventSeeder)
 add_subdirectory(GearSvc)
 add_subdirectory(TrackSystemSvc)
diff --git a/Service/EventSeeder/CMakeLists.txt b/Service/EventSeeder/CMakeLists.txt
index 8bf504d85fbab7043e0fcd82e7b45043fc9b7347..7d73ab625d847bb8ab5efa5ea586a333bc0c04da 100644
--- a/Service/EventSeeder/CMakeLists.txt
+++ b/Service/EventSeeder/CMakeLists.txt
@@ -1,14 +1,12 @@
-gaudi_subdir(EventSeeder v0r0)
-
-#find_package(GEAR REQUIRED)
 
 set(EventSeeder_srcs
-    src/*.cpp
+    src/MarlinEvtSeeder.cpp
 )
 
-gaudi_install_headers(EventSeeder)
+gaudi_add_header_only_library(EventSeeder)
 
-gaudi_add_module(EventSeeder ${EventSeeder_srcs}
-    INCLUDE_DIRS GaudiKernel
-    LINK_LIBRARIES GaudiKernel
+gaudi_add_module(EventSeederPlugins
+                 SOURCES ${EventSeeder_srcs}
+                 LINK EventSeeder
+                      Gaudi::GaudiKernel
 )
diff --git a/Service/EventSeeder/EventSeeder/IEventSeeder.h b/Service/EventSeeder/include/EventSeeder/IEventSeeder.h
similarity index 100%
rename from Service/EventSeeder/EventSeeder/IEventSeeder.h
rename to Service/EventSeeder/include/EventSeeder/IEventSeeder.h