diff --git a/api-openbis-typescript/build.gradle b/api-openbis-typescript/build.gradle
index 1b3e28f46ca395540d2b4cbc41fb498bb9843edd..5f3a3e850a87c27097244556231b07770eb596ba 100644
--- a/api-openbis-typescript/build.gradle
+++ b/api-openbis-typescript/build.gradle
@@ -49,9 +49,9 @@ generateTypeScript {
             "ch.ethz.sis.openbis.generic.dssapi.v3.dto.common.operation.IOperationResult:dss_dto_common_operation_IOperationResult"
     ]
     extensionsWithConfiguration = [
-            new ConfiguredExtension(className: 'ch.empa.tsprocessor.AddMethodsExtension', configuration: ['asyncClasses': "[\"ch.ethz.sis.openbis.generic.OpenBIS\"]"]),
-            new ConfiguredExtension(className: 'ch.empa.tsprocessor.RemovePropertiesExtension'),
-            new ConfiguredExtension(className: 'ch.empa.tsprocessor.AddOpenBISModuleExtension')
+            new ConfiguredExtension(className: 'ch.ethz.sis.openbis.generic.typescript.AddMethodsExtension', configuration: ['asyncClasses': "[\"ch.ethz.sis.openbis.generic.OpenBIS\"]"]),
+            new ConfiguredExtension(className: 'ch.ethz.sis.openbis.generic.typescript.RemovePropertiesExtension'),
+            new ConfiguredExtension(className: 'ch.ethz.sis.openbis.generic.typescript.AddOpenBISModuleExtension')
     ]
     jackson2ModuleDiscovery = true
     outputFile = file('../api-openbis-javascript/src/v3/openbis.d.ts')
diff --git a/api-openbis-typescript/source/java/ch/empa/tsprocessor/AddMethodsExtension.java b/api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/AddMethodsExtension.java
similarity index 99%
rename from api-openbis-typescript/source/java/ch/empa/tsprocessor/AddMethodsExtension.java
rename to api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/AddMethodsExtension.java
index 8f4b248036d42bfdc94685dc0547cb0dabbde9df..b7e5fae615cf9a99595c8431afa3a0d0b59ddd32 100644
--- a/api-openbis-typescript/source/java/ch/empa/tsprocessor/AddMethodsExtension.java
+++ b/api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/AddMethodsExtension.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-package ch.empa.tsprocessor;
+package ch.ethz.sis.openbis.generic.typescript;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/api-openbis-typescript/source/java/ch/empa/tsprocessor/AddOpenBISModuleExtension.java b/api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/AddOpenBISModuleExtension.java
similarity index 98%
rename from api-openbis-typescript/source/java/ch/empa/tsprocessor/AddOpenBISModuleExtension.java
rename to api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/AddOpenBISModuleExtension.java
index 5b37d90c2ec8661b4ff248862aaf348a75674964..64c1b7409df0bca115484c82e72733c70c0445fc 100644
--- a/api-openbis-typescript/source/java/ch/empa/tsprocessor/AddOpenBISModuleExtension.java
+++ b/api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/AddOpenBISModuleExtension.java
@@ -1,4 +1,4 @@
-package ch.empa.tsprocessor;
+package ch.ethz.sis.openbis.generic.typescript;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/api-openbis-typescript/source/java/ch/empa/tsprocessor/RemovePropertiesExtension.java b/api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/RemovePropertiesExtension.java
similarity index 96%
rename from api-openbis-typescript/source/java/ch/empa/tsprocessor/RemovePropertiesExtension.java
rename to api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/RemovePropertiesExtension.java
index 7a6672518c527b11c7df4a2ef8eb1e4816d0442f..bb29c8935a3c67f4a9a85cc0a8ce679d28a874a9 100644
--- a/api-openbis-typescript/source/java/ch/empa/tsprocessor/RemovePropertiesExtension.java
+++ b/api-openbis-typescript/source/java/ch/ethz/sis/openbis/generic/typescript/RemovePropertiesExtension.java
@@ -1,4 +1,4 @@
-package ch.empa.tsprocessor;
+package ch.ethz.sis.openbis.generic.typescript;
 
 import java.util.Collections;
 import java.util.List;