diff --git a/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutionLogger.java b/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutionLogger.java
index 6d5f0f5c05271e867160aac1de505b047db31426..578c5f2ad0a4db641695689186a6cacf73042aba 100644
--- a/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutionLogger.java
+++ b/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutionLogger.java
@@ -16,7 +16,6 @@
 
 package ch.systemsx.cisd.common.db;
 
-import ch.systemsx.cisd.common.Script;
 
 /**
  * Interface for logging of SQL script executions.
diff --git a/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutor.java b/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutor.java
index 5f27849abee0353c3140019f37661275211d5287..1bd21871e441634b7efd30e822dc5333fc77b610 100644
--- a/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutor.java
+++ b/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutor.java
@@ -16,7 +16,6 @@
 
 package ch.systemsx.cisd.common.db;
 
-import ch.systemsx.cisd.common.Script;
 
 /**
  * Executor of SQL scripts.
diff --git a/common/source/java/ch/systemsx/cisd/common/Script.java b/common/source/java/ch/systemsx/cisd/common/db/Script.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/Script.java
rename to common/source/java/ch/systemsx/cisd/common/db/Script.java
index 213730b80d49aa781476b528cd59327c4c16f498..32ab820b61abe482707d701b428b0a8880316f6d 100644
--- a/common/source/java/ch/systemsx/cisd/common/Script.java
+++ b/common/source/java/ch/systemsx/cisd/common/db/Script.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common;
+package ch.systemsx.cisd.common.db;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
diff --git a/common/source/java/ch/systemsx/cisd/common/db/SqlUnitTestRunner.java b/common/source/java/ch/systemsx/cisd/common/db/SqlUnitTestRunner.java
index 2d6147323eb443c328d269d711963de2105b0f41..759c10e666ce4efe713a82ce91a0bd4960e8f5b5 100644
--- a/common/source/java/ch/systemsx/cisd/common/db/SqlUnitTestRunner.java
+++ b/common/source/java/ch/systemsx/cisd/common/db/SqlUnitTestRunner.java
@@ -28,7 +28,6 @@ import java.util.Comparator;
 import java.util.List;
 
 import ch.systemsx.cisd.base.utilities.OSUtilities;
-import ch.systemsx.cisd.common.Script;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 
 /**
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/db/SqlUnitTestRunnerTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/db/SqlUnitTestRunnerTest.java
index cab735728a2782eabf901b2e0c80fdd69ff5c80b..3bd5074273132a1a0ef777225afde0b16fb068b0 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/db/SqlUnitTestRunnerTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/db/SqlUnitTestRunnerTest.java
@@ -37,7 +37,6 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.base.utilities.OSUtilities;
-import ch.systemsx.cisd.common.Script;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 
 /**
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
index 9856b483a150ce1c4f09796597c47cdfc5c578cc..e8207f3ae640b53cc5483ee221fe66d3f1edab99 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
@@ -20,8 +20,8 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 import ch.rinn.restrictions.Private;
-import ch.systemsx.cisd.common.Script;
 import ch.systemsx.cisd.common.db.ISqlScriptExecutor;
+import ch.systemsx.cisd.common.db.Script;
 import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
 import ch.systemsx.cisd.common.exception.EnvironmentFailureException;
 import ch.systemsx.cisd.common.logging.LogCategory;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
index d13500cd5474cb4df515b2f2be358ab73e195f7f..355159031080478322e925f8d32d24d5352efa67 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
@@ -40,7 +40,7 @@ import org.springframework.jdbc.support.lob.LobCreator;
 import org.springframework.jdbc.support.lob.LobHandler;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
 
 /**
  * Class which logs database migration steps in the database.
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IDatabaseVersionLogDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IDatabaseVersionLogDAO.java
index 117d2b2067d68600ca37f46e29535793fe61c40f..ed6d82649297c50d2c468f1eed9f5073312fe4cc 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IDatabaseVersionLogDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IDatabaseVersionLogDAO.java
@@ -16,8 +16,8 @@
 
 package ch.systemsx.cisd.dbmigration;
 
-import ch.systemsx.cisd.common.Script;
 import ch.systemsx.cisd.common.db.ISqlScriptExecutionLogger;
+import ch.systemsx.cisd.common.db.Script;
 
 /**
  * Interface for a Data Access Object for the database version log.
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/ISqlScriptProvider.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/ISqlScriptProvider.java
index f5f57a9f20bad3bd538b4752edef896fa317465f..960c1f2476eea88a91f184a70a6b4bde385abcf0 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/ISqlScriptProvider.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/ISqlScriptProvider.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.dbmigration;
 
 import java.io.File;
 
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
 
 /**
  * Provider of SQL scripts for creation and migration of database.
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java
index 5785edea664d5ea0bafe182ae67d392de930918d..1e5860072f570246ff9083ffc965eded3ef9c0d7 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java
@@ -28,9 +28,9 @@ import org.springframework.jdbc.core.support.JdbcDaoSupport;
 
 import ch.rinn.restrictions.Private;
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
 import ch.systemsx.cisd.common.db.ISqlScriptExecutionLogger;
 import ch.systemsx.cisd.common.db.ISqlScriptExecutor;
+import ch.systemsx.cisd.common.db.Script;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java
index 7fe9f3a3c8b852ab16f788517e847df69fc8cf8b..0e8f74ad12f2a03da2150f0292f66f5e053c4036 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java
@@ -24,7 +24,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java
index b1274e05c23a81072bd49e9c950688eeb0374c82..fe5d264c6a630365db94891ef197aa406755d845 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java
@@ -29,8 +29,8 @@ import org.apache.log4j.Logger;
 import org.h2.tools.DeleteDbFiles;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
 import ch.systemsx.cisd.common.db.ISqlScriptExecutor;
+import ch.systemsx.cisd.common.db.Script;
 import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.common.logging.LogCategory;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/IMigrationStepExecutor.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/IMigrationStepExecutor.java
index 20bc5998d63e26e04bddd114c344141a1142d861..a55e5016d5b965dcafe0b19dfcdc5735f2a679ef 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/IMigrationStepExecutor.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/IMigrationStepExecutor.java
@@ -16,7 +16,7 @@
 
 package ch.systemsx.cisd.dbmigration.java;
 
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
 
 /**
  * A migration step executor.
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java
index 2729f7646758e29cc3a255a4b11945918fe7986b..7d275e5e4e3a150e8700cfa497309821de182a00 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java
@@ -21,7 +21,7 @@ import org.apache.log4j.Logger;
 import org.springframework.jdbc.core.simple.SimpleJdbcDaoSupport;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.parser.ILine;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
index e51f349c1593e2efa36dcb95f54b1698b6c95eed..637cd2479b225d2439fb04b0359b911cbbd4f8b8 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
@@ -26,8 +26,8 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.dao.DataAccessException;
 
-import ch.systemsx.cisd.common.Script;
 import ch.systemsx.cisd.common.db.ISqlScriptExecutor;
+import ch.systemsx.cisd.common.db.Script;
 import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.common.logging.LogCategory;
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java
index c3bae8f296feb0b852f77bc72c877932b5817c49..1fd68f479435954b89494bcabe10fb7ffd49778f 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java
@@ -37,8 +37,8 @@ import org.testng.annotations.Test;
 
 import ch.rinn.restrictions.Friend;
 import ch.systemsx.cisd.base.utilities.OSUtilities;
-import ch.systemsx.cisd.common.Script;
 import ch.systemsx.cisd.common.db.ISqlScriptExecutor;
+import ch.systemsx.cisd.common.db.Script;
 import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
 import ch.systemsx.cisd.common.exception.EnvironmentFailureException;
 import ch.systemsx.cisd.common.logging.BufferedAppender;
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutorTest.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutorTest.java
index 816f4d4eac2f4e1f239643457c717605418e69bd..9472eb78ee1fc1ab9bd322a88ba4bb51da058e20 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutorTest.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutorTest.java
@@ -29,8 +29,8 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import ch.rinn.restrictions.Friend;
-import ch.systemsx.cisd.common.Script;
 import ch.systemsx.cisd.common.db.ISqlScriptExecutionLogger;
+import ch.systemsx.cisd.common.db.Script;
 import ch.systemsx.cisd.common.logging.LogInitializer;
 
 /**
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptProviderTest.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptProviderTest.java
index 676ed6742fa0d00d0c238690993cc436bff772fe..4dbe37ff5f3b2f01a971020a9f0d9ab8f7a5cb64 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptProviderTest.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptProviderTest.java
@@ -33,7 +33,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 
 /**
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutorTest.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutorTest.java
index 26610b3b0d4fa50b186502014c82b8af6114ede3..d4d3ef16ab3777a6b096db4c0d91f0653aa7f6b3 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutorTest.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutorTest.java
@@ -31,7 +31,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
 import ch.systemsx.cisd.common.logging.BufferedAppender;
 import ch.systemsx.cisd.common.logging.LogInitializer;
 import ch.systemsx.cisd.common.test.AssertionUtil;