diff --git a/common/source/java/ch/systemsx/cisd/common/interpreter/PythonInterpreter.java b/common/source/java/ch/systemsx/cisd/common/jython/PythonInterpreter.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/interpreter/PythonInterpreter.java
rename to common/source/java/ch/systemsx/cisd/common/jython/PythonInterpreter.java
index 616ad2a4432415a2da3d24023b78ea6a561a3e7c..43438c5b1ac31f6032a3678e8f321fc7e7f6952e 100644
--- a/common/source/java/ch/systemsx/cisd/common/interpreter/PythonInterpreter.java
+++ b/common/source/java/ch/systemsx/cisd/common/jython/PythonInterpreter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.interpreter;
+package ch.systemsx.cisd.common.jython;
 
 import org.apache.log4j.Logger;
 import org.python.core.PyObject;
diff --git a/common/source/java/ch/systemsx/cisd/common/jython/evaluator/Evaluator.java b/common/source/java/ch/systemsx/cisd/common/jython/evaluator/Evaluator.java
index b2fd759aa5b81e29c7a76d4d55ee1e0ff859e4c4..df1ed26d8f9f6e9e708dbf1eb2fd8e8d35485cc7 100644
--- a/common/source/java/ch/systemsx/cisd/common/jython/evaluator/Evaluator.java
+++ b/common/source/java/ch/systemsx/cisd/common/jython/evaluator/Evaluator.java
@@ -39,7 +39,7 @@ import org.python.core.PyStringMap;
 import org.python.core.PySystemState;
 import org.python.core.PyTraceback;
 
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
 import ch.systemsx.cisd.common.shared.basic.utils.CommaSeparatedListBuilder;
 
 /**
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/JythonUtils.java b/common/source/java/ch/systemsx/cisd/common/utilities/JythonUtils.java
index 02479f0bea2da643d98eb293842ee0f4193bff2b..7db6a0425a4566c9d31df249717e7fbecea1df6f 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/JythonUtils.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/JythonUtils.java
@@ -25,7 +25,7 @@ import org.python.core.PyFunction;
 import org.python.core.PyObject;
 import org.python.core.PySequenceList;
 
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
 
 /**
  * Jython utility methods.
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/jython/JythonScriptSplitterTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/jython/JythonScriptSplitterTest.java
index f67e59aac9029e7b53394507620698dfc3262903..95055952c677b389532433b48f9b58dad086a5cc 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/jython/JythonScriptSplitterTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/jython/JythonScriptSplitterTest.java
@@ -25,7 +25,6 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
 
 /**
  * @author pkupczyk
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
index a3c4ed6facf5cdf7ab898f2b20f826bbe81c1ef8..df5fad34fa74996b3855f0b98dd9301b4e438c90 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
@@ -27,7 +27,7 @@ import org.python.core.PyObject;
 import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
 import ch.systemsx.cisd.common.exceptions.NotImplementedException;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
 import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
 import ch.systemsx.cisd.common.utilities.PropertyUtils;
 import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistratorDelegate;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java
index d6ba93711a02c00fd236205e7068e81c473bfc2f..41dd6e633c812f8ac1136ad29feb82ec86af0723 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java
@@ -41,7 +41,7 @@ public class DataSetRegistrationServiceV2<T extends DataSetInformation> extends
     {
         super(registrator, incomingDataSetFile, userProvidedDataSetInformationOrNull,
                 globalCleanAfterwardsAction, delegate,
-                new ch.systemsx.cisd.common.interpreter.PythonInterpreter()
+                new ch.systemsx.cisd.common.jython.PythonInterpreter()
                     {
                         @Override
                         public void set(String name, Object value)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java
index 55988f477e0ef537e82bb73524c3c2c6d57c1830..4766708fdc71509cc208e4d4be010b4ce207d77c 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java
@@ -23,7 +23,7 @@ import org.python.core.PyObject;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.common.exceptions.NotImplementedException;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.utilities.JythonUtils;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java
index 2acacc59622b47dd3ef3ef16571d80283622eac4..af5037a4fa7748266dfda79eeb1cc2355def50d0 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import java.io.File;
 
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
 import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
 import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistratorDelegate;
 import ch.systemsx.cisd.etlserver.TopLevelDataSetRegistratorGlobalState;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
index bad4ef963045355892ed6fd07c4486e4e6928e2e..4b2a2d0f75cceb1a86d30edff9054a3617103bac 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v2;
 import java.io.File;
 
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
 import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
 import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistratorDelegate;
 import ch.systemsx.cisd.etlserver.TopLevelDataSetRegistratorGlobalState;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
index 01ebac526ba7475fcd1b1884dc027bb0cb71d3dc..1e795fc92be35b06702a9302cc17b6f15d3738ca 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
@@ -30,7 +30,7 @@ import org.python.core.PyDictionary;
 import org.python.core.PyFunction;
 import org.python.core.PyObject;
 
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
 import ch.systemsx.cisd.common.utilities.JythonUtils;
 
 /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.java
index f0ba40ea4cc41120410ae9df82c47fd1f6319cb7..b668fef7507eb869a3b47500171543ce2a63b7a7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.java
@@ -21,8 +21,8 @@ import java.util.List;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
 import ch.systemsx.cisd.common.jython.JythonScriptSplitter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
 
 /**
  * A class for running python scripts that register master data.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
index 6a3c1368dfeca5688ce5636e9eb5589f9f7f7948..3d6159aa675964531369ff4c076f61c4523a386c 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
@@ -2,7 +2,7 @@ package ch.systemsx.cisd.openbis.dss.etl.jython;
 
 import java.io.File;
 
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
 import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
 import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistratorDelegate;
 import ch.systemsx.cisd.etlserver.TopLevelDataSetRegistratorGlobalState;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java
index b843cf021319f8405d99cda47d5f7425ed6e68d8..8dc82e3f5babf24de2bdb6bdaefb218d19e0c7a7 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.dss.etl.jython.v2;
 
 import java.io.File;
 
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
 import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
 import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistratorDelegate;
 import ch.systemsx.cisd.etlserver.TopLevelDataSetRegistratorGlobalState;