diff --git a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonDeserializationTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonDeserializationTest.java
index 8ccbca07479182432bb90d9c99d0e6f37bd07a2f..2589b2254c51935c4be09ab39d9c2f682eec2280 100644
--- a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonDeserializationTest.java
+++ b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonDeserializationTest.java
@@ -45,6 +45,7 @@ import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedMapsInList
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedTypes;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedTypes.ObjectNested;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedTypes.ObjectNestedChild;
+import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedMapsInMapFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedTypesFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithPrimitiveTypes;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithPrimitiveTypesFactory;
diff --git a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonSerializationTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonSerializationTest.java
index 764187d692f16be195013ce15396922b240a5101..cc8addf70c2cde0160ef787256f828f1f4eab1ad 100644
--- a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonSerializationTest.java
+++ b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonSerializationTest.java
@@ -31,6 +31,7 @@ import ch.systemsx.cisd.common.api.server.json.object.ObjectWithEnumTypesFactory
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithIgnoredPropertiesFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedMapsInCollectionFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedMapsInListFactory;
+import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedMapsInMapFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedTypesFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithPrimitiveTypesFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithPrivateAccessFactory;
diff --git a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/ObjectWithNestedMapsInMapFactory.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/object/ObjectWithNestedMapsInMapFactory.java
similarity index 94%
rename from openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/ObjectWithNestedMapsInMapFactory.java
rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/object/ObjectWithNestedMapsInMapFactory.java
index 575774c3a75e80e8ecaf119ac49ab7d0c1243f03..907d0a1a8a045902aed4d107b1c8646babb46d2d 100644
--- a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/ObjectWithNestedMapsInMapFactory.java
+++ b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/object/ObjectWithNestedMapsInMapFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.api.server.json;
+package ch.systemsx.cisd.common.api.server.json.object;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +22,6 @@ import java.util.Map;
 import ch.systemsx.cisd.common.api.server.json.common.ObjectCounter;
 import ch.systemsx.cisd.common.api.server.json.common.ObjectFactory;
 import ch.systemsx.cisd.common.api.server.json.common.ObjectType;
-import ch.systemsx.cisd.common.api.server.json.object.ObjectWithContainerTypesFactory;
 
 /**
  * @author pkupczyk