diff --git a/modules/events-mod/build.gradle.kts b/modules/events-mod/build.gradle.kts
index 12fee4b..c44ed62 100644
--- a/modules/events-mod/build.gradle.kts
+++ b/modules/events-mod/build.gradle.kts
@@ -97,7 +97,7 @@ val installEventsTsSchema by tasks.registering(Sync::class) {
 
   dependsOn(typescriptEventsSchema)
 
-  val outputDir = layout.projectDirectory.dir("src/main/typescript/schema")
+  val outputDir = layout.projectDirectory.dir("src/main/typescript/generated/kafkatorio-schema")
   outputs.dir(outputDir)
 
   from(
diff --git a/modules/events-mod/src/main/typescript/control.ts b/modules/events-mod/src/main/typescript/control.ts
index 5448f13..a195c76 100644
--- a/modules/events-mod/src/main/typescript/control.ts
+++ b/modules/events-mod/src/main/typescript/control.ts
@@ -1,5 +1,5 @@
 import {handleConfigurationUpdate} from "./main/config-update/handleConfigurationUpdate";
 
-require("events")
+require("./main/events")
 
 script.on_configuration_changed(handleConfigurationUpdate)
diff --git a/modules/events-mod/src/main/typescript/schema/config-update.d.ts b/modules/events-mod/src/main/typescript/generated/kafkatorio-schema/config-update.d.ts
similarity index 100%
rename from modules/events-mod/src/main/typescript/schema/config-update.d.ts
rename to modules/events-mod/src/main/typescript/generated/kafkatorio-schema/config-update.d.ts
diff --git a/modules/events-mod/src/main/typescript/schema/object-data.d.ts b/modules/events-mod/src/main/typescript/generated/kafkatorio-schema/object-data.d.ts
similarity index 100%
rename from modules/events-mod/src/main/typescript/schema/object-data.d.ts
rename to modules/events-mod/src/main/typescript/generated/kafkatorio-schema/object-data.d.ts
diff --git a/modules/events-mod/src/main/typescript/schema/prototype.d.ts b/modules/events-mod/src/main/typescript/generated/kafkatorio-schema/prototype.d.ts
similarity index 100%
rename from modules/events-mod/src/main/typescript/schema/prototype.d.ts
rename to modules/events-mod/src/main/typescript/generated/kafkatorio-schema/prototype.d.ts
diff --git a/modules/events-mod/src/main/typescript/schema/schema.d.ts b/modules/events-mod/src/main/typescript/generated/kafkatorio-schema/schema.d.ts
similarity index 100%
rename from modules/events-mod/src/main/typescript/schema/schema.d.ts
rename to modules/events-mod/src/main/typescript/generated/kafkatorio-schema/schema.d.ts
diff --git a/modules/events-mod/src/main/typescript/events.ts b/modules/events-mod/src/main/typescript/main/events.ts
similarity index 100%
rename from modules/events-mod/src/main/typescript/events.ts
rename to modules/events-mod/src/main/typescript/main/events.ts
diff --git a/modules/events-mod/src/main/typescript/events/emitter.ts b/modules/events-mod/src/main/typescript/main/events/emitter.ts
similarity index 100%
rename from modules/events-mod/src/main/typescript/events/emitter.ts
rename to modules/events-mod/src/main/typescript/main/events/emitter.ts
diff --git a/modules/events-mod/src/main/typescript/events/handlers.ts b/modules/events-mod/src/main/typescript/main/events/handlers.ts
similarity index 100%
rename from modules/events-mod/src/main/typescript/events/handlers.ts
rename to modules/events-mod/src/main/typescript/main/events/handlers.ts
diff --git a/modules/events-mod/src/main/typescript/events/serdes.ts b/modules/events-mod/src/main/typescript/main/events/serdes.ts
similarity index 100%
rename from modules/events-mod/src/main/typescript/events/serdes.ts
rename to modules/events-mod/src/main/typescript/main/events/serdes.ts
diff --git a/modules/events-mod/src/main/typescript/prototypes/emitPrototypes.ts b/modules/events-mod/src/main/typescript/main/prototypes/emitPrototypes.ts
similarity index 100%
rename from modules/events-mod/src/main/typescript/prototypes/emitPrototypes.ts
rename to modules/events-mod/src/main/typescript/main/prototypes/emitPrototypes.ts