Repackage to org.cristalise

author: Andrew Branson <andrew.branson@cern.ch> 2014-10-07 09:18:11 +0200
committer: Andrew Branson <andrew.branson@cern.ch> 2014-10-07 09:18:11 +0200
commit: 0ed2c1124cf1b9e49a2ec1fa0126a8df09f9e758 (patch)
tree: e3a56cee83865f8c703deb790c15d3e79e871a82
parent: 50aa8aaab42fa62267aa1ae6a6070013096f5082 (diff)
260 files changed, 1918 insertions, 1782 deletions
diff --git a/bin/eclipse/Cristal Kernel Console.launch b/bin/eclipse/Cristal Kernel Console.launch
index 7cf7530..751e862 100644
--- a/bin/eclipse/Cristal Kernel Console.launch
+++ b/bin/eclipse/Cristal Kernel Console.launch
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/cristal-kernel/src/main/java/com/c2kernel/process/ClientShell.java"/>
+<listEntry value="/cristal-kernel/src/main/java/org/cristalise/kernel/process/ClientShell.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.c2kernel.process.ClientShell"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.cristalise.kernel.process.ClientShell"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-config bin/conf/client.conf -connect ${file_prompt}"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cristal-kernel"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
diff --git a/bin/eclipse/Cristal Kernel Server.launch b/bin/eclipse/Cristal Kernel Server.launch
index 79bb329..05251e6 100644
--- a/bin/eclipse/Cristal Kernel Server.launch
+++ b/bin/eclipse/Cristal Kernel Server.launch
@@ -2,14 +2,14 @@
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <stringAttribute key="bad_container_name" value="\cristal-kernel\bin\eclip"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/cristal-kernel/src/main/java/com/c2kernel/process/StandardServer.java"/>
+<listEntry value="/cristal-kernel/src/main/java/org/cristalise/kernel/process/StandardServer.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.c2kernel.process.StandardServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.cristalise.kernel.process.StandardServer"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel 0 -config bin/conf/server.conf -connect ${file_prompt}"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cristal-kernel"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
diff --git a/bin/eclipse/Cristal Kernel UserCode.launch b/bin/eclipse/Cristal Kernel UserCode.launch
index 48d76e1..80753aa 100644
--- a/bin/eclipse/Cristal Kernel UserCode.launch
+++ b/bin/eclipse/Cristal Kernel UserCode.launch
@@ -2,14 +2,14 @@
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <stringAttribute key="bad_container_name" value="\cristal-kernel\bin\eclip"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/cristal-kernel/src/main/java/com/c2kernel/process/UserCodeProcess.java"/>
+<listEntry value="/cristal-kernel/src/main/java/org/cristalise/kernel/process/UserCodeProcess.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.c2kernel.process.UserCodeProcess"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.cristalise.kernel.process.UserCodeProcess"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel 0 -config bin/conf/client.conf -connect ${file_prompt}"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cristal-kernel"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
diff --git a/connect/local.clc.example b/connect/local.clc.example
index b3357a7..1e6e372 100755
--- a/connect/local.clc.example
+++ b/connect/local.clc.example
@@ -4,7 +4,7 @@
 // This name appears on the login box
 Name=Example Cristal Server
 Logo=http://path.to/image
-Authenticator=com.c2kernel.lookup.ldap.LDAPAuthManager
+Authenticator=org.cristalise.kernel.lookup.ldap.LDAPAuthManager
 
 // TCP server ports
 ItemServer.name=HOSTNAME
@@ -13,7 +13,7 @@ ItemServer.Proxy.port=1553
 ItemServer.Console.port=8080
 
 // LDAP config
-Lookup=com.c2kernel.lookup.ldap.LDAPLookup
+Lookup=org.cristalise.kernel.lookup.ldap.LDAPLookup
 LDAP.GlobalPath=LDAPROOTPATH
 LDAP.RootPath=cn=cristal
 LDAP.LocalPath=cn=dev
diff --git a/pom.xml b/pom.xml
index d5c6f0b..6bad717 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,17 +2,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>cristal</groupId>
-	<artifactId>cristal-kernel</artifactId>
-	<name>CRISTAL Kernel</name>
+	<groupId>org.cristalise</groupId>
+	<artifactId>cristalise-kernel</artifactId>
+	<name>cristalise-kernel</name>
 	<version>3.0-SNAPSHOT</version>
-	<description>CRISTAL is a description-driven software platform originally developed to track the construction of 
-	the CMS ECAL detector of the LHC at CERN. This is its core library, known as the kernel, which manages 
-	business objects called Items. Items are entirely configured from data, called descriptions, held in other Items. 
-	Every change of a state in an Item is a consequence of an execution of an activity in that Item's lifecycle, 
-	meaning that CRISTAL applications are completely traceable, even in their design. It also supports extensive 
-	versioning of Item description data, giving the system a high level of flexibility.
-	</description>
+	<description>Cristal-ise is a description-driven software platform originally developed to track the construction of 
+	the CMS ECAL detector of the LHC at CERN. This is its core library, known as the kernel, which manages 
+	business objects called Items. Items are entirely configured from data, called descriptions, held in other Items. 
+	Every change of a state in an Item is a consequence of an execution of an activity in that Item's lifecycle, 
+	meaning that Cristal-ise applications are completely traceable, even in their design. It also supports extensive 
+	versioning of Item description data, giving the system a high level of flexibility.</description>
 	<url>http://dev.cccs.uwe.ac.uk/docs/${project.artifactId}/${project.version}/</url>
 	<inceptionYear>2000</inceptionYear>
 	<licenses>
@@ -171,7 +170,7 @@
 		<resources>
 			<resource>
 				<directory>src/main/resources</directory>
-				<targetPath>com/c2kernel/utils/resources</targetPath>
+				<targetPath>org/cristalise/kernel/utils/resources</targetPath>
 				<filtering>true</filtering>
 			</resource>
 			<resource>
@@ -248,11 +247,11 @@
 							<packagePrefixes>
 								<packagePrefix>
 									<type>common</type>
-									<prefix>com.c2kernel</prefix>
+									<prefix>org.cristalise.kernel</prefix>
 								</packagePrefix>
 								<packagePrefix>
 									<type>entity</type>
-									<prefix>com.c2kernel</prefix>
+									<prefix>org.cristalise.kernel</prefix>
 								</packagePrefix>
 							</packagePrefixes>
 							<compatible>false</compatible>
diff --git a/src/main/idl/CommonExceptions.idl b/src/main/idl/CommonExceptions.idl
index 88f2ef3..4fc443d 100644
--- a/src/main/idl/CommonExceptions.idl
+++ b/src/main/idl/CommonExceptions.idl
@@ -29,7 +29,7 @@
  * @version $Revision: 1.6 $
  */
 
-#pragma prefix "c2kernel.com"
+#pragma prefix "org.cristalise.kernel"
 
 module common
 {
diff --git a/src/main/idl/CommonTypes.idl b/src/main/idl/CommonTypes.idl
index 8d17972..8d8f4ba 100644
--- a/src/main/idl/CommonTypes.idl
+++ b/src/main/idl/CommonTypes.idl
@@ -31,7 +31,7 @@
 
 #include <CommonExceptions.idl>
 
-#pragma prefix "c2kernel.com"
+#pragma prefix "org.cristalise.kernel"
 
 module common
 {
diff --git a/src/main/idl/Entity.idl b/src/main/idl/Entity.idl
index ef2efbc..7aaae05 100644
--- a/src/main/idl/Entity.idl
+++ b/src/main/idl/Entity.idl
@@ -31,7 +31,7 @@
 
 #include <CommonTypes.idl>
 
-#pragma prefix "c2kernel.com"
+#pragma prefix "org.cristalise.kernel"
 
 module entity
 {
@@ -53,7 +53,7 @@ module entity
         /** Initialises a new Item. Initial properties and the lifecycle are supplied. They should come from the Item's description.
         *
         * @param agentKey the Agent doing the initialisation
-        * @param itemProps The XML marshalled {@link com.c2kernel.Property.PropertyArrayList PropertyArrayList} containing the initial
+        * @param itemProps The XML marshalled {@link org.cristalise.kernel.Property.PropertyArrayList PropertyArrayList} containing the initial
     	* Property objects of the Item
         * @param workflow The XML marshalled new lifecycle of the Item
         * @param collection The XML marshalled CollectionArrayList of the initial state of the Item's collections
@@ -81,7 +81,7 @@ module entity
 		* <li><code>ViewPoint/{Schema name}/{Name}</code> <i>(Items only)</i>: A named pointer to the latest version of an Outcome, defined by the Activity.</li>
 		* <li><code>Job/{ID}</code> <i>(Agents only)</i>: A persistent Job, reflecting a request for execution of an Activity to this Agent. Not all roles create persistent Jobs like this, only those specifically flagged to do so.</li> 
 		*  
-		* @see com.c2kernel.persistency.ClusterStorage#getPath
+		* @see org.cristalise.kernel.persistency.ClusterStorage#getPath
 		* 
         * @return The XML string of the data. All fragments except Outcomes will deserialize into objects with the kernel CastorXMLUtility available in the Gateway. 
         * 
@@ -144,7 +144,7 @@ module entity
         *
         * @param agentKey The system key of the Agent requesting Jobs.
         * @param filter If true, then only Activities which are currently active will be included.
-        * @return An XML marshalled {@link com.c2kernel.entity.agent.JobArrayList JobArrayList}
+        * @return An XML marshalled {@link org.cristalise.kernel.entity.agent.JobArrayList JobArrayList}
         * @throws AccessRightsException - when the Agent doesn't exist
         * @throws ObjectNotFoundException - when the Item doesn't have a lifecycle
         * @throws PersistencyException - when there was a storage or other unknown error
@@ -170,7 +170,7 @@ module entity
           *
           * @param itemKey the item which generated the jobs. The Agent should discard any existing jobs for that Item.
           * @param stepPath the Activity within the lifecycle of the item which the jobs relate to
-          * @param newJobs an XML marshalled {@link com.c2kernel.entity.agent.JobArrayList JobArrayList} containing the new Jobs
+          * @param newJobs an XML marshalled {@link org.cristalise.kernel.entity.agent.JobArrayList JobArrayList} containing the new Jobs
           **/
 		void refreshJobList( in common::SystemKey itemKey,
 							 in string stepPath,
diff --git a/src/main/java/com/c2kernel/collection/Aggregation.java b/src/main/java/org/cristalise/kernel/collection/Aggregation.java
index 68b52cf..2ae450b 100644
--- a/src/main/java/com/c2kernel/collection/Aggregation.java
+++ b/src/main/java/org/cristalise/kernel/collection/Aggregation.java
@@ -18,21 +18,22 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
-
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.graph.model.GraphModel;
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.Language;
-import com.c2kernel.utils.Logger;
+package org.cristalise.kernel.collection;
+
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.graph.model.GraphModel;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.Language;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**
  * A Collection with a graph layout
diff --git a/src/main/java/com/c2kernel/collection/AggregationDescription.java b/src/main/java/org/cristalise/kernel/collection/AggregationDescription.java
index a1f979d..dbcf030 100644
--- a/src/main/java/com/c2kernel/collection/AggregationDescription.java
+++ b/src/main/java/org/cristalise/kernel/collection/AggregationDescription.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
 
 /**
  * The description of a Collection with a graph layout. Each slot is 
@@ -26,13 +26,14 @@ package com.c2kernel.collection;
  * the PropertyDescription outcome of the description slot's referenced Item.
  */
 
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.property.PropertyDescriptionList;
-import com.c2kernel.property.PropertyUtility;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.property.PropertyDescriptionList;
+import org.cristalise.kernel.property.PropertyUtility;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class AggregationDescription extends Aggregation implements CollectionDescription<AggregationMember>
 {
diff --git a/src/main/java/com/c2kernel/collection/AggregationInstance.java b/src/main/java/org/cristalise/kernel/collection/AggregationInstance.java
index d2dbf7f..850e32b 100644
--- a/src/main/java/com/c2kernel/collection/AggregationInstance.java
+++ b/src/main/java/org/cristalise/kernel/collection/AggregationInstance.java
@@ -18,18 +18,19 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
 
 /**
  * Instance of an Aggregation. Unlike in the description, Items may only be 
  * assigned to one slot.
  */
 
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.utils.CastorHashMap;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.utils.CastorHashMap;
+
 
 public class AggregationInstance extends Aggregation
 {
diff --git a/src/main/java/com/c2kernel/collection/AggregationMember.java b/src/main/java/org/cristalise/kernel/collection/AggregationMember.java
index 903914c..cafebd8 100644
--- a/src/main/java/com/c2kernel/collection/AggregationMember.java
+++ b/src/main/java/org/cristalise/kernel/collection/AggregationMember.java
@@ -18,20 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
 
 import java.util.StringTokenizer;
 
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.graph.model.GraphableVertex;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.Property;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.graph.model.GraphableVertex;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**
 * A CollectionMember, or slot, of an Aggregation instance or description. 
diff --git a/src/main/java/com/c2kernel/collection/AggregationVertexFactory.java b/src/main/java/org/cristalise/kernel/collection/AggregationVertexFactory.java
index 6fa7014..de5c9db 100644
--- a/src/main/java/com/c2kernel/collection/AggregationVertexFactory.java
+++ b/src/main/java/org/cristalise/kernel/collection/AggregationVertexFactory.java
@@ -18,13 +18,13 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
 
-import com.c2kernel.graph.model.GraphModelManager;
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;
-import com.c2kernel.graph.model.VertexFactory;
-import com.c2kernel.utils.CastorHashMap;
+import org.cristalise.kernel.graph.model.GraphModelManager;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo;
+import org.cristalise.kernel.graph.model.VertexFactory;
+import org.cristalise.kernel.utils.CastorHashMap;
 
 /**
  * GraphModel vertex factory for AggregationMembers 
diff --git a/src/main/java/com/c2kernel/collection/AggregationVertexOutlineCreator.java b/src/main/java/org/cristalise/kernel/collection/AggregationVertexOutlineCreator.java
index fbd5434..62b519d 100644
--- a/src/main/java/com/c2kernel/collection/AggregationVertexOutlineCreator.java
+++ b/src/main/java/org/cristalise/kernel/collection/AggregationVertexOutlineCreator.java
@@ -18,11 +18,11 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
 
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.graph.model.VertexOutlineCreator;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.graph.model.VertexOutlineCreator;
 
 /**
  * AggregationMember vertex outline creator. Sets up the new dimensions and
diff --git a/src/main/java/com/c2kernel/collection/Collection.java b/src/main/java/org/cristalise/kernel/collection/Collection.java
index 34ec93f..04adee7 100644
--- a/src/main/java/com/c2kernel/collection/Collection.java
+++ b/src/main/java/org/cristalise/kernel/collection/Collection.java
@@ -18,16 +18,17 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
+
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.graph.model.GraphModel;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.utils.CastorHashMap;
 
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.graph.model.GraphModel;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.utils.CastorHashMap;
 
 /**
  * Collections are Item local objects that reference other Items.
diff --git a/src/main/java/com/c2kernel/collection/CollectionArrayList.java b/src/main/java/org/cristalise/kernel/collection/CollectionArrayList.java
index 2c96170..6b92e23 100644
--- a/src/main/java/com/c2kernel/collection/CollectionArrayList.java
+++ b/src/main/java/org/cristalise/kernel/collection/CollectionArrayList.java
@@ -18,11 +18,12 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
 
 import java.util.ArrayList;
 
-import com.c2kernel.utils.CastorArrayList;
+import org.cristalise.kernel.utils.CastorArrayList;
+
 
 /**
  * A bundle of Collections. Used for storage and export/import using XML 
diff --git a/src/main/java/com/c2kernel/collection/CollectionDescription.java b/src/main/java/org/cristalise/kernel/collection/CollectionDescription.java
index 6f64abf..87a97c6 100644
--- a/src/main/java/com/c2kernel/collection/CollectionDescription.java
+++ b/src/main/java/org/cristalise/kernel/collection/CollectionDescription.java
@@ -18,10 +18,11 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
+
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.C2KLocalObject;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.C2KLocalObject;
 
 /**
  * A collection that can be instantiated. Collection descriptions link Item 
diff --git a/src/main/java/com/c2kernel/collection/CollectionMember.java b/src/main/java/org/cristalise/kernel/collection/CollectionMember.java
index 3925435..3a0b642 100644
--- a/src/main/java/com/c2kernel/collection/CollectionMember.java
+++ b/src/main/java/org/cristalise/kernel/collection/CollectionMember.java
@@ -18,13 +18,14 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
+
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.utils.CastorHashMap;
 
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.utils.CastorHashMap;
 
 /**
  * CollectionMembers are pointers to individual Items in a collection. Under 
diff --git a/src/main/java/com/c2kernel/collection/CollectionMemberList.java b/src/main/java/org/cristalise/kernel/collection/CollectionMemberList.java
index 49096e0..0d9c591 100644
--- a/src/main/java/com/c2kernel/collection/CollectionMemberList.java
+++ b/src/main/java/org/cristalise/kernel/collection/CollectionMemberList.java
@@ -18,9 +18,9 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
 
-import com.c2kernel.utils.CastorArrayList;
+import org.cristalise.kernel.utils.CastorArrayList;
 
 /**
  * A list of CollectionMembers, used internally in the Collection for XML 
diff --git a/src/main/java/com/c2kernel/collection/Dependency.java b/src/main/java/org/cristalise/kernel/collection/Dependency.java
index 1dd777c..1641756 100644
--- a/src/main/java/com/c2kernel/collection/Dependency.java
+++ b/src/main/java/org/cristalise/kernel/collection/Dependency.java
@@ -18,16 +18,17 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
 
 
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.KeyValuePair;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.KeyValuePair;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**
  * A Collection implementation that contains a variable number of members of the
diff --git a/src/main/java/com/c2kernel/collection/DependencyDescription.java b/src/main/java/org/cristalise/kernel/collection/DependencyDescription.java
index d49b505..9c02245 100644
--- a/src/main/java/com/c2kernel/collection/DependencyDescription.java
+++ b/src/main/java/org/cristalise/kernel/collection/DependencyDescription.java
@@ -18,15 +18,16 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
+
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.property.PropertyDescriptionList;
+import org.cristalise.kernel.property.PropertyUtility;
+import org.cristalise.kernel.utils.CastorHashMap;
 
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.property.PropertyDescriptionList;
-import com.c2kernel.property.PropertyUtility;
-import com.c2kernel.utils.CastorHashMap;
 
 public class DependencyDescription extends Dependency implements CollectionDescription<DependencyMember>{
 	
diff --git a/src/main/java/com/c2kernel/collection/DependencyMember.java b/src/main/java/org/cristalise/kernel/collection/DependencyMember.java
index dbb79e3..e631113 100644
--- a/src/main/java/com/c2kernel/collection/DependencyMember.java
+++ b/src/main/java/org/cristalise/kernel/collection/DependencyMember.java
@@ -18,21 +18,22 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.collection;
+package org.cristalise.kernel.collection;
 
 import java.util.StringTokenizer;
 
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.Property;
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.KeyValuePair;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.KeyValuePair;
+import org.cristalise.kernel.utils.Logger;
+
 
 
 /**
diff --git a/src/main/java/com/c2kernel/collection/package-info.java b/src/main/java/org/cristalise/kernel/collection/package-info.java
index 96bd022..ec01be2 100644
--- a/src/main/java/com/c2kernel/collection/package-info.java
+++ b/src/main/java/org/cristalise/kernel/collection/package-info.java
@@ -24,4 +24,4 @@
  * @see Collection
  */
 
-package com.c2kernel.collection;
-\ No newline at end of file
+package org.cristalise.kernel.collection;
+\ No newline at end of file
diff --git a/src/main/java/com/c2kernel/entity/C2KLocalObject.java b/src/main/java/org/cristalise/kernel/entity/C2KLocalObject.java
index beee3ab..18635ed 100644
--- a/src/main/java/com/c2kernel/entity/C2KLocalObject.java
+++ b/src/main/java/org/cristalise/kernel/entity/C2KLocalObject.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity;
+package org.cristalise.kernel.entity;
 
 
 /**
@@ -31,8 +31,8 @@ package com.c2kernel.entity;
  * <li>Viewpoints - /ViewPoint/SchemaType/Name
  * </ul>
  *
- * @see com.c2kernel.persistency.ClusterStorage
- * @see com.c2kernel.persistency.ClusterStorageManager
+ * @see org.cristalise.kernel.persistency.ClusterStorage
+ * @see org.cristalise.kernel.persistency.ClusterStorageManager
  *
  * @author Andrew Branson
  *
diff --git a/src/main/java/com/c2kernel/entity/CorbaServer.java b/src/main/java/org/cristalise/kernel/entity/CorbaServer.java
index 22b8e13..a16d3d1 100644
--- a/src/main/java/com/c2kernel/entity/CorbaServer.java
+++ b/src/main/java/org/cristalise/kernel/entity/CorbaServer.java
@@ -18,27 +18,29 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity;
+package org.cristalise.kernel.entity;
 
 import java.util.Map;
 
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.AgentHelper;
+import org.cristalise.kernel.entity.ItemHelper;
+import org.cristalise.kernel.entity.agent.ActiveEntity;
+import org.cristalise.kernel.entity.agent.ActiveLocator;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.InvalidAgentPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+import org.cristalise.kernel.utils.SoftCache;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.POAManager;
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.agent.ActiveEntity;
-import com.c2kernel.entity.agent.ActiveLocator;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.InvalidAgentPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
-import com.c2kernel.utils.SoftCache;
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/entity/ItemImplementation.java b/src/main/java/org/cristalise/kernel/entity/ItemImplementation.java
index 9098e2a..ccc2706 100644
--- a/src/main/java/com/c2kernel/entity/ItemImplementation.java
+++ b/src/main/java/org/cristalise/kernel/entity/ItemImplementation.java
@@ -18,39 +18,41 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity;
+package org.cristalise.kernel.entity;
 
 import java.util.UUID;
 
-import com.c2kernel.collection.Collection;
-import com.c2kernel.collection.CollectionArrayList;
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.common.SystemKey;
-import com.c2kernel.entity.agent.JobArrayList;
-import com.c2kernel.events.Event;
-import com.c2kernel.events.History;
-import com.c2kernel.lifecycle.instance.CompositeActivity;
-import com.c2kernel.lifecycle.instance.Workflow;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer;
-import com.c2kernel.lifecycle.instance.predefined.item.ItemPredefinedStepContainer;
-import com.c2kernel.lifecycle.instance.stateMachine.Transition;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.TransactionManager;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.Property;
-import com.c2kernel.property.PropertyArrayList;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.collection.Collection;
+import org.cristalise.kernel.collection.CollectionArrayList;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.common.SystemKey;
+import org.cristalise.kernel.entity.ItemOperations;
+import org.cristalise.kernel.entity.agent.JobArrayList;
+import org.cristalise.kernel.events.Event;
+import org.cristalise.kernel.events.History;
+import org.cristalise.kernel.lifecycle.instance.CompositeActivity;
+import org.cristalise.kernel.lifecycle.instance.Workflow;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer;
+import org.cristalise.kernel.lifecycle.instance.predefined.item.ItemPredefinedStepContainer;
+import org.cristalise.kernel.lifecycle.instance.stateMachine.Transition;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.TransactionManager;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.property.PropertyArrayList;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class ItemImplementation implements ItemOperations {
 	
diff --git a/src/main/java/com/c2kernel/entity/TraceableEntity.java b/src/main/java/org/cristalise/kernel/entity/TraceableEntity.java
index f0bf957..7b43873 100644
--- a/src/main/java/com/c2kernel/entity/TraceableEntity.java
+++ b/src/main/java/org/cristalise/kernel/entity/TraceableEntity.java
@@ -18,19 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity;
+package org.cristalise.kernel.entity;
 
 
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.common.SystemKey;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.common.SystemKey;
+import org.cristalise.kernel.entity.ItemPOA;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
 *  TraceableEntity is the implementation of the CORBA Item, although it 
diff --git a/src/main/java/com/c2kernel/entity/TraceableLocator.java b/src/main/java/org/cristalise/kernel/entity/TraceableLocator.java
index faad884..f61c433 100644
--- a/src/main/java/com/c2kernel/entity/TraceableLocator.java
+++ b/src/main/java/org/cristalise/kernel/entity/TraceableLocator.java
@@ -18,17 +18,18 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity;
+package org.cristalise.kernel.entity;
 
 
 import java.nio.ByteBuffer;
 import java.sql.Timestamp;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.SystemKey;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.SystemKey;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 
 /**************************************************************************
diff --git a/src/main/java/com/c2kernel/entity/agent/ActiveEntity.java b/src/main/java/org/cristalise/kernel/entity/agent/ActiveEntity.java
index e497c07..46d60ac 100644
--- a/src/main/java/com/c2kernel/entity/agent/ActiveEntity.java
+++ b/src/main/java/org/cristalise/kernel/entity/agent/ActiveEntity.java
@@ -18,20 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.agent;
-
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.common.SystemKey;
-import com.c2kernel.entity.AgentPOA;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.utils.Logger;
+package org.cristalise.kernel.entity.agent;
+
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.common.SystemKey;
+import org.cristalise.kernel.entity.AgentPOA;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  * ActiveEntity - the CORBA object representing the Agent. All functionality
diff --git a/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java b/src/main/java/org/cristalise/kernel/entity/agent/ActiveLocator.java
index ecc9d42..1a55c99 100644
--- a/src/main/java/com/c2kernel/entity/agent/ActiveLocator.java
+++ b/src/main/java/org/cristalise/kernel/entity/agent/ActiveLocator.java
@@ -18,18 +18,19 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.agent;
+package org.cristalise.kernel.entity.agent;
 
 
 import java.nio.ByteBuffer;
 import java.sql.Timestamp;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.SystemKey;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.SystemKey;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 
 /**************************************************************************
diff --git a/src/main/java/com/c2kernel/entity/agent/AgentImplementation.java b/src/main/java/org/cristalise/kernel/entity/agent/AgentImplementation.java
index e59c731..26c2f2f 100644
--- a/src/main/java/com/c2kernel/entity/agent/AgentImplementation.java
+++ b/src/main/java/org/cristalise/kernel/entity/agent/AgentImplementation.java
@@ -18,21 +18,22 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.agent;
+package org.cristalise.kernel.entity.agent;
+
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.SystemKey;
+import org.cristalise.kernel.entity.AgentOperations;
+import org.cristalise.kernel.entity.ItemImplementation;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer;
+import org.cristalise.kernel.lifecycle.instance.predefined.agent.AgentPredefinedStepContainer;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.SystemKey;
-import com.c2kernel.entity.AgentOperations;
-import com.c2kernel.entity.ItemImplementation;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer;
-import com.c2kernel.lifecycle.instance.predefined.agent.AgentPredefinedStepContainer;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
 
 /**
  * Implementation of Agent, though called from the CORBA implementation ActiveEntity.
@@ -127,7 +128,7 @@ public class AgentImplementation extends ItemImplementation implements
      * predefined steps, plus special Agent ones related to Agent management and 
      * instantiation.
      * 
-     * @see com.c2kernel.lifecycle.instance.predefined.agent.AgentPredefinedStepContainer
+     * @see org.cristalise.kernel.lifecycle.instance.predefined.agent.AgentPredefinedStepContainer
      */
 	@Override
 	protected PredefinedStepContainer getNewPredefStepContainer() {
diff --git a/src/main/java/com/c2kernel/entity/agent/Job.java b/src/main/java/org/cristalise/kernel/entity/agent/Job.java
index 72c46eb..bd74d51 100644
--- a/src/main/java/com/c2kernel/entity/agent/Job.java
+++ b/src/main/java/org/cristalise/kernel/entity/agent/Job.java
@@ -18,31 +18,32 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.agent;
+package org.cristalise.kernel.entity.agent;
 
 import java.util.HashMap;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.lifecycle.instance.Activity;
-import com.c2kernel.lifecycle.instance.stateMachine.Transition;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.InvalidAgentPathException;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.persistency.outcome.OutcomeInitiator;
-import com.c2kernel.persistency.outcome.Schema;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.scripting.ErrorInfo;
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.KeyValuePair;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.lifecycle.instance.Activity;
+import org.cristalise.kernel.lifecycle.instance.stateMachine.Transition;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.InvalidAgentPathException;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.persistency.outcome.OutcomeInitiator;
+import org.cristalise.kernel.persistency.outcome.Schema;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.scripting.ErrorInfo;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.KeyValuePair;
+import org.cristalise.kernel.utils.Logger;
+
 
 /*******************************************************************************
  * @author $Author: abranson $ $Date: 2005/05/20 13:07:49 $
diff --git a/src/main/java/com/c2kernel/entity/agent/JobArrayList.java b/src/main/java/org/cristalise/kernel/entity/agent/JobArrayList.java
index b296714..f4233fb 100644
--- a/src/main/java/com/c2kernel/entity/agent/JobArrayList.java
+++ b/src/main/java/org/cristalise/kernel/entity/agent/JobArrayList.java
@@ -18,11 +18,12 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.agent;
+package org.cristalise.kernel.entity.agent;
 
 import java.util.ArrayList;
 
-import com.c2kernel.utils.CastorArrayList;
+import org.cristalise.kernel.utils.CastorArrayList;
+
 
 public class JobArrayList extends CastorArrayList<Job>
 {
diff --git a/src/main/java/com/c2kernel/entity/agent/JobList.java b/src/main/java/org/cristalise/kernel/entity/agent/JobList.java
index bd7013e..b4e2a27 100644
--- a/src/main/java/com/c2kernel/entity/agent/JobList.java
+++ b/src/main/java/org/cristalise/kernel/entity/agent/JobList.java
@@ -18,16 +18,17 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.agent;
+package org.cristalise.kernel.entity.agent;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Vector;
 
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.RemoteMap;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.RemoteMap;
+import org.cristalise.kernel.utils.Logger;
+
 
 
 /**************************************************************************
diff --git a/src/main/java/com/c2kernel/entity/agent/package-info.java b/src/main/java/org/cristalise/kernel/entity/agent/package-info.java
index 4ee9b29..f5e146b 100644
--- a/src/main/java/com/c2kernel/entity/agent/package-info.java
+++ b/src/main/java/org/cristalise/kernel/entity/agent/package-info.java
@@ -29,4 +29,4 @@
  * 
  */
 
-package com.c2kernel.entity.agent;
-\ No newline at end of file
+package org.cristalise.kernel.entity.agent;
+\ No newline at end of file
diff --git a/src/main/java/com/c2kernel/entity/imports/Geometry.java b/src/main/java/org/cristalise/kernel/entity/imports/Geometry.java
index 72523bf..3680053 100644
--- a/src/main/java/com/c2kernel/entity/imports/Geometry.java
+++ b/src/main/java/org/cristalise/kernel/entity/imports/Geometry.java
@@ -19,7 +19,7 @@
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
 
-package com.c2kernel.entity.imports;
+package org.cristalise.kernel.entity.imports;
 
 
 
diff --git a/src/main/java/com/c2kernel/entity/imports/ImportAgent.java b/src/main/java/org/cristalise/kernel/entity/imports/ImportAgent.java
index 70a5d91..08c13d1 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportAgent.java
+++ b/src/main/java/org/cristalise/kernel/entity/imports/ImportAgent.java
@@ -18,23 +18,24 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.imports;
+package org.cristalise.kernel.entity.imports;
 
 import java.util.ArrayList;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.agent.ActiveEntity;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.process.module.ModuleImport;
-import com.c2kernel.property.Property;
-import com.c2kernel.property.PropertyArrayList;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.agent.ActiveEntity;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.process.module.ModuleImport;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.property.PropertyArrayList;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class ImportAgent extends ModuleImport {
 
diff --git a/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java b/src/main/java/org/cristalise/kernel/entity/imports/ImportAggregation.java
index cd114ed..22a9b78 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java
+++ b/src/main/java/org/cristalise/kernel/entity/imports/ImportAggregation.java
@@ -18,23 +18,24 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.imports;
+package org.cristalise.kernel.entity.imports;
 
 import java.util.ArrayList;
 
-import com.c2kernel.collection.Aggregation;
-import com.c2kernel.collection.AggregationDescription;
-import com.c2kernel.collection.AggregationInstance;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.property.PropertyDescription;
-import com.c2kernel.property.PropertyDescriptionList;
-import com.c2kernel.property.PropertyUtility;
+import org.cristalise.kernel.collection.Aggregation;
+import org.cristalise.kernel.collection.AggregationDescription;
+import org.cristalise.kernel.collection.AggregationInstance;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.property.PropertyDescription;
+import org.cristalise.kernel.property.PropertyDescriptionList;
+import org.cristalise.kernel.property.PropertyUtility;
+
 
 public class ImportAggregation {
 
@@ -53,7 +54,7 @@ public class ImportAggregation {
         this.isDescription = isDescription;
     }
 
-	public com.c2kernel.collection.Aggregation create() throws InvalidCollectionModification, ObjectNotFoundException, ObjectAlreadyExistsException {
+	public org.cristalise.kernel.collection.Aggregation create() throws InvalidCollectionModification, ObjectNotFoundException, ObjectAlreadyExistsException {
         Aggregation newAgg = isDescription?new AggregationDescription(name):new AggregationInstance(name);
         if (version!= null) newAgg.setVersion(version);
         for (ImportAggregationMember thisMem : aggregationMemberList) {
diff --git a/src/main/java/com/c2kernel/entity/imports/ImportAggregationMember.java b/src/main/java/org/cristalise/kernel/entity/imports/ImportAggregationMember.java
index d336fb4..53b74b8 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportAggregationMember.java
+++ b/src/main/java/org/cristalise/kernel/entity/imports/ImportAggregationMember.java
@@ -18,10 +18,10 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.imports;
+package org.cristalise.kernel.entity.imports;
 
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.KeyValuePair;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.KeyValuePair;
 
 public class ImportAggregationMember {
 
diff --git a/src/main/java/com/c2kernel/entity/imports/ImportDependency.java b/src/main/java/org/cristalise/kernel/entity/imports/ImportDependency.java
index 01900d3..f94cab0 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportDependency.java
+++ b/src/main/java/org/cristalise/kernel/entity/imports/ImportDependency.java
@@ -18,23 +18,24 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.imports;
+package org.cristalise.kernel.entity.imports;
 
 import java.util.ArrayList;
 
-import com.c2kernel.collection.Dependency;
-import com.c2kernel.collection.DependencyDescription;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.property.PropertyDescription;
-import com.c2kernel.property.PropertyDescriptionList;
-import com.c2kernel.property.PropertyUtility;
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.KeyValuePair;
+import org.cristalise.kernel.collection.Dependency;
+import org.cristalise.kernel.collection.DependencyDescription;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.property.PropertyDescription;
+import org.cristalise.kernel.property.PropertyDescriptionList;
+import org.cristalise.kernel.property.PropertyUtility;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.KeyValuePair;
+
 
 public class ImportDependency {
 
@@ -67,7 +68,7 @@ public class ImportDependency {
      * @return
 	 * @throws ObjectAlreadyExistsException 
      */
-    public com.c2kernel.collection.Dependency create() throws InvalidCollectionModification, ObjectNotFoundException, ObjectAlreadyExistsException {
+    public org.cristalise.kernel.collection.Dependency create() throws InvalidCollectionModification, ObjectNotFoundException, ObjectAlreadyExistsException {
         Dependency newDep = isDescription?new DependencyDescription(name):new Dependency(name);
         if (version!= null) newDep.setVersion(version);
         if (itemDescriptionPath != null && itemDescriptionPath.length()>0) {
@@ -97,7 +98,7 @@ public class ImportDependency {
         		itemPath = new DomainPath(thisMem.itemPath).getItemPath();
         	}
         	
-            com.c2kernel.collection.DependencyMember newDepMem = newDep.addMember(itemPath);
+            org.cristalise.kernel.collection.DependencyMember newDepMem = newDep.addMember(itemPath);
             newDepMem.getProperties().putAll(thisMem.props);
         }
         return newDep;
diff --git a/src/main/java/com/c2kernel/entity/imports/ImportDependencyMember.java b/src/main/java/org/cristalise/kernel/entity/imports/ImportDependencyMember.java
index aff5087..5a5d6cd 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportDependencyMember.java
+++ b/src/main/java/org/cristalise/kernel/entity/imports/ImportDependencyMember.java
@@ -18,10 +18,10 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.imports;
+package org.cristalise.kernel.entity.imports;
 
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.KeyValuePair;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.KeyValuePair;
 
 public class ImportDependencyMember {
 
diff --git a/src/main/java/com/c2kernel/entity/imports/ImportItem.java b/src/main/java/org/cristalise/kernel/entity/imports/ImportItem.java
index 0e067f8..2a259bd 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportItem.java
+++ b/src/main/java/org/cristalise/kernel/entity/imports/ImportItem.java
@@ -18,41 +18,41 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.imports;
+package org.cristalise.kernel.entity.imports;
 
 
 import java.util.ArrayList;
 
+import org.cristalise.kernel.collection.Aggregation;
+import org.cristalise.kernel.collection.CollectionArrayList;
+import org.cristalise.kernel.collection.Dependency;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.TraceableEntity;
+import org.cristalise.kernel.events.Event;
+import org.cristalise.kernel.events.History;
+import org.cristalise.kernel.lifecycle.CompositeActivityDef;
+import org.cristalise.kernel.lifecycle.instance.stateMachine.Transition;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.process.module.ModuleImport;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.property.PropertyArrayList;
+import org.cristalise.kernel.utils.LocalObjectLoader;
+import org.cristalise.kernel.utils.Logger;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 
-import com.c2kernel.collection.Aggregation;
-import com.c2kernel.collection.CollectionArrayList;
-import com.c2kernel.collection.Dependency;
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.TraceableEntity;
-import com.c2kernel.events.Event;
-import com.c2kernel.events.History;
-import com.c2kernel.lifecycle.CompositeActivityDef;
-import com.c2kernel.lifecycle.instance.stateMachine.Transition;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.process.module.ModuleImport;
-import com.c2kernel.property.Property;
-import com.c2kernel.property.PropertyArrayList;
-import com.c2kernel.utils.LocalObjectLoader;
-import com.c2kernel.utils.Logger;
 
 /**
  * Complete Structure for new item
diff --git a/src/main/java/com/c2kernel/entity/imports/ImportOutcome.java b/src/main/java/org/cristalise/kernel/entity/imports/ImportOutcome.java
index 60279dc..b3be323 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportOutcome.java
+++ b/src/main/java/org/cristalise/kernel/entity/imports/ImportOutcome.java
@@ -18,10 +18,11 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.imports;
+package org.cristalise.kernel.entity.imports;
+
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.process.Gateway;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.process.Gateway;
 
 public class ImportOutcome {
 	public String schema, viewname, path, data;
diff --git a/src/main/java/com/c2kernel/entity/imports/ImportRole.java b/src/main/java/org/cristalise/kernel/entity/imports/ImportRole.java
index 3583b0b..daf1b4c 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportRole.java
+++ b/src/main/java/org/cristalise/kernel/entity/imports/ImportRole.java
@@ -18,19 +18,20 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.imports;
+package org.cristalise.kernel.entity.imports;
 
 import java.util.Iterator;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.Path;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.process.module.ModuleImport;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.Path;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.process.module.ModuleImport;
+
 
 public class ImportRole extends ModuleImport {
 
diff --git a/src/main/java/com/c2kernel/entity/package-info.java b/src/main/java/org/cristalise/kernel/entity/package-info.java
index 4e36ee9..23ab74c 100644
--- a/src/main/java/com/c2kernel/entity/package-info.java
+++ b/src/main/java/org/cristalise/kernel/entity/package-info.java
@@ -36,4 +36,4 @@
  * mechanism.
  */
 
-package com.c2kernel.entity;
-\ No newline at end of file
+package org.cristalise.kernel.entity;
+\ No newline at end of file
diff --git a/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java b/src/main/java/org/cristalise/kernel/entity/proxy/AgentProxy.java
index df26ab5..4b05764 100644
--- a/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java
+++ b/src/main/java/org/cristalise/kernel/entity/proxy/AgentProxy.java
@@ -18,38 +18,39 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.proxy;
+package org.cristalise.kernel.entity.proxy;
 
 import java.util.Date;
 import java.util.Iterator;
 
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.Agent;
-import com.c2kernel.entity.AgentHelper;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.entity.agent.Job;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.Path;
-import com.c2kernel.persistency.outcome.OutcomeValidator;
-import com.c2kernel.persistency.outcome.Schema;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.process.auth.Authenticator;
-import com.c2kernel.scripting.ErrorInfo;
-import com.c2kernel.scripting.Script;
-import com.c2kernel.scripting.ScriptErrorException;
-import com.c2kernel.scripting.ScriptingEngineException;
-import com.c2kernel.utils.LocalObjectLoader;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.Agent;
+import org.cristalise.kernel.entity.AgentHelper;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.entity.agent.Job;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.Path;
+import org.cristalise.kernel.persistency.outcome.OutcomeValidator;
+import org.cristalise.kernel.persistency.outcome.Schema;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.process.auth.Authenticator;
+import org.cristalise.kernel.scripting.ErrorInfo;
+import org.cristalise.kernel.scripting.Script;
+import org.cristalise.kernel.scripting.ScriptErrorException;
+import org.cristalise.kernel.scripting.ScriptingEngineException;
+import org.cristalise.kernel.utils.LocalObjectLoader;
+import org.cristalise.kernel.utils.Logger;
+
 
 /******************************************************************************
  * It is a wrapper for the connection and communication with Agent
diff --git a/src/main/java/com/c2kernel/entity/proxy/DomainPathSubscriber.java b/src/main/java/org/cristalise/kernel/entity/proxy/DomainPathSubscriber.java
index 4e8b278..bce1fa7 100644
--- a/src/main/java/com/c2kernel/entity/proxy/DomainPathSubscriber.java
+++ b/src/main/java/org/cristalise/kernel/entity/proxy/DomainPathSubscriber.java
@@ -18,9 +18,9 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.proxy;
+package org.cristalise.kernel.entity.proxy;
 
-import com.c2kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.DomainPath;
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java b/src/main/java/org/cristalise/kernel/entity/proxy/ItemProxy.java
index 7a2d930..326da36 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java
+++ b/src/main/java/org/cristalise/kernel/entity/proxy/ItemProxy.java
@@ -18,42 +18,42 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.proxy;
+package org.cristalise.kernel.entity.proxy;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 
+import org.cristalise.kernel.collection.Collection;
+import org.cristalise.kernel.collection.CollectionArrayList;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.entity.Item;
+import org.cristalise.kernel.entity.ItemHelper;
+import org.cristalise.kernel.entity.agent.Job;
+import org.cristalise.kernel.entity.agent.JobArrayList;
+import org.cristalise.kernel.lifecycle.instance.CompositeActivity;
+import org.cristalise.kernel.lifecycle.instance.Workflow;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.property.PropertyArrayList;
+import org.cristalise.kernel.utils.CastorXMLUtility;
+import org.cristalise.kernel.utils.Logger;
 import org.exolab.castor.mapping.MappingException;
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
 
-import com.c2kernel.collection.Collection;
-import com.c2kernel.collection.CollectionArrayList;
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.entity.Item;
-import com.c2kernel.entity.ItemHelper;
-import com.c2kernel.entity.agent.Job;
-import com.c2kernel.entity.agent.JobArrayList;
-import com.c2kernel.lifecycle.instance.CompositeActivity;
-import com.c2kernel.lifecycle.instance.Workflow;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.Property;
-import com.c2kernel.property.PropertyArrayList;
-import com.c2kernel.utils.CastorXMLUtility;
-import com.c2kernel.utils.Logger;
 
 /******************************************************************************
  * It is a wrapper for the connection and communication with Item
diff --git a/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java b/src/main/java/org/cristalise/kernel/entity/proxy/MemberSubscription.java
index 60e5233..2873eb8 100644
--- a/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java
+++ b/src/main/java/org/cristalise/kernel/entity/proxy/MemberSubscription.java
@@ -18,14 +18,15 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.proxy;
+package org.cristalise.kernel.entity.proxy;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class MemberSubscription<C extends C2KLocalObject> implements Runnable {
 	public static final String ERROR = "Error";
diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyClientConnection.java b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyClientConnection.java
index 4aff44b..9f65afa 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ProxyClientConnection.java
+++ b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyClientConnection.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.proxy;
+package org.cristalise.kernel.entity.proxy;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -30,11 +30,12 @@ import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
-import com.c2kernel.utils.server.SocketHandler;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+import org.cristalise.kernel.utils.server.SocketHandler;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyManager.java
index aa38ea8..6f5bde3 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java
+++ b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyManager.java
@@ -18,24 +18,25 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.proxy;
+package org.cristalise.kernel.entity.proxy;
 
 import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.Path;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.Property;
-import com.c2kernel.utils.Logger;
-import com.c2kernel.utils.SoftCache;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.Path;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.utils.Logger;
+import org.cristalise.kernel.utils.SoftCache;
+
 
 
 public class ProxyManager
diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyMessage.java b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyMessage.java
index 354ec32..61fdcd4 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ProxyMessage.java
+++ b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyMessage.java
@@ -18,14 +18,15 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.proxy;
+package org.cristalise.kernel.entity.proxy;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+
 
 
 /**************************************************************************
diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyObserver.java b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyObserver.java
index 3104967..bd21034 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ProxyObserver.java
+++ b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyObserver.java
@@ -18,9 +18,9 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.proxy;
+package org.cristalise.kernel.entity.proxy;
 
-import com.c2kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.entity.C2KLocalObject;
 
 
 
diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyServer.java b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyServer.java
index 25c2cd9..249ec0f 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ProxyServer.java
+++ b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyServer.java
@@ -18,14 +18,15 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.proxy;
+package org.cristalise.kernel.entity.proxy;
 
 import java.util.ArrayList;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
-import com.c2kernel.utils.server.SimpleTCPIPServer;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+import org.cristalise.kernel.utils.server.SimpleTCPIPServer;
+
 
 public class ProxyServer implements Runnable {
 
diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyServerConnection.java b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyServerConnection.java
index 25a7216..1b4fba4 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ProxyServerConnection.java
+++ b/src/main/java/org/cristalise/kernel/entity/proxy/ProxyServerConnection.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.proxy;
+package org.cristalise.kernel.entity.proxy;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -27,8 +27,9 @@ import java.io.InterruptedIOException;
 import java.io.PrintWriter;
 import java.net.Socket;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.utils.Logger;
+
 
 
 public class ProxyServerConnection extends Thread
diff --git a/src/main/java/com/c2kernel/entity/proxy/package-info.java b/src/main/java/org/cristalise/kernel/entity/proxy/package-info.java
index 5b73dbd..6391b65 100644
--- a/src/main/java/com/c2kernel/entity/proxy/package-info.java
+++ b/src/main/java/org/cristalise/kernel/entity/proxy/package-info.java
@@ -73,4 +73,4 @@
  * informed of changes to Item data through {@link ProxyMessage} objects.
  * 
  */
-package com.c2kernel.entity.proxy;
-\ No newline at end of file
+package org.cristalise.kernel.entity.proxy;
+\ No newline at end of file
diff --git a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java b/src/main/java/org/cristalise/kernel/entity/transfer/TransferItem.java
index 0e8123b..6b6901f 100644
--- a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java
+++ b/src/main/java/org/cristalise/kernel/entity/transfer/TransferItem.java
@@ -18,30 +18,31 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.transfer;
+package org.cristalise.kernel.entity.transfer;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.c2kernel.collection.Collection;
-import com.c2kernel.collection.CollectionArrayList;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.entity.TraceableEntity;
-import com.c2kernel.lifecycle.instance.Workflow;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.Path;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.Property;
-import com.c2kernel.property.PropertyArrayList;
-import com.c2kernel.utils.FileStringUtility;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.collection.Collection;
+import org.cristalise.kernel.collection.CollectionArrayList;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.entity.TraceableEntity;
+import org.cristalise.kernel.lifecycle.instance.Workflow;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.Path;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.property.PropertyArrayList;
+import org.cristalise.kernel.utils.FileStringUtility;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class TransferItem {
     private ArrayList<String> domainPaths;
diff --git a/src/main/java/com/c2kernel/entity/transfer/TransferSet.java b/src/main/java/org/cristalise/kernel/entity/transfer/TransferSet.java
index b6b4ecc..c4a578a 100644
--- a/src/main/java/com/c2kernel/entity/transfer/TransferSet.java
+++ b/src/main/java/org/cristalise/kernel/entity/transfer/TransferSet.java
@@ -18,15 +18,16 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.entity.transfer;
+package org.cristalise.kernel.entity.transfer;
 
 import java.io.File;
 import java.util.ArrayList;
 
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.FileStringUtility;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.FileStringUtility;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/entity/transfer/package-info.java b/src/main/java/org/cristalise/kernel/entity/transfer/package-info.java
index 64a1846..bfd8317 100644
--- a/src/main/java/com/c2kernel/entity/transfer/package-info.java
+++ b/src/main/java/org/cristalise/kernel/entity/transfer/package-info.java
@@ -33,4 +33,4 @@
  * 
  */
 
-package com.c2kernel.entity.transfer;
-\ No newline at end of file
+package org.cristalise.kernel.entity.transfer;
+\ No newline at end of file
diff --git a/src/main/java/com/c2kernel/events/Event.java b/src/main/java/org/cristalise/kernel/events/Event.java
index 87afdf4..192685f 100644
--- a/src/main/java/com/c2kernel/events/Event.java
+++ b/src/main/java/org/cristalise/kernel/events/Event.java
@@ -18,17 +18,18 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.events;
+package org.cristalise.kernel.events;
 
 import java.util.Calendar;
 
-import com.c2kernel.common.GTimeStamp;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.common.GTimeStamp;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+
 
 
 /**
@@ -328,7 +329,7 @@ public class Event implements C2KLocalObject
                                now.get(Calendar.ZONE_OFFSET) );
     }
 	/**
-	 * @see com.c2kernel.entity.C2KLocalObject#getClusterType()
+	 * @see org.cristalise.kernel.entity.C2KLocalObject#getClusterType()
 	 */
 	@Override
 	public String getClusterType() {
diff --git a/src/main/java/com/c2kernel/events/History.java b/src/main/java/org/cristalise/kernel/events/History.java
index a197f65..bca0fa8 100644
--- a/src/main/java/com/c2kernel/events/History.java
+++ b/src/main/java/org/cristalise/kernel/events/History.java
@@ -18,16 +18,17 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.events;
+package org.cristalise.kernel.events;
 
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.lifecycle.instance.stateMachine.Transition;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.RemoteMap;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.lifecycle.instance.stateMachine.Transition;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.RemoteMap;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**
  * @author Andrew Branson
diff --git a/src/main/java/com/c2kernel/events/package-info.java b/src/main/java/org/cristalise/kernel/events/package-info.java
index 5ce56cf..3e3c37d 100644
--- a/src/main/java/com/c2kernel/events/package-info.java
+++ b/src/main/java/org/cristalise/kernel/events/package-info.java
@@ -26,4 +26,4 @@
  * live view onto the Events of an Item.
  */
 
-package com.c2kernel.events;
-\ No newline at end of file
+package org.cristalise.kernel.events;
+\ No newline at end of file
diff --git a/src/main/java/com/c2kernel/graph/event/ClearedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/ClearedEvent.java
index 691b806..8589637 100644
--- a/src/main/java/com/c2kernel/graph/event/ClearedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/ClearedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class ClearedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/EdgeRemovedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/EdgeRemovedEvent.java
index 49fab29..bac5715 100644
--- a/src/main/java/com/c2kernel/graph/event/EdgeRemovedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/EdgeRemovedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class EdgeRemovedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/EdgesChangedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/EdgesChangedEvent.java
index 3ed311b..c3cfe7a 100644
--- a/src/main/java/com/c2kernel/graph/event/EdgesChangedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/EdgesChangedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class EdgesChangedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/EntireModelChangedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/EntireModelChangedEvent.java
index 2a47ee7..1ea5fa4 100644
--- a/src/main/java/com/c2kernel/graph/event/EntireModelChangedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/EntireModelChangedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class EntireModelChangedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/ForcedNotifyEvent.java b/src/main/java/org/cristalise/kernel/graph/event/ForcedNotifyEvent.java
index 1f988e3..e2801f2 100644
--- a/src/main/java/com/c2kernel/graph/event/ForcedNotifyEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/ForcedNotifyEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class ForcedNotifyEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/GraphModelEvent.java b/src/main/java/org/cristalise/kernel/graph/event/GraphModelEvent.java
index ce54e14..cc066f8 100644
--- a/src/main/java/com/c2kernel/graph/event/GraphModelEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/GraphModelEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public abstract class GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/GraphModelResizedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/GraphModelResizedEvent.java
index 6886905..a4de89d 100644
--- a/src/main/java/com/c2kernel/graph/event/GraphModelResizedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/GraphModelResizedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class GraphModelResizedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/NewEdgeEndPointChangedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/NewEdgeEndPointChangedEvent.java
index c1e9e3d..42a2507 100644
--- a/src/main/java/com/c2kernel/graph/event/NewEdgeEndPointChangedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/NewEdgeEndPointChangedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class NewEdgeEndPointChangedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/StartVertexIdChangedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/StartVertexIdChangedEvent.java
index 9ea5828..7d3d7e3 100644
--- a/src/main/java/com/c2kernel/graph/event/StartVertexIdChangedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/StartVertexIdChangedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class StartVertexIdChangedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/VertexAddedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/VertexAddedEvent.java
index d76cd23..7f4fcbe 100644
--- a/src/main/java/com/c2kernel/graph/event/VertexAddedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/VertexAddedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class VertexAddedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/VertexCreatedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/VertexCreatedEvent.java
index f74c689..e0f0eee 100644
--- a/src/main/java/com/c2kernel/graph/event/VertexCreatedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/VertexCreatedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class VertexCreatedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/VertexMovedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/VertexMovedEvent.java
index 239efc7..9e5d8a8 100644
--- a/src/main/java/com/c2kernel/graph/event/VertexMovedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/VertexMovedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class VertexMovedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/VertexRemovedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/VertexRemovedEvent.java
index 2544506..29f4367 100644
--- a/src/main/java/com/c2kernel/graph/event/VertexRemovedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/VertexRemovedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class VertexRemovedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/event/VerticesChangedEvent.java b/src/main/java/org/cristalise/kernel/graph/event/VerticesChangedEvent.java
index 23d4385..68cc9f1 100644
--- a/src/main/java/com/c2kernel/graph/event/VerticesChangedEvent.java
+++ b/src/main/java/org/cristalise/kernel/graph/event/VerticesChangedEvent.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.event;
+package org.cristalise.kernel.graph.event;
 
 
 public class VerticesChangedEvent extends GraphModelEvent
diff --git a/src/main/java/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java b/src/main/java/org/cristalise/kernel/graph/layout/DefaultGraphLayoutGenerator.java
index 37f50f3..097c554 100644
--- a/src/main/java/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java
+++ b/src/main/java/org/cristalise/kernel/graph/layout/DefaultGraphLayoutGenerator.java
@@ -18,15 +18,16 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.layout;
+package org.cristalise.kernel.graph.layout;
 
 import java.util.Vector;
 
-import com.c2kernel.graph.model.DirectedEdge;
-import com.c2kernel.graph.model.GraphModel;
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.graph.model.DirectedEdge;
+import org.cristalise.kernel.graph.model.GraphModel;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class DefaultGraphLayoutGenerator {
     private static int mTopMargin = 100;
diff --git a/src/main/java/com/c2kernel/graph/model/DirectedEdge.java b/src/main/java/org/cristalise/kernel/graph/model/DirectedEdge.java
index 7de85d3..e384131 100644
--- a/src/main/java/com/c2kernel/graph/model/DirectedEdge.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/DirectedEdge.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
 
 
diff --git a/src/main/java/com/c2kernel/graph/model/EdgeFactory.java b/src/main/java/org/cristalise/kernel/graph/model/EdgeFactory.java
index 402e8b7..f4c119a 100644
--- a/src/main/java/com/c2kernel/graph/model/EdgeFactory.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/EdgeFactory.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
 
 
diff --git a/src/main/java/com/c2kernel/graph/model/GraphModel.java b/src/main/java/org/cristalise/kernel/graph/model/GraphModel.java
index d2d39d9..4ccbece 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphModel.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/GraphModel.java
@@ -18,24 +18,25 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
 import java.util.Hashtable;
 
-import com.c2kernel.graph.event.ClearedEvent;
-import com.c2kernel.graph.event.EdgeRemovedEvent;
-import com.c2kernel.graph.event.EdgesChangedEvent;
-import com.c2kernel.graph.event.ForcedNotifyEvent;
-import com.c2kernel.graph.event.GraphModelEvent;
-import com.c2kernel.graph.event.GraphModelResizedEvent;
-import com.c2kernel.graph.event.NewEdgeEndPointChangedEvent;
-import com.c2kernel.graph.event.StartVertexIdChangedEvent;
-import com.c2kernel.graph.event.VertexAddedEvent;
-import com.c2kernel.graph.event.VertexCreatedEvent;
-import com.c2kernel.graph.event.VertexMovedEvent;
-import com.c2kernel.graph.event.VertexRemovedEvent;
-import com.c2kernel.graph.event.VerticesChangedEvent;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.graph.event.ClearedEvent;
+import org.cristalise.kernel.graph.event.EdgeRemovedEvent;
+import org.cristalise.kernel.graph.event.EdgesChangedEvent;
+import org.cristalise.kernel.graph.event.ForcedNotifyEvent;
+import org.cristalise.kernel.graph.event.GraphModelEvent;
+import org.cristalise.kernel.graph.event.GraphModelResizedEvent;
+import org.cristalise.kernel.graph.event.NewEdgeEndPointChangedEvent;
+import org.cristalise.kernel.graph.event.StartVertexIdChangedEvent;
+import org.cristalise.kernel.graph.event.VertexAddedEvent;
+import org.cristalise.kernel.graph.event.VertexCreatedEvent;
+import org.cristalise.kernel.graph.event.VertexMovedEvent;
+import org.cristalise.kernel.graph.event.VertexRemovedEvent;
+import org.cristalise.kernel.graph.event.VerticesChangedEvent;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class GraphModel {
     /* Persistent data */
diff --git a/src/main/java/com/c2kernel/graph/model/GraphModelCastorData.java b/src/main/java/org/cristalise/kernel/graph/model/GraphModelCastorData.java
index e0c0c84..1f467a7 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphModelCastorData.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/GraphModelCastorData.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
 
 public class GraphModelCastorData
diff --git a/src/main/java/com/c2kernel/graph/model/GraphModelManager.java b/src/main/java/org/cristalise/kernel/graph/model/GraphModelManager.java
index a4209ce..1f89b50 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphModelManager.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/GraphModelManager.java
@@ -18,17 +18,18 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Observable;
 import java.util.Stack;
 
-import com.c2kernel.graph.event.EntireModelChangedEvent;
-import com.c2kernel.graph.event.ForcedNotifyEvent;
-import com.c2kernel.graph.event.GraphModelEvent;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.graph.event.EntireModelChangedEvent;
+import org.cristalise.kernel.graph.event.ForcedNotifyEvent;
+import org.cristalise.kernel.graph.event.GraphModelEvent;
+import org.cristalise.kernel.utils.Logger;
+
 
 
 public class GraphModelManager extends Observable
diff --git a/src/main/java/com/c2kernel/graph/model/GraphPoint.java b/src/main/java/org/cristalise/kernel/graph/model/GraphPoint.java
index dad49f9..a619733 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphPoint.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/GraphPoint.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
 
 public class GraphPoint {
diff --git a/src/main/java/com/c2kernel/graph/model/Graphable.java b/src/main/java/org/cristalise/kernel/graph/model/Graphable.java
index b2d6573..f4acbb7 100644
--- a/src/main/java/com/c2kernel/graph/model/Graphable.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/Graphable.java
@@ -18,14 +18,14 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
 /**
 * @version $Revision: 1.6 $ $Date: 2003/05/12 13:10:20 $
 * @author  $Author: abranson $
 */
 
-import com.c2kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.CastorHashMap;
 
 abstract public class Graphable extends Vertex
 {
diff --git a/src/main/java/com/c2kernel/graph/model/GraphableEdge.java b/src/main/java/org/cristalise/kernel/graph/model/GraphableEdge.java
index 8a48056..8f6ac79 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphableEdge.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/GraphableEdge.java
@@ -18,10 +18,10 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.KeyValuePair;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.KeyValuePair;
 
 /**
 * @version $Revision: 1.2 $ $Date: 2003/05/12 13:10:20 $
diff --git a/src/main/java/com/c2kernel/graph/model/GraphableVertex.java b/src/main/java/org/cristalise/kernel/graph/model/GraphableVertex.java
index b90441b..b82448e 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphableVertex.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/GraphableVertex.java
@@ -18,16 +18,17 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 /**
 * @version $Revision: 1.24 $ $Date: 2005/10/05 07:39:37 $
 * @author  $Author: abranson $
 */
 
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.KeyValuePair;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.KeyValuePair;
+
 public abstract class GraphableVertex extends Vertex
 {
 	private CastorHashMap mProperties = null;
@@ -235,7 +236,7 @@ public abstract class GraphableVertex extends Vertex
 	}
 
 	/**
-	 * @see com.c2kernel.graph.model.Vertex#getCentrePoint()
+	 * @see org.cristalise.kernel.graph.model.Vertex#getCentrePoint()
 	 */
 	@Override
 	public GraphPoint getCentrePoint()
@@ -245,7 +246,7 @@ public abstract class GraphableVertex extends Vertex
 		return super.getCentrePoint();
 	}
 	/**
-	 * @see com.c2kernel.graph.model.Vertex#getInEdgeIds()
+	 * @see org.cristalise.kernel.graph.model.Vertex#getInEdgeIds()
 	 */
 	@Override
 	public int[] getInEdgeIds()
@@ -255,7 +256,7 @@ public abstract class GraphableVertex extends Vertex
 		return super.getInEdgeIds();
 	}
 	/**
-	 * @see com.c2kernel.graph.model.Vertex#getOutEdgeIds()
+	 * @see org.cristalise.kernel.graph.model.Vertex#getOutEdgeIds()
 	 */
 	@Override
 	public int[] getOutEdgeIds()
@@ -265,7 +266,7 @@ public abstract class GraphableVertex extends Vertex
 		return super.getOutEdgeIds();
 	}
 	/**
-	 * @see com.c2kernel.graph.model.Vertex#getOutlinePoints()
+	 * @see org.cristalise.kernel.graph.model.Vertex#getOutlinePoints()
 	 */
 	@Override
 	public GraphPoint[] getOutlinePoints()
diff --git a/src/main/java/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java b/src/main/java/org/cristalise/kernel/graph/model/TypeNameAndConstructionInfo.java
index f3b348a..a9b5572 100644
--- a/src/main/java/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/TypeNameAndConstructionInfo.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
 
 
diff --git a/src/main/java/com/c2kernel/graph/model/Vertex.java b/src/main/java/org/cristalise/kernel/graph/model/Vertex.java
index 2aaa423..122bbdd 100644
--- a/src/main/java/com/c2kernel/graph/model/Vertex.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/Vertex.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
 import java.awt.Polygon;
 import java.util.Vector;
diff --git a/src/main/java/com/c2kernel/graph/model/VertexFactory.java b/src/main/java/org/cristalise/kernel/graph/model/VertexFactory.java
index 21b5906..5c5234e 100644
--- a/src/main/java/com/c2kernel/graph/model/VertexFactory.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/VertexFactory.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
 public interface VertexFactory
 {
diff --git a/src/main/java/com/c2kernel/graph/model/VertexOutlineCreator.java b/src/main/java/org/cristalise/kernel/graph/model/VertexOutlineCreator.java
index a1680ce..f4cb96c 100644
--- a/src/main/java/com/c2kernel/graph/model/VertexOutlineCreator.java
+++ b/src/main/java/org/cristalise/kernel/graph/model/VertexOutlineCreator.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.model;
+package org.cristalise.kernel.graph.model;
 
 
 
diff --git a/src/main/java/com/c2kernel/graph/package-info.java b/src/main/java/org/cristalise/kernel/graph/package-info.java
index e0e4c0d..5a1d5a6 100644
--- a/src/main/java/com/c2kernel/graph/package-info.java
+++ b/src/main/java/org/cristalise/kernel/graph/package-info.java
@@ -26,4 +26,4 @@
  *  
  */
 
-package com.c2kernel.graph;
-\ No newline at end of file
+package org.cristalise.kernel.graph;
+\ No newline at end of file
diff --git a/src/main/java/com/c2kernel/graph/traversal/GraphTraversal.java b/src/main/java/org/cristalise/kernel/graph/traversal/GraphTraversal.java
index 3b06d83..4cc5013 100644
--- a/src/main/java/com/c2kernel/graph/traversal/GraphTraversal.java
+++ b/src/main/java/org/cristalise/kernel/graph/traversal/GraphTraversal.java
@@ -18,13 +18,14 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.graph.traversal;
+package org.cristalise.kernel.graph.traversal;
 
 
 import java.util.Vector;
 
-import com.c2kernel.graph.model.GraphModel;
-import com.c2kernel.graph.model.Vertex;
+import org.cristalise.kernel.graph.model.GraphModel;
+import org.cristalise.kernel.graph.model.Vertex;
+
 
 
 public class GraphTraversal
diff --git a/src/main/java/com/c2kernel/lifecycle/ActivityDef.java b/src/main/java/org/cristalise/kernel/lifecycle/ActivityDef.java
index d783534..536fd3b 100644
--- a/src/main/java/com/c2kernel/lifecycle/ActivityDef.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/ActivityDef.java
@@ -18,16 +18,17 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
+package org.cristalise.kernel.lifecycle;
 import java.util.Vector;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.lifecycle.instance.Activity;
-import com.c2kernel.lifecycle.instance.WfVertex;
-import com.c2kernel.utils.DescriptionObject;
-import com.c2kernel.utils.FileStringUtility;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.lifecycle.instance.Activity;
+import org.cristalise.kernel.lifecycle.instance.WfVertex;
+import org.cristalise.kernel.utils.DescriptionObject;
+import org.cristalise.kernel.utils.FileStringUtility;
+
 /**
  * @version $Revision: 1.45 $ $Date: 2005/10/05 07:39:36 $
  * @author $Author: abranson $
@@ -48,7 +49,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject, Descript
 		setIsLayoutable(false);
 	}
 	/**
-	 * @see com.c2kernel.graph.model.Vertex#setID(int)
+	 * @see org.cristalise.kernel.graph.model.Vertex#setID(int)
 	 */
 	@Override
 	public void setID(int id)
@@ -58,7 +59,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject, Descript
 			setName(String.valueOf(id));
 	}
 	/**
-	 * @see com.c2kernel.graph.model.Vertex#getID()
+	 * @see org.cristalise.kernel.graph.model.Vertex#getID()
 	 */
 	@Override
 	public int getID()
@@ -66,7 +67,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject, Descript
 		return mId;
 	}
 	/**
-	 * @see com.c2kernel.graph.model.Vertex#setName(java.lang.String)
+	 * @see org.cristalise.kernel.graph.model.Vertex#setName(java.lang.String)
 	 */
 	@Override
 	public void setName(String n)
@@ -74,7 +75,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject, Descript
 		mName = n;
 	}
 	/**
-	 * @see com.c2kernel.graph.model.Vertex#getName()
+	 * @see org.cristalise.kernel.graph.model.Vertex#getName()
 	 */
 	@Override
 	public String getName()
@@ -88,7 +89,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject, Descript
 		mVersion = v;
 	}
 	/**
-	 * @see com.c2kernel.graph.model.Vertex#getName()
+	 * @see org.cristalise.kernel.graph.model.Vertex#getName()
 	 */
 	@Override
 	public int getVersion()
@@ -96,7 +97,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject, Descript
 		return mVersion;
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.WfVertexDef#getErrors()
+	 * @see org.cristalise.kernel.lifecycle.WfVertexDef#getErrors()
 	 */
 	@Override
 	public String getErrors()
@@ -117,7 +118,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject, Descript
 		setName(FileStringUtility.convert(name));
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.WfVertexDef#verify()
+	 * @see org.cristalise.kernel.lifecycle.WfVertexDef#verify()
 	 */
 	@Override
 	public boolean verify()
@@ -125,7 +126,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject, Descript
 		return true;
 	}
 	/**
-	 * @see com.c2kernel.entity.C2KLocalObject#getClusterType()
+	 * @see org.cristalise.kernel.entity.C2KLocalObject#getClusterType()
 	 */
 	@Override
 	public String getClusterType()
@@ -140,7 +141,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject, Descript
 	/*
 	 * (non-Javadoc)
 	 *
-	 * @see com.c2kernel.lifecycle.commonInterface.ActType#getDescName()
+	 * @see org.cristalise.kernel.lifecycle.commonInterface.ActType#getDescName()
 	 */
 	public String getDescName()
 	{
diff --git a/src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java b/src/main/java/org/cristalise/kernel/lifecycle/ActivitySlotDef.java
index 07a2867..89ddb86 100644
--- a/src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/ActivitySlotDef.java
@@ -18,15 +18,16 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.graph.traversal.GraphTraversal;
-import com.c2kernel.lifecycle.instance.Activity;
-import com.c2kernel.lifecycle.instance.WfVertex;
-import com.c2kernel.utils.KeyValuePair;
-import com.c2kernel.utils.LocalObjectLoader;
+package org.cristalise.kernel.lifecycle;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.graph.traversal.GraphTraversal;
+import org.cristalise.kernel.lifecycle.instance.Activity;
+import org.cristalise.kernel.lifecycle.instance.WfVertex;
+import org.cristalise.kernel.utils.KeyValuePair;
+import org.cristalise.kernel.utils.LocalObjectLoader;
+
 /**
  * @version $Revision: 1.46 $ $Date: 2005/10/05 07:39:36 $
  * @author $Author: abranson $
@@ -70,7 +71,7 @@ public class ActivitySlotDef extends WfVertexDef
 		return actDef;
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.WfVertexDef#verify()
+	 * @see org.cristalise.kernel.lifecycle.WfVertexDef#verify()
 	 */
 	/** launch the verification of the ActivityDef */
 	@Override
@@ -156,10 +157,10 @@ public class ActivitySlotDef extends WfVertexDef
 		return (WfVertexDef[]) getOutGraphables();
 	}
 	/**
-	 * @see com.c2kernel.graph.model.GraphableVertex#isLayoutable()
+	 * @see org.cristalise.kernel.graph.model.GraphableVertex#isLayoutable()
 	 */
 	/**
-	 * @see com.c2kernel.graph.model.GraphableVertex#getIsLayoutable()
+	 * @see org.cristalise.kernel.graph.model.GraphableVertex#getIsLayoutable()
 	 */
 	public boolean isLayoutable()
 	{
diff --git a/src/main/java/com/c2kernel/lifecycle/AndSplitDef.java b/src/main/java/org/cristalise/kernel/lifecycle/AndSplitDef.java
index fc653e8..6d6856a 100644
--- a/src/main/java/com/c2kernel/lifecycle/AndSplitDef.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/AndSplitDef.java
@@ -18,14 +18,15 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
+package org.cristalise.kernel.lifecycle;
 
 import java.util.Vector;
 
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.graph.traversal.GraphTraversal;
-import com.c2kernel.lifecycle.instance.AndSplit;
-import com.c2kernel.lifecycle.instance.WfVertex;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.graph.traversal.GraphTraversal;
+import org.cristalise.kernel.lifecycle.instance.AndSplit;
+import org.cristalise.kernel.lifecycle.instance.WfVertex;
+
 /**
  * @version $Revision: 1.19 $ $Date: 2005/09/29 10:18:31 $
  * @author  $Author: abranson $
@@ -44,7 +45,7 @@ public class AndSplitDef extends WfVertexDef
 	}
 
 	/**
-	 * @see com.c2kernel.lifecycle.WfVertexDef#verify()
+	 * @see org.cristalise.kernel.lifecycle.WfVertexDef#verify()
 	 */
 	@Override
 	public boolean verify()
diff --git a/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java b/src/main/java/org/cristalise/kernel/lifecycle/CompositeActivityDef.java
index c48595f..4341fbf 100644
--- a/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/CompositeActivityDef.java
@@ -18,18 +18,19 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.graph.model.GraphModel;
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.graph.model.GraphableVertex;
-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;
-import com.c2kernel.lifecycle.instance.CompositeActivity;
-import com.c2kernel.lifecycle.instance.Next;
-import com.c2kernel.lifecycle.instance.WfVertex;
-import com.c2kernel.utils.Language;
-import com.c2kernel.utils.Logger;
+package org.cristalise.kernel.lifecycle;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.graph.model.GraphModel;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.graph.model.GraphableVertex;
+import org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo;
+import org.cristalise.kernel.lifecycle.instance.CompositeActivity;
+import org.cristalise.kernel.lifecycle.instance.Next;
+import org.cristalise.kernel.lifecycle.instance.WfVertex;
+import org.cristalise.kernel.utils.Language;
+import org.cristalise.kernel.utils.Logger;
+
 /**
  * @version $Revision: 1.93 $ $Date: 2005/10/05 07:39:36 $
  * @author $Author: abranson $
@@ -226,7 +227,7 @@ public class CompositeActivityDef extends ActivityDef
 	}
 
 	/**
-	 * @see com.c2kernel.graph.model.GraphableVertex#getPath()
+	 * @see org.cristalise.kernel.graph.model.GraphableVertex#getPath()
 	 */
 	@Override
 	public String getPath()
diff --git a/src/main/java/com/c2kernel/lifecycle/JoinDef.java b/src/main/java/org/cristalise/kernel/lifecycle/JoinDef.java
index fcc5bab..a198453 100644
--- a/src/main/java/com/c2kernel/lifecycle/JoinDef.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/JoinDef.java
@@ -18,10 +18,10 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
+package org.cristalise.kernel.lifecycle;
 
-import com.c2kernel.lifecycle.instance.Join;
-import com.c2kernel.lifecycle.instance.WfVertex;
+import org.cristalise.kernel.lifecycle.instance.Join;
+import org.cristalise.kernel.lifecycle.instance.WfVertex;
 
 /**
  * @version $Revision: 1.18 $ $Date: 2005/09/29 10:18:31 $
@@ -36,7 +36,7 @@ public class JoinDef extends WfVertexDef
 	{
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.WfVertexDef#verify()
+	 * @see org.cristalise.kernel.lifecycle.WfVertexDef#verify()
 	 */
 	@Override
 	public boolean verify()
diff --git a/src/main/java/com/c2kernel/lifecycle/LoopDef.java b/src/main/java/org/cristalise/kernel/lifecycle/LoopDef.java
index 5c2c119..96a6f3f 100644
--- a/src/main/java/com/c2kernel/lifecycle/LoopDef.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/LoopDef.java
@@ -18,12 +18,12 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
+package org.cristalise.kernel.lifecycle;
 
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.graph.traversal.GraphTraversal;
-import com.c2kernel.lifecycle.instance.Loop;
-import com.c2kernel.lifecycle.instance.WfVertex;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.graph.traversal.GraphTraversal;
+import org.cristalise.kernel.lifecycle.instance.Loop;
+import org.cristalise.kernel.lifecycle.instance.WfVertex;
 
 /**
  * @version $Revision: 1.19 $ $Date: 2005/09/29 10:18:31 $
@@ -44,7 +44,7 @@ public class LoopDef extends XOrSplitDef
 	}
 
 	/**
-	 * @see com.c2kernel.lifecycle.WfVertexDef#loop()
+	 * @see org.cristalise.kernel.lifecycle.WfVertexDef#loop()
 	 */
 	@Override
 	public boolean loop()
@@ -53,7 +53,7 @@ public class LoopDef extends XOrSplitDef
 	}
 
 	/**
-	 * @see com.c2kernel.lifecycle.WfVertexDef#verify()
+	 * @see org.cristalise.kernel.lifecycle.WfVertexDef#verify()
 	 */
 	@Override
 	public boolean verify()
diff --git a/src/main/java/com/c2kernel/lifecycle/NextDef.java b/src/main/java/org/cristalise/kernel/lifecycle/NextDef.java
index 7fc2ed9..463e7a4 100644
--- a/src/main/java/com/c2kernel/lifecycle/NextDef.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/NextDef.java
@@ -18,10 +18,10 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.graph.model.GraphableEdge;
-import com.c2kernel.lifecycle.instance.Next;
+package org.cristalise.kernel.lifecycle;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.graph.model.GraphableEdge;
+import org.cristalise.kernel.lifecycle.instance.Next;
 /**
  * @version $Revision: 1.32 $ $Date: 2006/03/03 13:52:21 $
  * @author $Author: abranson $
diff --git a/src/main/java/com/c2kernel/lifecycle/OrSplitDef.java b/src/main/java/org/cristalise/kernel/lifecycle/OrSplitDef.java
index 86597f2..c51c5fa 100644
--- a/src/main/java/com/c2kernel/lifecycle/OrSplitDef.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/OrSplitDef.java
@@ -18,9 +18,9 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
-import com.c2kernel.lifecycle.instance.OrSplit;
-import com.c2kernel.lifecycle.instance.WfVertex;
+package org.cristalise.kernel.lifecycle;
+import org.cristalise.kernel.lifecycle.instance.OrSplit;
+import org.cristalise.kernel.lifecycle.instance.WfVertex;
 /**
  * @version $Revision: 1.13 $ $Date: 2005/12/01 14:23:15 $
  * @author $Author: abranson $
diff --git a/src/main/java/com/c2kernel/lifecycle/WfCastorHashMap.java b/src/main/java/org/cristalise/kernel/lifecycle/WfCastorHashMap.java
index 922a92d..e30e9c3 100644
--- a/src/main/java/com/c2kernel/lifecycle/WfCastorHashMap.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/WfCastorHashMap.java
@@ -18,8 +18,8 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
-import com.c2kernel.utils.CastorHashMap;
+package org.cristalise.kernel.lifecycle;
+import org.cristalise.kernel.utils.CastorHashMap;
 /**
  * @version $Revision: 1.29 $ $Date: 2005/05/20 13:07:13 $
  * @author  $Author: abranson $
diff --git a/src/main/java/com/c2kernel/lifecycle/WfVertexDef.java b/src/main/java/org/cristalise/kernel/lifecycle/WfVertexDef.java
index 08e6451..939423a 100644
--- a/src/main/java/com/c2kernel/lifecycle/WfVertexDef.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/WfVertexDef.java
@@ -18,15 +18,16 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
+package org.cristalise.kernel.lifecycle;
 
 import java.util.Vector;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.graph.model.GraphableVertex;
-import com.c2kernel.lifecycle.instance.WfVertex;
-import com.c2kernel.utils.KeyValuePair;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.graph.model.GraphableVertex;
+import org.cristalise.kernel.lifecycle.instance.WfVertex;
+import org.cristalise.kernel.utils.KeyValuePair;
+
 
 /**
  * @version $Revision: 1.22 $ $Date: 2005/11/15 15:56:38 $
diff --git a/src/main/java/com/c2kernel/lifecycle/WfVertexDefOutlineCreator.java b/src/main/java/org/cristalise/kernel/lifecycle/WfVertexDefOutlineCreator.java
index d2322d3..1bb8e2e 100644
--- a/src/main/java/com/c2kernel/lifecycle/WfVertexDefOutlineCreator.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/WfVertexDefOutlineCreator.java
@@ -18,11 +18,11 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
+package org.cristalise.kernel.lifecycle;
 
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.graph.model.VertexOutlineCreator;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.graph.model.VertexOutlineCreator;
 
 public class WfVertexDefOutlineCreator implements VertexOutlineCreator
 {
diff --git a/src/main/java/com/c2kernel/lifecycle/XOrSplitDef.java b/src/main/java/org/cristalise/kernel/lifecycle/XOrSplitDef.java
index 563aa65..7754c52 100644
--- a/src/main/java/com/c2kernel/lifecycle/XOrSplitDef.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/XOrSplitDef.java
@@ -18,10 +18,10 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle;
+package org.cristalise.kernel.lifecycle;
 
-import com.c2kernel.lifecycle.instance.WfVertex;
-import com.c2kernel.lifecycle.instance.XOrSplit;
+import org.cristalise.kernel.lifecycle.instance.WfVertex;
+import org.cristalise.kernel.lifecycle.instance.XOrSplit;
 
 
 /**
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Activity.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/Activity.java
index 4dfe6ca..f04a7a9 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/Activity.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/Activity.java
@@ -18,43 +18,44 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Vector;
 
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.GTimeStamp;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.agent.Job;
-import com.c2kernel.events.Event;
-import com.c2kernel.events.History;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.lifecycle.WfCastorHashMap;
-import com.c2kernel.lifecycle.instance.stateMachine.State;
-import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;
-import com.c2kernel.lifecycle.instance.stateMachine.Transition;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.InvalidAgentPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.Path;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.persistency.outcome.Schema;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.DateUtility;
-import com.c2kernel.utils.LocalObjectLoader;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.GTimeStamp;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.agent.Job;
+import org.cristalise.kernel.events.Event;
+import org.cristalise.kernel.events.History;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.lifecycle.WfCastorHashMap;
+import org.cristalise.kernel.lifecycle.instance.stateMachine.State;
+import org.cristalise.kernel.lifecycle.instance.stateMachine.StateMachine;
+import org.cristalise.kernel.lifecycle.instance.stateMachine.Transition;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.InvalidAgentPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.Path;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.persistency.outcome.Schema;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.DateUtility;
+import org.cristalise.kernel.utils.LocalObjectLoader;
+import org.cristalise.kernel.utils.Logger;
+
 /**
  * @version $Revision: 1.222 $ $Date: 2005/10/05 07:39:37 $
  * @author $Author: abranson $
@@ -474,7 +475,7 @@ public class Activity extends WfVertex
 	}
 
 	/**
-	 * returns the lists of jobs for the activity and children (cf com.c2kernel.entity.Job)
+	 * returns the lists of jobs for the activity and children (cf org.cristalise.kernel.entity.Job)
 	 * @throws InvalidDataException 
 	 * @throws ObjectNotFoundException 
 	 * @throws InvalidAgentPathException 
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/AdvancementCalculator.java
index 6f2c9ce..f040181 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/AdvancementCalculator.java
@@ -19,12 +19,13 @@
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
 /* Created on 11 mars 2004 */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 import java.util.Hashtable;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.graph.model.Vertex;
-//import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.graph.model.Vertex;
+
+//import org.cristalise.kernel.utils.Logger;
 /** @author XSeb74 */
 public class AdvancementCalculator
 {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/AndSplit.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/AndSplit.java
index 5e08e3d..98e9afb 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/AndSplit.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/AndSplit.java
@@ -18,11 +18,12 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
+package org.cristalise.kernel.lifecycle.instance;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+
 /**
  * @version $Revision: 1.16 $ $Date: 2005/05/10 15:14:54 $
  * @author $Author: abranson $
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/CompositeActivity.java
index 9bb5c84..1bdfbe8 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/CompositeActivity.java
@@ -18,27 +18,28 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 
 import java.util.ArrayList;
 
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.agent.Job;
-import com.c2kernel.graph.model.GraphModel;
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.graph.model.GraphableVertex;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.InvalidAgentPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.agent.Job;
+import org.cristalise.kernel.graph.model.GraphModel;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.graph.model.GraphableVertex;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.InvalidAgentPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**
  * @version $Revision: 1.86 $ $Date: 2005/10/05 07:39:37 $
@@ -74,7 +75,7 @@ public class CompositeActivity extends Activity
 		childrenGraph.setVertexOutlineCreator(new WfVertexOutlineCreator());
 	}
     /**
-     * @see com.c2kernel.lifecycle.instance.WfVertex#verify()
+     * @see org.cristalise.kernel.lifecycle.instance.WfVertex#verify()
      */
     /*
      * -------------------------------------------- --------------Other
@@ -117,7 +118,7 @@ public class CompositeActivity extends Activity
         if (first)
         {
             getChildrenGraphModel().setStartVertexId(act.getID());
-            Logger.msg(5, "com.c2kernel.lifecycle.CompositeActivity :: " + getID() + " is first");
+            Logger.msg(5, "org.cristalise.kernel.lifecycle.CompositeActivity :: " + getID() + " is first");
         }
     }
 
@@ -313,7 +314,7 @@ public class CompositeActivity extends Activity
      * @throws PersistencyException 
      * @throws ObjectAlreadyExistsException 
      * @throws ObjectCannotBeUpdated 
-     * @see com.c2kernel.lifecycle.instance.WfVertex#run()
+     * @see org.cristalise.kernel.lifecycle.instance.WfVertex#run()
      */
     @Override
 	public void run(AgentPath agent, ItemPath itemPath) throws InvalidDataException
@@ -345,7 +346,7 @@ public class CompositeActivity extends Activity
      * @throws InvalidDataException 
      * @throws ObjectNotFoundException 
      * @throws InvalidAgentPathException 
-     * @see com.c2kernel.lifecycle.instance.Activity#calculateJobs()
+     * @see org.cristalise.kernel.lifecycle.instance.Activity#calculateJobs()
      */
     @Override
 	public ArrayList<Job> calculateJobs(AgentPath agent, ItemPath itemPath, boolean recurse) throws InvalidAgentPathException, ObjectNotFoundException, InvalidDataException 
@@ -427,7 +428,7 @@ public class CompositeActivity extends Activity
     }
 
     /**
-     * @see com.c2kernel.lifecycle.instance.Activity#getType()
+     * @see org.cristalise.kernel.lifecycle.instance.Activity#getType()
      */
     @Override
 	public String getType()
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/JobPusher.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/JobPusher.java
index 681dd93..9aeca42 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/JobPusher.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/JobPusher.java
@@ -18,19 +18,20 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 
 import java.util.Iterator;
 
-import com.c2kernel.entity.Agent;
-import com.c2kernel.entity.AgentHelper;
-import com.c2kernel.entity.agent.JobArrayList;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.Path;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.entity.Agent;
+import org.cristalise.kernel.entity.AgentHelper;
+import org.cristalise.kernel.entity.agent.JobArrayList;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.Path;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 final class JobPusher extends Thread {
     private final Activity activity;
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Join.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/Join.java
index 1a415d7..2d1f05c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/Join.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/Join.java
@@ -18,20 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 import java.util.Vector;
 
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.graph.traversal.GraphTraversal;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.graph.traversal.GraphTraversal;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+
 /**
  * @version $Revision: 1.52 $ $Date: 2005/05/10 15:14:54 $
  * @author $Author: abranson $
@@ -58,7 +59,7 @@ public class Join extends WfVertex
 	 * @throws PersistencyException 
 	 * @throws ObjectAlreadyExistsException 
 	 * @throws ObjectCannotBeUpdated 
-	 * @see com.c2kernel.lifecycle.instance.WfVertex#runNext()
+	 * @see org.cristalise.kernel.lifecycle.instance.WfVertex#runNext()
 	 */
 	@Override
 	public void runNext(AgentPath agent, ItemPath item) throws InvalidDataException
@@ -88,7 +89,7 @@ public class Join extends WfVertex
 	}
 	/**
 	 * @throws InvalidDataException 
-	 * @see com.c2kernel.lifecycle.instance.WfVertex#reinit(int)
+	 * @see org.cristalise.kernel.lifecycle.instance.WfVertex#reinit(int)
 	 */
 	@Override
 	public void reinit(int idLoop) throws InvalidDataException
@@ -163,7 +164,7 @@ public class Join extends WfVertex
 		return true;
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.instance.WfVertex#getErrors()
+	 * @see org.cristalise.kernel.lifecycle.instance.WfVertex#getErrors()
 	 */
 	@Override
 	public String getErrors()
@@ -181,7 +182,7 @@ public class Join extends WfVertex
 	 * @throws PersistencyException 
 	 * @throws ObjectAlreadyExistsException 
 	 * @throws ObjectCannotBeUpdated 
-	 * @see com.c2kernel.lifecycle.instance.WfVertex#run()
+	 * @see org.cristalise.kernel.lifecycle.instance.WfVertex#run()
 	 */
 	@Override
 	public void run(AgentPath agent, ItemPath item) throws InvalidDataException
@@ -189,7 +190,7 @@ public class Join extends WfVertex
 		runNext(agent, item);
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.instance.WfVertex#addNext(com.c2kernel.lifecycle.instance.WfVertex)
+	 * @see org.cristalise.kernel.lifecycle.instance.WfVertex#addNext(org.cristalise.kernel.lifecycle.instance.WfVertex)
 	 */
 	@Override
 	public Next addNext(WfVertex vertex)
@@ -197,7 +198,7 @@ public class Join extends WfVertex
 		return new Next(this, vertex);
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.instance.WfVertex#loop()
+	 * @see org.cristalise.kernel.lifecycle.instance.WfVertex#loop()
 	 */
 	@Override
 	public boolean loop()
@@ -222,7 +223,7 @@ public class Join extends WfVertex
 	/*
 	 * (non-Javadoc)
 	 *
-	 * @see com.c2kernel.graph.model.Vertex#isJoin()
+	 * @see org.cristalise.kernel.graph.model.Vertex#isJoin()
 	 */
 	@Override
 	public boolean isJoin()
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Loop.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/Loop.java
index 1553fdf..d6a660e 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/Loop.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/Loop.java
@@ -18,13 +18,14 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.graph.traversal.GraphTraversal;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.utils.Logger;
+package org.cristalise.kernel.lifecycle.instance;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.graph.traversal.GraphTraversal;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.utils.Logger;
+
 /**
  * @version $Revision: 1.35 $ $Date: 2005/05/10 15:14:54 $
  * @author $Author: abranson $
@@ -39,7 +40,7 @@ public class Loop extends XOrSplit
 		super();
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.instance.WfVertex#loop()
+	 * @see org.cristalise.kernel.lifecycle.instance.WfVertex#loop()
 	 */
 	@Override
 	public boolean loop()
@@ -60,7 +61,7 @@ public class Loop extends XOrSplit
 	}
 	/**
 	 * @throws InvalidDataException 
-	 * @see com.c2kernel.lifecycle.instance.WfVertex#reinit(int)
+	 * @see org.cristalise.kernel.lifecycle.instance.WfVertex#reinit(int)
 	 */
 	@Override
 	public void reinit(int idLoop) throws InvalidDataException
@@ -79,7 +80,7 @@ public class Loop extends XOrSplit
 		}
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.instance.WfVertex#verify()
+	 * @see org.cristalise.kernel.lifecycle.instance.WfVertex#verify()
 	 */
 	@Override
 	public boolean verify()
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Next.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/Next.java
index b4e05c8..e0df1e6 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/Next.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/Next.java
@@ -18,10 +18,10 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.graph.model.GraphableEdge;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.graph.model.GraphableEdge;
 
 /**
  * @version $Revision: 1.58 $ $Date: 2005/05/10 15:14:54 $
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/OrSplit.java
index 349000d..12c7f46 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/OrSplit.java
@@ -18,15 +18,16 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 import java.util.StringTokenizer;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.graph.model.DirectedEdge;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.scripting.ScriptingEngineException;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.graph.model.DirectedEdge;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.scripting.ScriptingEngineException;
+import org.cristalise.kernel.utils.Logger;
+
 /**
  * @version $Revision: 1.22 $ $Date: 2005/05/10 15:14:54 $
  * @author $Author: abranson $
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Split.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/Split.java
index d4fb0fd..ac3afbd 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/Split.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/Split.java
@@ -18,21 +18,22 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 
 import java.util.Vector;
 
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.graph.traversal.GraphTraversal;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.graph.traversal.GraphTraversal;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+
 
 /**
  * @version $Revision: 1.47 $ $Date: 2006/05/29 13:17:45 $
@@ -62,7 +63,7 @@ public abstract class Split extends WfVertex
      * @throws PersistencyException 
      * @throws ObjectAlreadyExistsException 
      * @throws ObjectCannotBeUpdated 
-     * @see com.c2kernel.lifecycle.instance.WfVertex#runNext()
+     * @see org.cristalise.kernel.lifecycle.instance.WfVertex#runNext()
      */
     @Override
 	public abstract void runNext(AgentPath agent, ItemPath itemPath) throws InvalidDataException;
@@ -78,7 +79,7 @@ public abstract class Split extends WfVertex
     }
 
     /**
-     * @see com.c2kernel.lifecycle.instance.WfVertex#addNext(com.c2kernel.lifecycle.instance.WfVertex)
+     * @see org.cristalise.kernel.lifecycle.instance.WfVertex#addNext(org.cristalise.kernel.lifecycle.instance.WfVertex)
      */
     @Override
 	public Next addNext(WfVertex vertex)
@@ -105,7 +106,7 @@ public abstract class Split extends WfVertex
     }
 
     /**
-     * @see com.c2kernel.lifecycle.instance.WfVertex#verify()
+     * @see org.cristalise.kernel.lifecycle.instance.WfVertex#verify()
      */
     @Override
 	public boolean verify()
@@ -159,7 +160,7 @@ public abstract class Split extends WfVertex
     }
 
     /**
-     * @see com.c2kernel.lifecycle.instance.WfVertex#getErrors()
+     * @see org.cristalise.kernel.lifecycle.instance.WfVertex#getErrors()
      */
     @Override
 	public String getErrors()
@@ -178,7 +179,7 @@ public abstract class Split extends WfVertex
      * @throws PersistencyException 
      * @throws ObjectAlreadyExistsException 
      * @throws ObjectCannotBeUpdated 
-     * @see com.c2kernel.lifecycle.instance.WfVertex#run()
+     * @see org.cristalise.kernel.lifecycle.instance.WfVertex#run()
      */
     @Override
 	public void run(AgentPath agent, ItemPath itemPath) throws InvalidDataException
@@ -187,7 +188,7 @@ public abstract class Split extends WfVertex
     }
 
     /**
-     * @see com.c2kernel.lifecycle.instance.WfVertex#loop()
+     * @see org.cristalise.kernel.lifecycle.instance.WfVertex#loop()
      */
     @Override
 	public boolean loop()
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/WfVertex.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/WfVertex.java
index 9bf0fd4..d241aca 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/WfVertex.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/WfVertex.java
@@ -18,29 +18,30 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 
 
 
 import java.util.HashMap;
 
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.graph.model.GraphableVertex;
-import com.c2kernel.lifecycle.routingHelpers.ViewpointDataHelper;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.scripting.Script;
-import com.c2kernel.scripting.ScriptingEngineException;
-import com.c2kernel.utils.KeyValuePair;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.graph.model.GraphableVertex;
+import org.cristalise.kernel.lifecycle.routingHelpers.ViewpointDataHelper;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.scripting.Script;
+import org.cristalise.kernel.scripting.ScriptingEngineException;
+import org.cristalise.kernel.utils.KeyValuePair;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**
  * @version $Revision: 1.38 $ $Date: 2005/09/07 13:46:31 $
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/WfVertexOutlineCreator.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/WfVertexOutlineCreator.java
index e13b4e3..286ba64 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/WfVertexOutlineCreator.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/WfVertexOutlineCreator.java
@@ -18,11 +18,11 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.graph.model.VertexOutlineCreator;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.graph.model.Vertex;
+import org.cristalise.kernel.graph.model.VertexOutlineCreator;
 
 public class WfVertexOutlineCreator implements VertexOutlineCreator
 {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/Workflow.java
index f152adc..c2f632a 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/Workflow.java
@@ -18,31 +18,32 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 import java.util.ArrayList;
 
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.entity.agent.Job;
-import com.c2kernel.events.History;
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.InvalidAgentPathException;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.utils.Language;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.entity.agent.Job;
+import org.cristalise.kernel.events.History;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.InvalidAgentPathException;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.utils.Language;
+import org.cristalise.kernel.utils.Logger;
+
 /**
  * @version $Revision: 1.64 $ $Date: 2005/09/30 07:09:48 $
  * @author $Author: abranson $
@@ -138,7 +139,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	}
 
 	/**
-	 * @see com.c2kernel.graph.model.GraphableVertex#getPath()
+	 * @see org.cristalise.kernel.graph.model.GraphableVertex#getPath()
 	 */
 	@Override
 	public String getPath()
@@ -146,7 +147,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 		return "workflow";
 	}
 	/**
-	 * @see com.c2kernel.graph.model.Vertex#getName()
+	 * @see org.cristalise.kernel.graph.model.Vertex#getName()
 	 */
 	@Override
 	public String getName()
@@ -154,7 +155,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 		return "workflow";
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.instance.Activity#getType()
+	 * @see org.cristalise.kernel.lifecycle.instance.Activity#getType()
 	 */
 	@Override
 	public String getType()
@@ -162,14 +163,14 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 		return "workflow";
 	}
 	/**
-	 * @see com.c2kernel.graph.model.Vertex#setName(java.lang.String)
+	 * @see org.cristalise.kernel.graph.model.Vertex#setName(java.lang.String)
 	 */
 	@Override
 	public void setName(String name)
 	{
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.instance.WfVertex#verify()
+	 * @see org.cristalise.kernel.lifecycle.instance.WfVertex#verify()
 	 */
 	@Override
 	public boolean verify()
@@ -185,7 +186,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 		return true;
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.instance.Activity#getWf()
+	 * @see org.cristalise.kernel.lifecycle.instance.Activity#getWf()
 	 */
 	@Override
 	public Workflow getWf()
@@ -246,7 +247,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 		return jobs;
 	}
 	/**
-	 * @see com.c2kernel.lifecycle.instance.CompositeActivity#hasGoodNumberOfActivity()
+	 * @see org.cristalise.kernel.lifecycle.instance.CompositeActivity#hasGoodNumberOfActivity()
 	 */
 	@Override
 	public boolean hasGoodNumberOfActivity()
@@ -254,7 +255,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 		return true;
 	}
 	/**
-	 * @see com.c2kernel.entity.C2KLocalObject#getClusterType()
+	 * @see org.cristalise.kernel.entity.C2KLocalObject#getClusterType()
 	 */
 	@Override
 	public String getClusterType()
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/XOrSplit.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/XOrSplit.java
index 7b47fd5..91719cd 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/XOrSplit.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/XOrSplit.java
@@ -18,17 +18,18 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance;
+package org.cristalise.kernel.lifecycle.instance;
 
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.graph.model.DirectedEdge;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.scripting.ScriptingEngineException;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.graph.model.DirectedEdge;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.scripting.ScriptingEngineException;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**
  * @version $Revision: 1.23 $ $Date: 2006/03/03 13:52:21 $
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AddC2KObject.java
index a39e815..20abbad 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AddC2KObject.java
@@ -18,17 +18,18 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 import java.util.Arrays;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AddDomainPath.java
index 8723d3b..8f68d22 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AddDomainPath.java
@@ -18,23 +18,24 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 
 
 
 import java.util.Arrays;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.LookupManager;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.LookupManager;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class AddDomainPath extends PredefinedStep
 {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AddMemberToCollection.java
index 90db8e1..ac6004c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AddMemberToCollection.java
@@ -18,24 +18,25 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 
 import java.util.Arrays;
 
-import com.c2kernel.collection.Dependency;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.collection.Dependency;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewCollectionDescription.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AddNewCollectionDescription.java
index 99fd666..b230284 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewCollectionDescription.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AddNewCollectionDescription.java
@@ -18,23 +18,24 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 
 import java.util.Arrays;
 
-import com.c2kernel.collection.AggregationDescription;
-import com.c2kernel.collection.CollectionDescription;
-import com.c2kernel.collection.DependencyDescription;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.collection.AggregationDescription;
+import org.cristalise.kernel.collection.CollectionDescription;
+import org.cristalise.kernel.collection.DependencyDescription;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AddNewSlot.java
index 3d9e5d3..f3acdf3 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AddNewSlot.java
@@ -18,25 +18,26 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 
 import java.util.Arrays;
 
-import com.c2kernel.collection.Aggregation;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.PropertyDescription;
-import com.c2kernel.property.PropertyDescriptionList;
-import com.c2kernel.property.PropertyUtility;
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.collection.Aggregation;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.PropertyDescription;
+import org.cristalise.kernel.property.PropertyDescriptionList;
+import org.cristalise.kernel.property.PropertyUtility;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AssignItemToSlot.java
index 04d6770..c242500 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/AssignItemToSlot.java
@@ -18,24 +18,25 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 
 import java.util.Arrays;
 
-import com.c2kernel.collection.Aggregation;
-import com.c2kernel.collection.AggregationMember;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.collection.Aggregation;
+import org.cristalise.kernel.collection.AggregationMember;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ClearSlot.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/ClearSlot.java
index 1bfb8d0..bd0fa19 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ClearSlot.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/ClearSlot.java
@@ -18,22 +18,23 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 
 import java.util.Arrays;
 
-import com.c2kernel.collection.Aggregation;
-import com.c2kernel.collection.AggregationMember;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.collection.Aggregation;
+import org.cristalise.kernel.collection.AggregationMember;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateNewCollectionVersion.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/CreateNewCollectionVersion.java
index 8e68ae3..a598044 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateNewCollectionVersion.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/CreateNewCollectionVersion.java
@@ -18,20 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 
 import java.util.Arrays;
 
-import com.c2kernel.collection.Collection;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.collection.Collection;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/Import.java
index 12cb488..26e015d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/Import.java
@@ -18,21 +18,22 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 import java.util.Arrays;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.events.Event;
-import com.c2kernel.events.History;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.TransactionManager;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.events.Event;
+import org.cristalise.kernel.events.History;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.TransactionManager;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/PredefinedStep.java
index 9b6d6c4..c8a293e 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/PredefinedStep.java
@@ -18,12 +18,18 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 import java.io.StringReader;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.cristalise.kernel.lifecycle.instance.Activity;
+import org.cristalise.kernel.lifecycle.instance.predefined.agent.AgentPredefinedStepContainer;
+import org.cristalise.kernel.lifecycle.instance.predefined.item.ItemPredefinedStepContainer;
+import org.cristalise.kernel.lifecycle.instance.predefined.server.ServerPredefinedStepContainer;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.utils.Logger;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -32,12 +38,6 @@ import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 import org.xml.sax.InputSource;
 
-import com.c2kernel.lifecycle.instance.Activity;
-import com.c2kernel.lifecycle.instance.predefined.agent.AgentPredefinedStepContainer;
-import com.c2kernel.lifecycle.instance.predefined.item.ItemPredefinedStepContainer;
-import com.c2kernel.lifecycle.instance.predefined.server.ServerPredefinedStepContainer;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.utils.Logger;
 /***********************************************************************************************************************************************************************************************************************************************************************************************************
  * @author $Author: sgaspard $ $Date: 2004/09/21 10:32:17 $
  * @version $Revision: 1.14 $
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/PredefinedStepContainer.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/PredefinedStepContainer.java
index e1f9ffc..74a86db 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/PredefinedStepContainer.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/PredefinedStepContainer.java
@@ -18,9 +18,9 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.lifecycle.instance.CompositeActivity;
+package org.cristalise.kernel.lifecycle.instance.predefined;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.lifecycle.instance.CompositeActivity;
 public abstract class PredefinedStepContainer extends CompositeActivity
 {
 	protected int num = 0;
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/RemoveC2KObject.java
index ef7d16b..2f86274 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/RemoveC2KObject.java
@@ -18,18 +18,19 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 
 
 import java.util.Arrays;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 
 /**************************************************************************
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/RemoveDomainPath.java
index 3308003..0dc24bb 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/RemoveDomainPath.java
@@ -18,23 +18,24 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 
 
 
 import java.util.Arrays;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.LookupManager;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.LookupManager;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class RemoveDomainPath extends PredefinedStep
 {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java
index 7bd921b..6522384 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java
@@ -18,21 +18,22 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 
 import java.util.Arrays;
 
-import com.c2kernel.collection.Collection;
-import com.c2kernel.collection.CollectionMember;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.collection.Collection;
+import org.cristalise.kernel.collection.CollectionMember;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
index f2d34c4..5ec7510 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
@@ -18,20 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 //Java
 import java.util.Arrays;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.lifecycle.instance.CompositeActivity;
-import com.c2kernel.lifecycle.instance.Workflow;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.lifecycle.instance.CompositeActivity;
+import org.cristalise.kernel.lifecycle.instance.Workflow;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class ReplaceDomainWorkflow extends PredefinedStep
 {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/WriteProperty.java
index 2813f43..c73bec8 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/WriteProperty.java
@@ -18,20 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 import java.util.Arrays;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.Property;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteViewpoint.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/WriteViewpoint.java
index a8a17ce..d617b99 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteViewpoint.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/WriteViewpoint.java
@@ -18,20 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined;
+package org.cristalise.kernel.lifecycle.instance.predefined;
 
 import java.util.Arrays;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.events.Event;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.events.Event;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class WriteViewpoint extends PredefinedStep {
 
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/AgentPredefinedStepContainer.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/AgentPredefinedStepContainer.java
index 6ded51a..6ff3164 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/AgentPredefinedStepContainer.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/AgentPredefinedStepContainer.java
@@ -18,9 +18,9 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.agent;
+package org.cristalise.kernel.lifecycle.instance.predefined.agent;
 
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer;
 
 
 /**************************************************************************
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
index a2dfeae..335fe2d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
@@ -18,25 +18,26 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.agent;
+package org.cristalise.kernel.lifecycle.instance.predefined.agent;
 
 import java.util.Arrays;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.CorbaServer;
-import com.c2kernel.entity.agent.ActiveEntity;
-import com.c2kernel.lifecycle.instance.predefined.item.CreateItemFromDescription;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.PropertyArrayList;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.CorbaServer;
+import org.cristalise.kernel.entity.agent.ActiveEntity;
+import org.cristalise.kernel.lifecycle.instance.predefined.item.CreateItemFromDescription;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.PropertyArrayList;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
@@ -62,7 +63,7 @@ public class CreateAgentFromDescription extends CreateItemFromDescription
 	 * @throws ObjectAlreadyExistsException The Agent already exists
 	 * @throws CannotManageException The Agent could not be created
 	 * @throws ObjectCannotBeUpdated The addition of the new entries into the LookupManager failed
-	 * @see com.c2kernel.lifecycle.instance.predefined.item.CreateItemFromDescription#runActivityLogic(com.c2kernel.lookup.AgentPath, int, int, java.lang.String)
+	 * @see org.cristalise.kernel.lifecycle.instance.predefined.item.CreateItemFromDescription#runActivityLogic(org.cristalise.kernel.lookup.AgentPath, int, int, java.lang.String)
 	 */
 	@Override
 	protected String runActivityLogic(AgentPath agent, ItemPath item,
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/RemoveAgent.java
index 41fc7ba..db7e699 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/RemoveAgent.java
@@ -18,20 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.agent;
+package org.cristalise.kernel.lifecycle.instance.predefined.agent;
+
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.InvalidAgentPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.InvalidAgentPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
 
 public class RemoveAgent extends PredefinedStep {
 
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentPassword.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/SetAgentPassword.java
index 3832337..3d14453 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentPassword.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/SetAgentPassword.java
@@ -18,21 +18,22 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.agent;
+package org.cristalise.kernel.lifecycle.instance.predefined.agent;
 
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class SetAgentPassword extends PredefinedStep {
 	
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentRoles.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/SetAgentRoles.java
index d326d05..e267034 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentRoles.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/SetAgentRoles.java
@@ -18,19 +18,20 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.agent;
+package org.cristalise.kernel.lifecycle.instance.predefined.agent;
 
 import java.util.ArrayList;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class SetAgentRoles extends PredefinedStep {
 
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java
index 140f68c..53e545e 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java
@@ -18,34 +18,35 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.item;
-
-import com.c2kernel.collection.Collection;
-import com.c2kernel.collection.CollectionArrayList;
-import com.c2kernel.collection.CollectionDescription;
-import com.c2kernel.collection.CollectionMember;
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.CorbaServer;
-import com.c2kernel.entity.TraceableEntity;
-import com.c2kernel.lifecycle.CompositeActivityDef;
-import com.c2kernel.lifecycle.instance.CompositeActivity;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.Property;
-import com.c2kernel.property.PropertyArrayList;
-import com.c2kernel.property.PropertyDescriptionList;
-import com.c2kernel.property.PropertyUtility;
-import com.c2kernel.utils.LocalObjectLoader;
-import com.c2kernel.utils.Logger;
+package org.cristalise.kernel.lifecycle.instance.predefined.item;
+
+import org.cristalise.kernel.collection.Collection;
+import org.cristalise.kernel.collection.CollectionArrayList;
+import org.cristalise.kernel.collection.CollectionDescription;
+import org.cristalise.kernel.collection.CollectionMember;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.CorbaServer;
+import org.cristalise.kernel.entity.TraceableEntity;
+import org.cristalise.kernel.lifecycle.CompositeActivityDef;
+import org.cristalise.kernel.lifecycle.instance.CompositeActivity;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.property.PropertyArrayList;
+import org.cristalise.kernel.property.PropertyDescriptionList;
+import org.cristalise.kernel.property.PropertyUtility;
+import org.cristalise.kernel.utils.LocalObjectLoader;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/Erase.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/item/Erase.java
index a34b202..50a1bfd 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/Erase.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/item/Erase.java
@@ -18,24 +18,25 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.item;
+package org.cristalise.kernel.lifecycle.instance.predefined.item;
 
 
 
 import java.util.Iterator;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.Path;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.Path;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 
 /**************************************************************************
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/ItemPredefinedStepContainer.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/item/ItemPredefinedStepContainer.java
index 57aefa3..46a6feb 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/ItemPredefinedStepContainer.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/item/ItemPredefinedStepContainer.java
@@ -18,9 +18,9 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.item;
+package org.cristalise.kernel.lifecycle.instance.predefined.item;
 
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer;
 
 
 /**************************************************************************
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/AddDomainContext.java
index e6bfba9..b225978 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/AddDomainContext.java
@@ -18,21 +18,22 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.server;
+package org.cristalise.kernel.lifecycle.instance.predefined.server;
 
 import java.util.Arrays;
 import java.util.Stack;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class AddDomainContext extends PredefinedStep {
 	
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
index 92f4357..65e56b5 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
@@ -18,19 +18,20 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.server;
+package org.cristalise.kernel.lifecycle.instance.predefined.server;
+
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.imports.ImportAgent;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.imports.ImportAgent;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
 
 public class CreateNewAgent extends PredefinedStep
 {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/CreateNewItem.java
index fde9f82..acd1fd1 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/CreateNewItem.java
@@ -18,23 +18,24 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.server;
+package org.cristalise.kernel.lifecycle.instance.predefined.server;
 
 
 
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.imports.ImportItem;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.imports.ImportItem;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class CreateNewItem extends PredefinedStep
 {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/CreateNewRole.java
index f99e54c..3771a7e 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/CreateNewRole.java
@@ -18,19 +18,20 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.server;
+package org.cristalise.kernel.lifecycle.instance.predefined.server;
+
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.imports.ImportRole;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.imports.ImportRole;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
 
 public class CreateNewRole extends PredefinedStep
 {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
index a4520aa..bc1ed5c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
@@ -18,20 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.server;
+package org.cristalise.kernel.lifecycle.instance.predefined.server;
 
 import java.util.Arrays;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class RemoveDomainContext extends PredefinedStep {
 	public RemoveDomainContext() {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveRole.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/RemoveRole.java
index a75b98c..6136cac 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveRole.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/RemoveRole.java
@@ -18,21 +18,22 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.server;
+package org.cristalise.kernel.lifecycle.instance.predefined.server;
 
 import java.util.Arrays;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.LookupManager;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.LookupManager;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class RemoveRole extends PredefinedStep
 {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/ServerPredefinedStepContainer.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/ServerPredefinedStepContainer.java
index 35ecd94..0fdc34c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/ServerPredefinedStepContainer.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/server/ServerPredefinedStepContainer.java
@@ -18,11 +18,11 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.predefined.server;
+package org.cristalise.kernel.lifecycle.instance.predefined.server;
 
-import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
-import com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer;
+import org.cristalise.kernel.graph.model.GraphPoint;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStep;
+import org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer;
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/State.java
index 3e9e247..d78bb4e 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/State.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.stateMachine;
+package org.cristalise.kernel.lifecycle.instance.stateMachine;
 
 import java.util.HashMap;
 import java.util.Set;
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/StateMachine.java
index cd61713..975dee1 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/StateMachine.java
@@ -18,20 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.stateMachine;
+package org.cristalise.kernel.lifecycle.instance.stateMachine;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lifecycle.instance.Activity;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.utils.DescriptionObject;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lifecycle.instance.Activity;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.utils.DescriptionObject;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class StateMachine implements DescriptionObject
 {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/Transition.java
index 76ae602..845b489 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/Transition.java
@@ -18,23 +18,24 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.stateMachine;
+package org.cristalise.kernel.lifecycle.instance.stateMachine;
 
 import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lifecycle.instance.Activity;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.persistency.outcome.Schema;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.LocalObjectLoader;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.AccessRightsException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lifecycle.instance.Activity;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.persistency.outcome.Schema;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.LocalObjectLoader;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class Transition {
 
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionOutcome.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/TransitionOutcome.java
index ceb667a..7575359 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionOutcome.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/TransitionOutcome.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.stateMachine;
+package org.cristalise.kernel.lifecycle.instance.stateMachine;
 
 
 public class TransitionOutcome extends TransitionResource {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionResource.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/TransitionResource.java
index 1cf39e0..e220447 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionResource.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/TransitionResource.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.stateMachine;
+package org.cristalise.kernel.lifecycle.instance.stateMachine;
 
 public class TransitionResource {
 
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/TransitionScript.java
index 6edb611..a41ec2c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/stateMachine/TransitionScript.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.instance.stateMachine;
+package org.cristalise.kernel.lifecycle.instance.stateMachine;
 
 
 public class TransitionScript extends TransitionResource {
diff --git a/src/main/java/com/c2kernel/lifecycle/package-info.java b/src/main/java/org/cristalise/kernel/lifecycle/package-info.java
index c402664..af6300b 100644
--- a/src/main/java/com/c2kernel/lifecycle/package-info.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/package-info.java
@@ -22,9 +22,9 @@
  * The implementation of the Item lifecycle, as composite workflows.
  * 
  * <p>This package contains the activity description implementations. The 
- * workflow instance is in the {@link com.c2kernel.lifecycle.instance} 
+ * workflow instance is in the {@link org.cristalise.kernel.lifecycle.instance} 
  * subpackage, which also contains the predefined steps.
  *  
  */
 
-package com.c2kernel.lifecycle;
-\ No newline at end of file
+package org.cristalise.kernel.lifecycle;
+\ No newline at end of file
diff --git a/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java b/src/main/java/org/cristalise/kernel/lifecycle/routingHelpers/ViewpointDataHelper.java
index ae86c2a..49bebf4 100644
--- a/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java
+++ b/src/main/java/org/cristalise/kernel/lifecycle/routingHelpers/ViewpointDataHelper.java
@@ -18,16 +18,17 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lifecycle.routingHelpers;
+package org.cristalise.kernel.lifecycle.routingHelpers;
+
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.XmlElementParser;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.XmlElementParser;
 
 public class ViewpointDataHelper
 {
diff --git a/src/main/java/com/c2kernel/lookup/AgentPath.java b/src/main/java/org/cristalise/kernel/lookup/AgentPath.java
index d2a6c7f..cab9068 100644
--- a/src/main/java/com/c2kernel/lookup/AgentPath.java
+++ b/src/main/java/org/cristalise/kernel/lookup/AgentPath.java
@@ -18,17 +18,17 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lookup;
+package org.cristalise.kernel.lookup;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.UUID;
 
 import org.apache.xerces.impl.dv.util.Base64;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.SystemKey;
+import org.cristalise.kernel.process.Gateway;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.SystemKey;
-import com.c2kernel.process.Gateway;
 
 
 /**
diff --git a/src/main/java/com/c2kernel/lookup/DomainPath.java b/src/main/java/org/cristalise/kernel/lookup/DomainPath.java
index a4128fe..a054da6 100644
--- a/src/main/java/com/c2kernel/lookup/DomainPath.java
+++ b/src/main/java/org/cristalise/kernel/lookup/DomainPath.java
@@ -18,10 +18,11 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lookup;
+package org.cristalise.kernel.lookup;
+
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.process.Gateway;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.process.Gateway;
 
 
 /**
diff --git a/src/main/java/com/c2kernel/lookup/InvalidAgentPathException.java b/src/main/java/org/cristalise/kernel/lookup/InvalidAgentPathException.java
index b64c607..60ac840 100644
--- a/src/main/java/com/c2kernel/lookup/InvalidAgentPathException.java
+++ b/src/main/java/org/cristalise/kernel/lookup/InvalidAgentPathException.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lookup;
+package org.cristalise.kernel.lookup;
 
 public class InvalidAgentPathException extends InvalidItemPathException {
 
diff --git a/src/main/java/com/c2kernel/lookup/InvalidItemPathException.java b/src/main/java/org/cristalise/kernel/lookup/InvalidItemPathException.java
index 45feeae..b6817af 100644
--- a/src/main/java/com/c2kernel/lookup/InvalidItemPathException.java
+++ b/src/main/java/org/cristalise/kernel/lookup/InvalidItemPathException.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lookup;
+package org.cristalise.kernel.lookup;
 
 public class InvalidItemPathException extends InvalidPathException {
 
diff --git a/src/main/java/com/c2kernel/lookup/InvalidPathException.java b/src/main/java/org/cristalise/kernel/lookup/InvalidPathException.java
index 0ad4803..9e75c11 100644
--- a/src/main/java/com/c2kernel/lookup/InvalidPathException.java
+++ b/src/main/java/org/cristalise/kernel/lookup/InvalidPathException.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lookup;
+package org.cristalise.kernel.lookup;
 
 public class InvalidPathException extends Exception {
 
diff --git a/src/main/java/com/c2kernel/lookup/ItemPath.java b/src/main/java/org/cristalise/kernel/lookup/ItemPath.java
index 855a5dd..9df4a0a 100644
--- a/src/main/java/com/c2kernel/lookup/ItemPath.java
+++ b/src/main/java/org/cristalise/kernel/lookup/ItemPath.java
@@ -18,14 +18,15 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lookup;
+package org.cristalise.kernel.lookup;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.UUID;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.SystemKey;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.SystemKey;
+
 
 
 /**
diff --git a/src/main/java/com/c2kernel/lookup/Lookup.java b/src/main/java/org/cristalise/kernel/lookup/Lookup.java
index 924057a..eb54775 100644
--- a/src/main/java/com/c2kernel/lookup/Lookup.java
+++ b/src/main/java/org/cristalise/kernel/lookup/Lookup.java
@@ -18,14 +18,15 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lookup;
+package org.cristalise.kernel.lookup;
 
 import java.util.Iterator;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.process.auth.Authenticator;
-import com.c2kernel.property.Property;
-import com.c2kernel.property.PropertyDescriptionList;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.process.auth.Authenticator;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.property.PropertyDescriptionList;
+
 
 /**
  * @author abranson
diff --git a/src/main/java/com/c2kernel/lookup/LookupManager.java b/src/main/java/org/cristalise/kernel/lookup/LookupManager.java
index c33bc35..0ce04c3 100644
--- a/src/main/java/com/c2kernel/lookup/LookupManager.java
+++ b/src/main/java/org/cristalise/kernel/lookup/LookupManager.java
@@ -18,13 +18,14 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lookup;
+package org.cristalise.kernel.lookup;
 
 import java.security.NoSuchAlgorithmException;
 
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+
 
 /**
  * The LookupManager interface contains all of the directory modifying methods
diff --git a/src/main/java/com/c2kernel/lookup/Path.java b/src/main/java/org/cristalise/kernel/lookup/Path.java
index 3ccdb35..77bca9b 100644
--- a/src/main/java/com/c2kernel/lookup/Path.java
+++ b/src/main/java/org/cristalise/kernel/lookup/Path.java
@@ -18,15 +18,16 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lookup;
+package org.cristalise.kernel.lookup;
 
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 import java.util.UUID;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.SystemKey;
-import com.c2kernel.process.Gateway;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.SystemKey;
+import org.cristalise.kernel.process.Gateway;
+
 
 
 /**
diff --git a/src/main/java/com/c2kernel/lookup/RolePath.java b/src/main/java/org/cristalise/kernel/lookup/RolePath.java
index 7432171..61f444c 100644
--- a/src/main/java/com/c2kernel/lookup/RolePath.java
+++ b/src/main/java/org/cristalise/kernel/lookup/RolePath.java
@@ -18,14 +18,15 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.lookup;
+package org.cristalise.kernel.lookup;
 
 import java.util.Iterator;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.process.Gateway;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.process.Gateway;
+
 
 
 
diff --git a/src/main/java/com/c2kernel/persistency/ClusterStorage.java b/src/main/java/org/cristalise/kernel/persistency/ClusterStorage.java
index a2a33fe..ca43e67 100644
--- a/src/main/java/com/c2kernel/persistency/ClusterStorage.java
+++ b/src/main/java/org/cristalise/kernel/persistency/ClusterStorage.java
@@ -18,17 +18,18 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency;
+package org.cristalise.kernel.persistency;
+
+import org.cristalise.kernel.collection.Collection;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.common.SystemKey;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.auth.Authenticator;
+import org.cristalise.kernel.utils.Logger;
 
-import com.c2kernel.collection.Collection;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.common.SystemKey;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.auth.Authenticator;
-import com.c2kernel.utils.Logger;
 
 /**
  * <p>Interface for persistency managers of entities. It allows different kernel
@@ -104,7 +105,7 @@ public abstract class ClusterStorage {
 	 * the workflow inside, which is named "workflow", hence
 	 * "LifeCycle/workflow".
 	 * 
-	 * @see com.c2kernel.lifecycle.instance.Workflow
+	 * @see org.cristalise.kernel.lifecycle.instance.Workflow
 	 */
 	public static final String LIFECYCLE = "LifeCycle";
 	/**
diff --git a/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java b/src/main/java/org/cristalise/kernel/persistency/ClusterStorageManager.java
index cc64d5a..46485b6 100644
--- a/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java
+++ b/src/main/java/org/cristalise/kernel/persistency/ClusterStorageManager.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency;
+package org.cristalise.kernel.persistency;
 
 import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
@@ -27,20 +27,21 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.entity.agent.JobList;
-import com.c2kernel.entity.proxy.ProxyMessage;
-import com.c2kernel.events.History;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.process.auth.Authenticator;
-import com.c2kernel.utils.Logger;
-import com.c2kernel.utils.SoftCache;
-import com.c2kernel.utils.WeakCache;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.entity.agent.JobList;
+import org.cristalise.kernel.entity.proxy.ProxyMessage;
+import org.cristalise.kernel.events.History;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.process.auth.Authenticator;
+import org.cristalise.kernel.utils.Logger;
+import org.cristalise.kernel.utils.SoftCache;
+import org.cristalise.kernel.utils.WeakCache;
+
 
 /**
  * instantiates ClusterStorages listed in properties file All read/write requests to storage pass through this object, which
@@ -115,7 +116,7 @@ public class ClusterStorageManager {
             	try {
             		newStorage = (ClusterStorage)(Class.forName(newStorageClass).newInstance());
             	} catch (ClassNotFoundException ex2) {
-					newStorage = (ClusterStorage)(Class.forName("com.c2kernel.persistency."+newStorageClass).newInstance());
+					newStorage = (ClusterStorage)(Class.forName("org.cristalise.storage."+newStorageClass).newInstance());
             	}
             } catch (ClassNotFoundException ex) {
 				throw new PersistencyException("ClusterStorageManager.init() - The cluster storage handler class " + newStorageClass +
diff --git a/src/main/java/com/c2kernel/persistency/RemoteMap.java b/src/main/java/org/cristalise/kernel/persistency/RemoteMap.java
index d23551a..deb8f0b 100644
--- a/src/main/java/com/c2kernel/persistency/RemoteMap.java
+++ b/src/main/java/org/cristalise/kernel/persistency/RemoteMap.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency;
+package org.cristalise.kernel.persistency;
 
 import java.util.AbstractSet;
 import java.util.Collection;
@@ -27,15 +27,16 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeMap;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.entity.proxy.MemberSubscription;
-import com.c2kernel.entity.proxy.ProxyObserver;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.entity.proxy.MemberSubscription;
+import org.cristalise.kernel.entity.proxy.ProxyObserver;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**
  * Maps a storage cluster onto a java.util.Map
diff --git a/src/main/java/com/c2kernel/persistency/TransactionManager.java b/src/main/java/org/cristalise/kernel/persistency/TransactionManager.java
index 45f3459..7712da6 100644
--- a/src/main/java/com/c2kernel/persistency/TransactionManager.java
+++ b/src/main/java/org/cristalise/kernel/persistency/TransactionManager.java
@@ -18,19 +18,20 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency;
+package org.cristalise.kernel.persistency;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.entity.agent.JobList;
-import com.c2kernel.events.History;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.auth.Authenticator;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.entity.agent.JobList;
+import org.cristalise.kernel.events.History;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.process.auth.Authenticator;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class TransactionManager {
 
diff --git a/src/main/java/com/c2kernel/persistency/outcome/Outcome.java b/src/main/java/org/cristalise/kernel/persistency/outcome/Outcome.java
index a8683ab..95f3e6b 100644
--- a/src/main/java/com/c2kernel/persistency/outcome/Outcome.java
+++ b/src/main/java/org/cristalise/kernel/persistency/outcome/Outcome.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency.outcome;
+package org.cristalise.kernel.persistency.outcome;
 import java.io.StringReader;
 import java.util.StringTokenizer;
 
@@ -31,6 +31,13 @@ import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.utils.LocalObjectLoader;
+import org.cristalise.kernel.utils.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -40,13 +47,6 @@ import org.w3c.dom.ls.DOMImplementationLS;
 import org.w3c.dom.ls.LSSerializer;
 import org.xml.sax.InputSource;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.utils.LocalObjectLoader;
-import com.c2kernel.utils.Logger;
 
 public class Outcome implements C2KLocalObject {
     Integer mID;
diff --git a/src/main/java/com/c2kernel/persistency/outcome/OutcomeInitiator.java b/src/main/java/org/cristalise/kernel/persistency/outcome/OutcomeInitiator.java
index e152df9..0a22fd0 100644
--- a/src/main/java/com/c2kernel/persistency/outcome/OutcomeInitiator.java
+++ b/src/main/java/org/cristalise/kernel/persistency/outcome/OutcomeInitiator.java
@@ -18,10 +18,11 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency.outcome;
+package org.cristalise.kernel.persistency.outcome;
+
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.entity.agent.Job;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.entity.agent.Job;
 
 public interface OutcomeInitiator {
 
diff --git a/src/main/java/com/c2kernel/persistency/outcome/OutcomeValidator.java b/src/main/java/org/cristalise/kernel/persistency/outcome/OutcomeValidator.java
index 80af535..fed0c8c 100644
--- a/src/main/java/com/c2kernel/persistency/outcome/OutcomeValidator.java
+++ b/src/main/java/org/cristalise/kernel/persistency/outcome/OutcomeValidator.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency.outcome;
+package org.cristalise.kernel.persistency.outcome;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -34,12 +34,12 @@ import org.apache.xerces.xni.parser.XMLErrorHandler;
 import org.apache.xerces.xni.parser.XMLInputSource;
 import org.apache.xerces.xni.parser.XMLParseException;
 import org.apache.xerces.xni.parser.XMLParserConfiguration;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.utils.Logger;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.utils.Logger;
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/persistency/outcome/Schema.java b/src/main/java/org/cristalise/kernel/persistency/outcome/Schema.java
index 21426a2..4ae6ef3 100644
--- a/src/main/java/com/c2kernel/persistency/outcome/Schema.java
+++ b/src/main/java/org/cristalise/kernel/persistency/outcome/Schema.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency.outcome;
+package org.cristalise.kernel.persistency.outcome;
 
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/src/main/java/com/c2kernel/persistency/outcome/SchemaValidator.java b/src/main/java/org/cristalise/kernel/persistency/outcome/SchemaValidator.java
index fce463b..b9684d2 100644
--- a/src/main/java/com/c2kernel/persistency/outcome/SchemaValidator.java
+++ b/src/main/java/org/cristalise/kernel/persistency/outcome/SchemaValidator.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency.outcome;
+package org.cristalise.kernel.persistency.outcome;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/c2kernel/persistency/outcome/Viewpoint.java b/src/main/java/org/cristalise/kernel/persistency/outcome/Viewpoint.java
index e35b6b6..630975a 100644
--- a/src/main/java/com/c2kernel/persistency/outcome/Viewpoint.java
+++ b/src/main/java/org/cristalise/kernel/persistency/outcome/Viewpoint.java
@@ -18,17 +18,18 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency.outcome;
-
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.events.Event;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.process.Gateway;
+package org.cristalise.kernel.persistency.outcome;
+
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.events.Event;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.Gateway;
+
 
 /**
  * @author Andrew Branson
diff --git a/src/main/java/com/c2kernel/process/AbstractMain.java b/src/main/java/org/cristalise/kernel/process/AbstractMain.java
index db858a7..5acfbef 100644
--- a/src/main/java/com/c2kernel/process/AbstractMain.java
+++ b/src/main/java/org/cristalise/kernel/process/AbstractMain.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process;
+package org.cristalise.kernel.process;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -27,9 +27,10 @@ import java.io.PrintStream;
 import java.util.Enumeration;
 import java.util.Properties;
 
-import com.c2kernel.process.resource.BadArgumentsException;
-import com.c2kernel.utils.FileStringUtility;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.process.resource.BadArgumentsException;
+import org.cristalise.kernel.utils.FileStringUtility;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/org/cristalise/kernel/process/Bootstrap.java
index 6a82363..8934cd8 100644
--- a/src/main/java/com/c2kernel/process/Bootstrap.java
+++ b/src/main/java/org/cristalise/kernel/process/Bootstrap.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process;
+package org.cristalise.kernel.process;
 
 import java.net.InetAddress;
 import java.util.HashMap;
@@ -27,40 +27,40 @@ import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.UUID;
 
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.proxy.AgentProxy;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.events.Event;
+import org.cristalise.kernel.events.History;
+import org.cristalise.kernel.lifecycle.CompositeActivityDef;
+import org.cristalise.kernel.lifecycle.instance.CompositeActivity;
+import org.cristalise.kernel.lifecycle.instance.Workflow;
+import org.cristalise.kernel.lifecycle.instance.predefined.server.ServerPredefinedStepContainer;
+import org.cristalise.kernel.lifecycle.instance.stateMachine.Transition;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.LookupManager;
+import org.cristalise.kernel.lookup.Path;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.persistency.outcome.OutcomeValidator;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.resource.DefaultResourceImportHandler;
+import org.cristalise.kernel.process.resource.ResourceImportHandler;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.property.PropertyArrayList;
+import org.cristalise.kernel.property.PropertyDescription;
+import org.cristalise.kernel.property.PropertyDescriptionList;
+import org.cristalise.kernel.utils.FileStringUtility;
+import org.cristalise.kernel.utils.LocalObjectLoader;
+import org.cristalise.kernel.utils.Logger;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.events.Event;
-import com.c2kernel.events.History;
-import com.c2kernel.lifecycle.CompositeActivityDef;
-import com.c2kernel.lifecycle.instance.CompositeActivity;
-import com.c2kernel.lifecycle.instance.Workflow;
-import com.c2kernel.lifecycle.instance.predefined.server.ServerPredefinedStepContainer;
-import com.c2kernel.lifecycle.instance.stateMachine.Transition;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.LookupManager;
-import com.c2kernel.lookup.Path;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.persistency.outcome.OutcomeValidator;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.resource.DefaultResourceImportHandler;
-import com.c2kernel.process.resource.ResourceImportHandler;
-import com.c2kernel.property.Property;
-import com.c2kernel.property.PropertyArrayList;
-import com.c2kernel.property.PropertyDescription;
-import com.c2kernel.property.PropertyDescriptionList;
-import com.c2kernel.utils.FileStringUtility;
-import com.c2kernel.utils.LocalObjectLoader;
-import com.c2kernel.utils.Logger;
 
 /**
  * @version $Revision: 1.25 $ $Date: 2006/01/10 09:48:32 $
diff --git a/src/main/java/com/c2kernel/process/ClientShell.java b/src/main/java/org/cristalise/kernel/process/ClientShell.java
index 0fab1c4..0a9ad83 100644
--- a/src/main/java/com/c2kernel/process/ClientShell.java
+++ b/src/main/java/org/cristalise/kernel/process/ClientShell.java
@@ -18,14 +18,15 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process;
+package org.cristalise.kernel.process;
 
 import java.util.Scanner;
 
-import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.process.auth.ProxyLogin;
-import com.c2kernel.scripting.Script;
-import com.c2kernel.scripting.ScriptParsingException;
+import org.cristalise.kernel.entity.proxy.AgentProxy;
+import org.cristalise.kernel.process.auth.ProxyLogin;
+import org.cristalise.kernel.scripting.Script;
+import org.cristalise.kernel.scripting.ScriptParsingException;
+
 
 public class ClientShell extends StandardClient {
 
diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/org/cristalise/kernel/process/Gateway.java
index 5dde6e6..c7936c3 100644
--- a/src/main/java/com/c2kernel/process/Gateway.java
+++ b/src/main/java/org/cristalise/kernel/process/Gateway.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process;
+package org.cristalise.kernel.process;
 
 /**
  * @version $Revision: 1.17 $ $Date: 2005/10/12 12:51:54 $
@@ -29,27 +29,28 @@ import java.net.MalformedURLException;
 import java.util.Enumeration;
 import java.util.Properties;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.CorbaServer;
-import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.entity.proxy.ProxyManager;
-import com.c2kernel.entity.proxy.ProxyServer;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.Lookup;
-import com.c2kernel.lookup.LookupManager;
-import com.c2kernel.persistency.TransactionManager;
-import com.c2kernel.process.auth.Authenticator;
-import com.c2kernel.process.module.ModuleManager;
-import com.c2kernel.process.resource.Resource;
-import com.c2kernel.process.resource.ResourceLoader;
-import com.c2kernel.utils.CastorXMLUtility;
-import com.c2kernel.utils.FileStringUtility;
-import com.c2kernel.utils.Language;
-import com.c2kernel.utils.Logger;
-import com.c2kernel.utils.ObjectProperties;
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.CorbaServer;
+import org.cristalise.kernel.entity.proxy.AgentProxy;
+import org.cristalise.kernel.entity.proxy.ProxyManager;
+import org.cristalise.kernel.entity.proxy.ProxyServer;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.Lookup;
+import org.cristalise.kernel.lookup.LookupManager;
+import org.cristalise.kernel.persistency.TransactionManager;
+import org.cristalise.kernel.process.auth.Authenticator;
+import org.cristalise.kernel.process.module.ModuleManager;
+import org.cristalise.kernel.process.resource.Resource;
+import org.cristalise.kernel.process.resource.ResourceLoader;
+import org.cristalise.kernel.utils.CastorXMLUtility;
+import org.cristalise.kernel.utils.FileStringUtility;
+import org.cristalise.kernel.utils.Language;
+import org.cristalise.kernel.utils.Logger;
+import org.cristalise.kernel.utils.ObjectProperties;
+
 
 
 /**************************************************************************
diff --git a/src/main/java/com/c2kernel/process/ShutdownHandler.java b/src/main/java/org/cristalise/kernel/process/ShutdownHandler.java
index 6c52544..f34800d 100644
--- a/src/main/java/com/c2kernel/process/ShutdownHandler.java
+++ b/src/main/java/org/cristalise/kernel/process/ShutdownHandler.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process;
+package org.cristalise.kernel.process;
 
 public interface ShutdownHandler {
 
diff --git a/src/main/java/com/c2kernel/process/StandardClient.java b/src/main/java/org/cristalise/kernel/process/StandardClient.java
index 06b4ed4..c97fed0 100644
--- a/src/main/java/com/c2kernel/process/StandardClient.java
+++ b/src/main/java/org/cristalise/kernel/process/StandardClient.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process;
+package org.cristalise.kernel.process;
 
 
 abstract public class StandardClient extends AbstractMain
diff --git a/src/main/java/com/c2kernel/process/StandardServer.java b/src/main/java/org/cristalise/kernel/process/StandardServer.java
index 3a5ca3e..9d31b8e 100644
--- a/src/main/java/com/c2kernel/process/StandardServer.java
+++ b/src/main/java/org/cristalise/kernel/process/StandardServer.java
@@ -18,10 +18,10 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process;
+package org.cristalise.kernel.process;
 
-import com.c2kernel.process.auth.Authenticator;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.process.auth.Authenticator;
+import org.cristalise.kernel.utils.Logger;
 
 /**************************************************************************
  * Base class for all servers i.e. c2k processes that serve Entities
diff --git a/src/main/java/com/c2kernel/process/UserCodeProcess.java b/src/main/java/org/cristalise/kernel/process/UserCodeProcess.java
index bc7e23e..ff63baf 100644
--- a/src/main/java/com/c2kernel/process/UserCodeProcess.java
+++ b/src/main/java/org/cristalise/kernel/process/UserCodeProcess.java
@@ -18,23 +18,24 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process;
+package org.cristalise.kernel.process;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.c2kernel.common.InvalidTransitionException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.entity.agent.Job;
-import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.entity.proxy.MemberSubscription;
-import com.c2kernel.entity.proxy.ProxyObserver;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.scripting.ErrorInfo;
-import com.c2kernel.scripting.ScriptErrorException;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidTransitionException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.entity.agent.Job;
+import org.cristalise.kernel.entity.proxy.AgentProxy;
+import org.cristalise.kernel.entity.proxy.MemberSubscription;
+import org.cristalise.kernel.entity.proxy.ProxyObserver;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.scripting.ErrorInfo;
+import org.cristalise.kernel.scripting.ScriptErrorException;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/process/auth/Authenticator.java b/src/main/java/org/cristalise/kernel/process/auth/Authenticator.java
index 4578744..2d92d4d 100644
--- a/src/main/java/com/c2kernel/process/auth/Authenticator.java
+++ b/src/main/java/org/cristalise/kernel/process/auth/Authenticator.java
@@ -18,10 +18,10 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.auth;
+package org.cristalise.kernel.process.auth;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
 
 /**
  * This interface is used by the kernel to store an authenticated connection
diff --git a/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java b/src/main/java/org/cristalise/kernel/process/auth/ConsoleAuth.java
index 379d1a5..319c792 100644
--- a/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java
+++ b/src/main/java/org/cristalise/kernel/process/auth/ConsoleAuth.java
@@ -18,13 +18,14 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.auth;
+package org.cristalise.kernel.process.auth;
 
 import java.util.Properties;
 import java.util.Scanner;
 
-import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.process.Gateway;
+import org.cristalise.kernel.entity.proxy.AgentProxy;
+import org.cristalise.kernel.process.Gateway;
+
 
 public class ConsoleAuth implements ProxyLogin {
 
diff --git a/src/main/java/com/c2kernel/process/auth/ProxyLogin.java b/src/main/java/org/cristalise/kernel/process/auth/ProxyLogin.java
index 1aa9e93..9305d50 100644
--- a/src/main/java/com/c2kernel/process/auth/ProxyLogin.java
+++ b/src/main/java/org/cristalise/kernel/process/auth/ProxyLogin.java
@@ -18,11 +18,12 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.auth;
+package org.cristalise.kernel.process.auth;
 
 import java.util.Properties;
 
-import com.c2kernel.entity.proxy.AgentProxy;
+import org.cristalise.kernel.entity.proxy.AgentProxy;
+
 
 /**
  * This interface is used by client processes to implement alternative login
diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/org/cristalise/kernel/process/module/Module.java
index a1a11c7..840614b 100644
--- a/src/main/java/com/c2kernel/process/module/Module.java
+++ b/src/main/java/org/cristalise/kernel/process/module/Module.java
@@ -18,27 +18,28 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.module;
+package org.cristalise.kernel.process.module;
 
 import java.util.ArrayList;
 import java.util.Properties;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.imports.ImportAgent;
-import com.c2kernel.entity.imports.ImportDependency;
-import com.c2kernel.entity.imports.ImportDependencyMember;
-import com.c2kernel.entity.imports.ImportItem;
-import com.c2kernel.entity.imports.ImportOutcome;
-import com.c2kernel.entity.imports.ImportRole;
-import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.RolePath;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.Property;
-import com.c2kernel.scripting.ErrorInfo;
-import com.c2kernel.scripting.ScriptingEngineException;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.imports.ImportAgent;
+import org.cristalise.kernel.entity.imports.ImportDependency;
+import org.cristalise.kernel.entity.imports.ImportDependencyMember;
+import org.cristalise.kernel.entity.imports.ImportItem;
+import org.cristalise.kernel.entity.imports.ImportOutcome;
+import org.cristalise.kernel.entity.imports.ImportRole;
+import org.cristalise.kernel.entity.proxy.AgentProxy;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.RolePath;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.Property;
+import org.cristalise.kernel.scripting.ErrorInfo;
+import org.cristalise.kernel.scripting.ScriptingEngineException;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class Module extends ImportItem {
 
diff --git a/src/main/java/com/c2kernel/process/module/ModuleConfig.java b/src/main/java/org/cristalise/kernel/process/module/ModuleConfig.java
index 2cc2453..1165e31 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleConfig.java
+++ b/src/main/java/org/cristalise/kernel/process/module/ModuleConfig.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.module;
+package org.cristalise.kernel.process.module;
 
 public class ModuleConfig {
 
diff --git a/src/main/java/com/c2kernel/process/module/ModuleException.java b/src/main/java/org/cristalise/kernel/process/module/ModuleException.java
index 8eaa511..e09107e 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleException.java
+++ b/src/main/java/org/cristalise/kernel/process/module/ModuleException.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.module;
+package org.cristalise.kernel.process.module;
 
 public class ModuleException extends Exception {
 
diff --git a/src/main/java/com/c2kernel/process/module/ModuleImport.java b/src/main/java/org/cristalise/kernel/process/module/ModuleImport.java
index 327c55a..22faa5a 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleImport.java
+++ b/src/main/java/org/cristalise/kernel/process/module/ModuleImport.java
@@ -18,17 +18,18 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.module;
+package org.cristalise.kernel.process.module;
+
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.InvalidCollectionModification;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
 
 public abstract class ModuleImport {
 	
diff --git a/src/main/java/com/c2kernel/process/module/ModuleImports.java b/src/main/java/org/cristalise/kernel/process/module/ModuleImports.java
index 3cc2ee1..53c7e9d 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleImports.java
+++ b/src/main/java/org/cristalise/kernel/process/module/ModuleImports.java
@@ -18,14 +18,15 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.module;
+package org.cristalise.kernel.process.module;
 
 import java.util.ArrayList;
 
-import com.c2kernel.entity.imports.ImportAgent;
-import com.c2kernel.entity.imports.ImportItem;
-import com.c2kernel.entity.imports.ImportRole;
-import com.c2kernel.utils.CastorArrayList;
+import org.cristalise.kernel.entity.imports.ImportAgent;
+import org.cristalise.kernel.entity.imports.ImportItem;
+import org.cristalise.kernel.entity.imports.ImportRole;
+import org.cristalise.kernel.utils.CastorArrayList;
+
 
 public class ModuleImports extends CastorArrayList<ModuleImport> {
 
diff --git a/src/main/java/com/c2kernel/process/module/ModuleInfo.java b/src/main/java/org/cristalise/kernel/process/module/ModuleInfo.java
index 2f29fd1..8f482fc 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleInfo.java
+++ b/src/main/java/org/cristalise/kernel/process/module/ModuleInfo.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.module;
+package org.cristalise.kernel.process.module;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/org/cristalise/kernel/process/module/ModuleManager.java
index 8153033..d95abe6 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleManager.java
+++ b/src/main/java/org/cristalise/kernel/process/module/ModuleManager.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.module;
+package org.cristalise.kernel.process.module;
 
 import java.io.IOException;
 import java.net.URL;
@@ -27,17 +27,18 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Properties;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.persistency.outcome.OutcomeValidator;
-import com.c2kernel.persistency.outcome.Schema;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.scripting.ScriptingEngineException;
-import com.c2kernel.utils.FileStringUtility;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.proxy.AgentProxy;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.persistency.outcome.OutcomeValidator;
+import org.cristalise.kernel.persistency.outcome.Schema;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.scripting.ScriptingEngineException;
+import org.cristalise.kernel.utils.FileStringUtility;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class ModuleManager {
 	ArrayList<Module> modules = new ArrayList<Module>();
diff --git a/src/main/java/com/c2kernel/process/module/ModuleResource.java b/src/main/java/org/cristalise/kernel/process/module/ModuleResource.java
index da40403..74b5673 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleResource.java
+++ b/src/main/java/org/cristalise/kernel/process/module/ModuleResource.java
@@ -18,15 +18,16 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.module;
+package org.cristalise.kernel.process.module;
+
+import org.cristalise.kernel.common.CannotManageException;
+import org.cristalise.kernel.common.ObjectAlreadyExistsException;
+import org.cristalise.kernel.common.ObjectCannotBeUpdated;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lookup.AgentPath;
+import org.cristalise.kernel.process.Bootstrap;
+import org.cristalise.kernel.utils.Logger;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
-import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.process.Bootstrap;
-import com.c2kernel.utils.Logger;
 
 public class ModuleResource extends ModuleImport {
 	
diff --git a/src/main/java/com/c2kernel/process/module/ModuleScript.java b/src/main/java/org/cristalise/kernel/process/module/ModuleScript.java
index 2d50510..4e81864 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleScript.java
+++ b/src/main/java/org/cristalise/kernel/process/module/ModuleScript.java
@@ -18,11 +18,11 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.module;
+package org.cristalise.kernel.process.module;
 
-import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.scripting.Script;
-import com.c2kernel.scripting.ScriptingEngineException;
+import org.cristalise.kernel.entity.proxy.AgentProxy;
+import org.cristalise.kernel.scripting.Script;
+import org.cristalise.kernel.scripting.ScriptingEngineException;
 
 public class ModuleScript {
 
diff --git a/src/main/java/com/c2kernel/process/resource/BadArgumentsException.java b/src/main/java/org/cristalise/kernel/process/resource/BadArgumentsException.java
index fb1f5fb..d8d7dc9 100644
--- a/src/main/java/com/c2kernel/process/resource/BadArgumentsException.java
+++ b/src/main/java/org/cristalise/kernel/process/resource/BadArgumentsException.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.resource;
+package org.cristalise.kernel.process.resource;
 
 public class BadArgumentsException extends Exception {
 
diff --git a/src/main/java/com/c2kernel/process/resource/DefaultResourceImportHandler.java b/src/main/java/org/cristalise/kernel/process/resource/DefaultResourceImportHandler.java
index 3e6d6dd..dbd2d44 100644
--- a/src/main/java/com/c2kernel/process/resource/DefaultResourceImportHandler.java
+++ b/src/main/java/org/cristalise/kernel/process/resource/DefaultResourceImportHandler.java
@@ -18,15 +18,16 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.resource;
+package org.cristalise.kernel.process.resource;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.property.PropertyDescriptionList;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.property.PropertyDescriptionList;
+
 
 public class DefaultResourceImportHandler implements ResourceImportHandler {
 
diff --git a/src/main/java/com/c2kernel/process/resource/Resource.java b/src/main/java/org/cristalise/kernel/process/resource/Resource.java
index b313336..25b1ee8 100644
--- a/src/main/java/com/c2kernel/process/resource/Resource.java
+++ b/src/main/java/org/cristalise/kernel/process/resource/Resource.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.resource;
+package org.cristalise.kernel.process.resource;
 
 //Java
 import java.net.MalformedURLException;
@@ -27,10 +27,11 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.utils.FileStringUtility;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.utils.FileStringUtility;
+import org.cristalise.kernel.utils.Logger;
+
 
 /**************************************************************************
  *
@@ -45,12 +46,12 @@ public class Resource implements ResourceLoader {
     private final HashMap<String, URL> allBaseURLs = new HashMap<String, URL>();
 
     public Resource() throws InvalidDataException {
-    	baseURL = getURLorResURL("com/c2kernel/utils/resources/");
+    	baseURL = getURLorResURL("org/cristalise/kernel/utils/resources/");
     	allBaseURLs.put(null, baseURL);
     }
     
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.ResourceLoader#getKernelBaseURL()
+	 * @see org.cristalise.kernel.utils.ResourceLoader#getKernelBaseURL()
 	 */
     @Override
 	public URL getKernelBaseURL() {
@@ -68,7 +69,7 @@ public class Resource implements ResourceLoader {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.c2kernel.utils.ResourceLoader#getKernelResourceURL(java.lang.String)
+	 * @see org.cristalise.kernel.utils.ResourceLoader#getKernelResourceURL(java.lang.String)
 	 */
     @Override
 	public URL getKernelResourceURL(String resName) throws MalformedURLException {
@@ -76,7 +77,7 @@ public class Resource implements ResourceLoader {
     }
 
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.ResourceLoader#addModuleBaseURL(java.lang.String, java.net.URL)
+	 * @see org.cristalise.kernel.utils.ResourceLoader#addModuleBaseURL(java.lang.String, java.net.URL)
 	 */
     @Override
 	public void addModuleBaseURL(String ns, URL newBaseURL) {
@@ -86,7 +87,7 @@ public class Resource implements ResourceLoader {
     }
 
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.ResourceLoader#addModuleBaseURL(java.lang.String, java.lang.String)
+	 * @see org.cristalise.kernel.utils.ResourceLoader#addModuleBaseURL(java.lang.String, java.lang.String)
 	 */
     @Override
 	public void addModuleBaseURL(String ns, String newBaseURL) throws InvalidDataException {
@@ -94,7 +95,7 @@ public class Resource implements ResourceLoader {
     }
     
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.ResourceLoader#getModuleBaseURLs()
+	 * @see org.cristalise.kernel.utils.ResourceLoader#getModuleBaseURLs()
 	 */
     @Override
 	public HashMap<String, URL> getModuleBaseURLs() {
@@ -106,7 +107,7 @@ public class Resource implements ResourceLoader {
     }
 
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.ResourceLoader#getModuleResourceURL(java.lang.String, java.lang.String)
+	 * @see org.cristalise.kernel.utils.ResourceLoader#getModuleResourceURL(java.lang.String, java.lang.String)
 	 */
     @Override
 	public URL getModuleResourceURL(String ns, String resName) throws MalformedURLException {
@@ -129,7 +130,7 @@ public class Resource implements ResourceLoader {
         return result;
     }
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.ResourceLoader#findTextResource(java.lang.String)
+	 * @see org.cristalise.kernel.utils.ResourceLoader#findTextResource(java.lang.String)
 	 */
     
     @Override
@@ -144,7 +145,7 @@ public class Resource implements ResourceLoader {
     }
     
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.ResourceLoader#getAllTextResources(java.lang.String)
+	 * @see org.cristalise.kernel.utils.ResourceLoader#getAllTextResources(java.lang.String)
 	 */
     @Override
 	public HashMap<String, String> getAllTextResources(String resName) {
@@ -158,7 +159,7 @@ public class Resource implements ResourceLoader {
     }
     
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.ResourceLoader#getTextResource(java.lang.String, java.lang.String)
+	 * @see org.cristalise.kernel.utils.ResourceLoader#getTextResource(java.lang.String, java.lang.String)
 	 */
     @Override
 	public String getTextResource(String ns, String resName) throws ObjectNotFoundException
diff --git a/src/main/java/com/c2kernel/process/resource/ResourceImportHandler.java b/src/main/java/org/cristalise/kernel/process/resource/ResourceImportHandler.java
index 48c1483..9d37e31 100644
--- a/src/main/java/com/c2kernel/process/resource/ResourceImportHandler.java
+++ b/src/main/java/org/cristalise/kernel/process/resource/ResourceImportHandler.java
@@ -18,13 +18,14 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.resource;
+package org.cristalise.kernel.process.resource;
 
 import java.util.Set;
 
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.property.PropertyDescriptionList;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.property.PropertyDescriptionList;
+
 
 public interface ResourceImportHandler {
 
diff --git a/src/main/java/com/c2kernel/process/resource/ResourceLoader.java b/src/main/java/org/cristalise/kernel/process/resource/ResourceLoader.java
index d05831a..4ef0e9d 100644
--- a/src/main/java/com/c2kernel/process/resource/ResourceLoader.java
+++ b/src/main/java/org/cristalise/kernel/process/resource/ResourceLoader.java
@@ -18,15 +18,16 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.process.resource;
+package org.cristalise.kernel.process.resource;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.HashMap;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+
 
 public interface ResourceLoader {
 
diff --git a/src/main/java/com/c2kernel/property/Property.java b/src/main/java/org/cristalise/kernel/property/Property.java
index d65df34..920574c 100644
--- a/src/main/java/com/c2kernel/property/Property.java
+++ b/src/main/java/org/cristalise/kernel/property/Property.java
@@ -18,10 +18,10 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.property;
+package org.cristalise.kernel.property;
 
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.persistency.ClusterStorage;
 
 
 public class Property implements C2KLocalObject
@@ -102,7 +102,7 @@ public class Property implements C2KLocalObject
         return mValue;
     }
 	/**
-	 * @see com.c2kernel.entity.C2KLocalObject#getClusterType()
+	 * @see org.cristalise.kernel.entity.C2KLocalObject#getClusterType()
 	 */
 	@Override
 	public String getClusterType() {
diff --git a/src/main/java/com/c2kernel/property/PropertyArrayList.java b/src/main/java/org/cristalise/kernel/property/PropertyArrayList.java
index 4a2fe33..3e981a0 100644
--- a/src/main/java/com/c2kernel/property/PropertyArrayList.java
+++ b/src/main/java/org/cristalise/kernel/property/PropertyArrayList.java
@@ -18,11 +18,12 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.property;
+package org.cristalise.kernel.property;
 
 import java.util.ArrayList;
 
-import com.c2kernel.utils.CastorArrayList;
+import org.cristalise.kernel.utils.CastorArrayList;
+
 
 public class PropertyArrayList extends CastorArrayList<Property>
 {
diff --git a/src/main/java/com/c2kernel/property/PropertyDescription.java b/src/main/java/org/cristalise/kernel/property/PropertyDescription.java
index 0caaec9..29b10b1 100644
--- a/src/main/java/com/c2kernel/property/PropertyDescription.java
+++ b/src/main/java/org/cristalise/kernel/property/PropertyDescription.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.property;
+package org.cristalise.kernel.property;
 
 public class PropertyDescription
 {
diff --git a/src/main/java/com/c2kernel/property/PropertyDescriptionList.java b/src/main/java/org/cristalise/kernel/property/PropertyDescriptionList.java
index d06fb3d..98df773 100644
--- a/src/main/java/com/c2kernel/property/PropertyDescriptionList.java
+++ b/src/main/java/org/cristalise/kernel/property/PropertyDescriptionList.java
@@ -18,13 +18,14 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.property;
+package org.cristalise.kernel.property;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.utils.CastorArrayList;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.utils.CastorArrayList;
+
 
 public class PropertyDescriptionList extends CastorArrayList<PropertyDescription>
 {
diff --git a/src/main/java/com/c2kernel/property/PropertyUtility.java b/src/main/java/org/cristalise/kernel/property/PropertyUtility.java
index 787c645..39d399f 100644
--- a/src/main/java/com/c2kernel/property/PropertyUtility.java
+++ b/src/main/java/org/cristalise/kernel/property/PropertyUtility.java
@@ -18,18 +18,19 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.property;
+package org.cristalise.kernel.property;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.CastorHashMap;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.CastorHashMap;
+import org.cristalise.kernel.utils.Logger;
+
 
 
 public class PropertyUtility
diff --git a/src/main/java/com/c2kernel/scripting/ErrorInfo.java b/src/main/java/org/cristalise/kernel/scripting/ErrorInfo.java
index 2077429..3ea4200 100644
--- a/src/main/java/com/c2kernel/scripting/ErrorInfo.java
+++ b/src/main/java/org/cristalise/kernel/scripting/ErrorInfo.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.scripting;
+package org.cristalise.kernel.scripting;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/c2kernel/scripting/Parameter.java b/src/main/java/org/cristalise/kernel/scripting/Parameter.java
index a166abb..6b5e29a 100644
--- a/src/main/java/com/c2kernel/scripting/Parameter.java
+++ b/src/main/java/org/cristalise/kernel/scripting/Parameter.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.scripting;
+package org.cristalise.kernel.scripting;
 
 
 /**************************************************************************
diff --git a/src/main/java/com/c2kernel/scripting/ParameterException.java b/src/main/java/org/cristalise/kernel/scripting/ParameterException.java
index c893a27..8ecf806 100644
--- a/src/main/java/com/c2kernel/scripting/ParameterException.java
+++ b/src/main/java/org/cristalise/kernel/scripting/ParameterException.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.scripting;
+package org.cristalise.kernel.scripting;
 
 public class ParameterException extends ScriptingEngineException {
 
diff --git a/src/main/java/com/c2kernel/scripting/Script.java b/src/main/java/org/cristalise/kernel/scripting/Script.java
index 6ca1b9c..9b0d402 100644
--- a/src/main/java/com/c2kernel/scripting/Script.java
+++ b/src/main/java/org/cristalise/kernel/scripting/Script.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.scripting;
+package org.cristalise.kernel.scripting;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -38,19 +38,19 @@ import javax.script.SimpleScriptContext;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.agent.Job;
+import org.cristalise.kernel.entity.proxy.AgentProxy;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.LocalObjectLoader;
+import org.cristalise.kernel.utils.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 import org.xml.sax.InputSource;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.agent.Job;
-import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.LocalObjectLoader;
-import com.c2kernel.utils.Logger;
 
 /**************************************************************************
  *
@@ -404,8 +404,8 @@ public class Script
 
     /**
      * Gets all declared parameters
-     * @return HashMap of String (name), com.c2kernel.scripting.Parameter (param)
-     * @see com.c2kernel.scripting.Parameter
+     * @return HashMap of String (name), org.cristalise.kernel.scripting.Parameter (param)
+     * @see org.cristalise.kernel.scripting.Parameter
      */
     public HashMap<String, Parameter> getInputParams()
     {
@@ -414,8 +414,8 @@ public class Script
 
     /**
      * Gets all declared parameters, including those of imported scripts
-     * @return HashMap of String (name), com.c2kernel.scripting.Parameter (param)
-     * @see com.c2kernel.scripting.Parameter
+     * @return HashMap of String (name), org.cristalise.kernel.scripting.Parameter (param)
+     * @see org.cristalise.kernel.scripting.Parameter
      */
     public HashMap<String, Parameter> getAllInputParams()
     {
diff --git a/src/main/java/com/c2kernel/scripting/ScriptConsole.java b/src/main/java/org/cristalise/kernel/scripting/ScriptConsole.java
index 9f25390..51c8496 100644
--- a/src/main/java/com/c2kernel/scripting/ScriptConsole.java
+++ b/src/main/java/org/cristalise/kernel/scripting/ScriptConsole.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.scripting;
+package org.cristalise.kernel.scripting;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -34,10 +34,11 @@ import java.util.StringTokenizer;
 import javax.script.Bindings;
 import javax.script.ScriptEngine;
 
-import com.c2kernel.process.AbstractMain;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
-import com.c2kernel.utils.server.SocketHandler;
+import org.cristalise.kernel.process.AbstractMain;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.utils.Logger;
+import org.cristalise.kernel.utils.server.SocketHandler;
+
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/scripting/ScriptErrorException.java b/src/main/java/org/cristalise/kernel/scripting/ScriptErrorException.java
index e3175cd..34e58de 100644
--- a/src/main/java/com/c2kernel/scripting/ScriptErrorException.java
+++ b/src/main/java/org/cristalise/kernel/scripting/ScriptErrorException.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.scripting;
+package org.cristalise.kernel.scripting;
 
 public class ScriptErrorException extends java.lang.Exception {
 
diff --git a/src/main/java/com/c2kernel/scripting/ScriptLoadingException.java b/src/main/java/org/cristalise/kernel/scripting/ScriptLoadingException.java
index a4c5210..933aca6 100644
--- a/src/main/java/com/c2kernel/scripting/ScriptLoadingException.java
+++ b/src/main/java/org/cristalise/kernel/scripting/ScriptLoadingException.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.scripting;
+package org.cristalise.kernel.scripting;
 
 /**************************************************************************
  *
diff --git a/src/main/java/com/c2kernel/scripting/ScriptParsingException.java b/src/main/java/org/cristalise/kernel/scripting/ScriptParsingException.java
index e1d8679..bcbf384 100644
--- a/src/main/java/com/c2kernel/scripting/ScriptParsingException.java
+++ b/src/main/java/org/cristalise/kernel/scripting/ScriptParsingException.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.scripting;
+package org.cristalise.kernel.scripting;
 
 public class ScriptParsingException extends ScriptingEngineException {
 
diff --git a/src/main/java/com/c2kernel/scripting/ScriptingEngineException.java b/src/main/java/org/cristalise/kernel/scripting/ScriptingEngineException.java
index 6bd1e0d..e06e022 100644
--- a/src/main/java/com/c2kernel/scripting/ScriptingEngineException.java
+++ b/src/main/java/org/cristalise/kernel/scripting/ScriptingEngineException.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.scripting;
+package org.cristalise.kernel.scripting;
 
 public class ScriptingEngineException extends java.lang.Exception {
 
diff --git a/src/main/java/com/c2kernel/utils/ActDefCache.java b/src/main/java/org/cristalise/kernel/utils/ActDefCache.java
index 785a50d..4cb5c8f 100644
--- a/src/main/java/com/c2kernel/utils/ActDefCache.java
+++ b/src/main/java/org/cristalise/kernel/utils/ActDefCache.java
@@ -21,16 +21,17 @@
 /**
  *
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
+
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.lifecycle.ActivityDef;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.lifecycle.ActivityDef;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
 
 public class ActDefCache extends DescriptionObjectCache<ActivityDef> {
 
diff --git a/src/main/java/com/c2kernel/utils/CastorArrayList.java b/src/main/java/org/cristalise/kernel/utils/CastorArrayList.java
index bd9799f..4a57bff 100644
--- a/src/main/java/com/c2kernel/utils/CastorArrayList.java
+++ b/src/main/java/org/cristalise/kernel/utils/CastorArrayList.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/c2kernel/utils/CastorHashMap.java b/src/main/java/org/cristalise/kernel/utils/CastorHashMap.java
index aed3a3d..16dc90e 100644
--- a/src/main/java/com/c2kernel/utils/CastorHashMap.java
+++ b/src/main/java/org/cristalise/kernel/utils/CastorHashMap.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/c2kernel/utils/CastorXMLUtility.java b/src/main/java/org/cristalise/kernel/utils/CastorXMLUtility.java
index a084ea9..2d8ec9d 100644
--- a/src/main/java/com/c2kernel/utils/CastorXMLUtility.java
+++ b/src/main/java/org/cristalise/kernel/utils/CastorXMLUtility.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 //Java
 import java.io.IOException;
@@ -30,6 +30,9 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.process.resource.ResourceLoader;
 import org.exolab.castor.mapping.Mapping;
 import org.exolab.castor.mapping.MappingException;
 import org.exolab.castor.xml.MarshalException;
@@ -38,9 +41,6 @@ import org.exolab.castor.xml.Unmarshaller;
 import org.exolab.castor.xml.ValidationException;
 import org.exolab.castor.xml.XMLContext;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.process.resource.ResourceLoader;
 
 
 /**************************************************************************
diff --git a/src/main/java/com/c2kernel/utils/DateUtility.java b/src/main/java/org/cristalise/kernel/utils/DateUtility.java
index 09ee195..faa77e3 100644
--- a/src/main/java/com/c2kernel/utils/DateUtility.java
+++ b/src/main/java/org/cristalise/kernel/utils/DateUtility.java
@@ -18,8 +18,8 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
-import com.c2kernel.common.GTimeStamp;
+package org.cristalise.kernel.utils;
+import org.cristalise.kernel.common.GTimeStamp;
 /**
  * @version $Revision: 1.8 $ $Date: 2005/05/10 15:14:55 $
  * @author $Author: abranson $
diff --git a/src/main/java/com/c2kernel/utils/DescriptionObject.java b/src/main/java/org/cristalise/kernel/utils/DescriptionObject.java
index 25db952..5ae0dce 100644
--- a/src/main/java/com/c2kernel/utils/DescriptionObject.java
+++ b/src/main/java/org/cristalise/kernel/utils/DescriptionObject.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 public interface DescriptionObject {
 	
diff --git a/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java b/src/main/java/org/cristalise/kernel/utils/DescriptionObjectCache.java
index d3eb5ec..e5d0252 100644
--- a/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java
+++ b/src/main/java/org/cristalise/kernel/utils/DescriptionObjectCache.java
@@ -21,15 +21,16 @@
 /**
  *
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
+
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.entity.proxy.MemberSubscription;
+import org.cristalise.kernel.entity.proxy.ProxyObserver;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.ProxyObserver;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.entity.proxy.MemberSubscription;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Viewpoint;
 
 public abstract class DescriptionObjectCache<D extends DescriptionObject> {
 
diff --git a/src/main/java/com/c2kernel/utils/FileStringUtility.java b/src/main/java/org/cristalise/kernel/utils/FileStringUtility.java
index 8361726..3a87e74 100644
--- a/src/main/java/com/c2kernel/utils/FileStringUtility.java
+++ b/src/main/java/org/cristalise/kernel/utils/FileStringUtility.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 //Java
 import java.io.BufferedReader;
diff --git a/src/main/java/com/c2kernel/utils/GTimeStampComparator.java b/src/main/java/org/cristalise/kernel/utils/GTimeStampComparator.java
index 641f6fa..4a8dd04 100644
--- a/src/main/java/com/c2kernel/utils/GTimeStampComparator.java
+++ b/src/main/java/org/cristalise/kernel/utils/GTimeStampComparator.java
@@ -18,11 +18,12 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 import java.util.Comparator;
 
-import com.c2kernel.common.GTimeStamp;
+import org.cristalise.kernel.common.GTimeStamp;
+
 
 public class GTimeStampComparator implements Comparator<GTimeStamp> {
 
diff --git a/src/main/java/com/c2kernel/utils/KeyValuePair.java b/src/main/java/org/cristalise/kernel/utils/KeyValuePair.java
index 0a6278b..67c5fad 100644
--- a/src/main/java/com/c2kernel/utils/KeyValuePair.java
+++ b/src/main/java/org/cristalise/kernel/utils/KeyValuePair.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 
 public class KeyValuePair
diff --git a/src/main/java/com/c2kernel/utils/Language.java b/src/main/java/org/cristalise/kernel/utils/Language.java
index 540cf54..9f039e8 100644
--- a/src/main/java/com/c2kernel/utils/Language.java
+++ b/src/main/java/org/cristalise/kernel/utils/Language.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
diff --git a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java b/src/main/java/org/cristalise/kernel/utils/LocalObjectLoader.java
index 186b599..416d0a5 100644
--- a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java
+++ b/src/main/java/org/cristalise/kernel/utils/LocalObjectLoader.java
@@ -18,22 +18,23 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 import java.util.Iterator;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.lifecycle.ActivityDef;
-import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;
-import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.Path;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Schema;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.lifecycle.ActivityDef;
+import org.cristalise.kernel.lifecycle.instance.stateMachine.StateMachine;
+import org.cristalise.kernel.lookup.DomainPath;
+import org.cristalise.kernel.lookup.Path;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Schema;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
+
 
 public class LocalObjectLoader {
 	private static ActDefCache actCache = new ActDefCache();
diff --git a/src/main/java/com/c2kernel/utils/Logger.java b/src/main/java/org/cristalise/kernel/utils/Logger.java
index e3adcc8..244cf4c 100644
--- a/src/main/java/com/c2kernel/utils/Logger.java
+++ b/src/main/java/org/cristalise/kernel/utils/Logger.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -26,10 +26,11 @@ import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.c2kernel.process.AbstractMain;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.scripting.ScriptConsole;
-import com.c2kernel.utils.server.SimpleTCPIPServer;
+import org.cristalise.kernel.process.AbstractMain;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.scripting.ScriptConsole;
+import org.cristalise.kernel.utils.server.SimpleTCPIPServer;
+
 /**
  * <pre>- message string should always contain the class name and the method name: Logger.msg(1,"ItemFact::createDir() - LifeCycle DB created"); - use meaningfull abbreviation and also use the dash to separate the 'header' from the message! - each method should start with this 'method signature' debug: Logger.msg(1,"ItemFact::createDir() - path:" + path);
 *</pre>
diff --git a/src/main/java/com/c2kernel/utils/ObjectProperties.java b/src/main/java/org/cristalise/kernel/utils/ObjectProperties.java
index 4087fa3..31ff57c 100644
--- a/src/main/java/com/c2kernel/utils/ObjectProperties.java
+++ b/src/main/java/org/cristalise/kernel/utils/ObjectProperties.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
diff --git a/src/main/java/com/c2kernel/utils/SoftCache.java b/src/main/java/org/cristalise/kernel/utils/SoftCache.java
index 68428e2..7444dcf 100644
--- a/src/main/java/com/c2kernel/utils/SoftCache.java
+++ b/src/main/java/org/cristalise/kernel/utils/SoftCache.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
diff --git a/src/main/java/com/c2kernel/utils/StateMachineCache.java b/src/main/java/org/cristalise/kernel/utils/StateMachineCache.java
index 02eb881..5aa87b9 100644
--- a/src/main/java/com/c2kernel/utils/StateMachineCache.java
+++ b/src/main/java/org/cristalise/kernel/utils/StateMachineCache.java
@@ -21,16 +21,17 @@
 /**
  *
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
+
+import org.cristalise.kernel.common.InvalidDataException;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.proxy.ItemProxy;
+import org.cristalise.kernel.lifecycle.instance.stateMachine.StateMachine;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Viewpoint;
+import org.cristalise.kernel.process.Gateway;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;
-import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.process.Gateway;
 
 public class StateMachineCache extends DescriptionObjectCache<StateMachine> {
 
diff --git a/src/main/java/com/c2kernel/utils/TransientCache.java b/src/main/java/org/cristalise/kernel/utils/TransientCache.java
index fc5f4de..4b13e0e 100644
--- a/src/main/java/com/c2kernel/utils/TransientCache.java
+++ b/src/main/java/org/cristalise/kernel/utils/TransientCache.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 import java.lang.ref.Reference;
 import java.util.AbstractMap;
 import java.util.AbstractSet;
diff --git a/src/main/java/com/c2kernel/utils/WeakCache.java b/src/main/java/org/cristalise/kernel/utils/WeakCache.java
index 6b61474..3a37031 100644
--- a/src/main/java/com/c2kernel/utils/WeakCache.java
+++ b/src/main/java/org/cristalise/kernel/utils/WeakCache.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
@@ -50,7 +50,7 @@ public class WeakCache<K, V> extends AbstractMap<K, V> {
     }
 
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.NonStrongRefCache#get(java.lang.Object)
+	 * @see org.cristalise.kernel.utils.NonStrongRefCache#get(java.lang.Object)
 	 */
 	@Override
     public V get(Object key) {
@@ -71,7 +71,7 @@ public class WeakCache<K, V> extends AbstractMap<K, V> {
     }
 
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.NonStrongRefCache#put(K, V)
+	 * @see org.cristalise.kernel.utils.NonStrongRefCache#put(K, V)
 	 */
 	@Override
 	public V put(K key, V value) {
@@ -86,7 +86,7 @@ public class WeakCache<K, V> extends AbstractMap<K, V> {
     }
 
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.NonStrongRefCache#remove(java.lang.Object)
+	 * @see org.cristalise.kernel.utils.NonStrongRefCache#remove(java.lang.Object)
 	 */
 	@Override
 	public V remove(Object key) {
@@ -96,7 +96,7 @@ public class WeakCache<K, V> extends AbstractMap<K, V> {
     }
 
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.NonStrongRefCache#clear()
+	 * @see org.cristalise.kernel.utils.NonStrongRefCache#clear()
 	 */
 	@Override
 	public void clear() {
@@ -106,7 +106,7 @@ public class WeakCache<K, V> extends AbstractMap<K, V> {
     }
 
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.NonStrongRefCache#size()
+	 * @see org.cristalise.kernel.utils.NonStrongRefCache#size()
 	 */
     @Override
 	public int size() {
@@ -115,7 +115,7 @@ public class WeakCache<K, V> extends AbstractMap<K, V> {
     }
 
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.NonStrongRefCache#keySet()
+	 * @see org.cristalise.kernel.utils.NonStrongRefCache#keySet()
 	 */
     @Override
 	public Set<K> keySet() {
@@ -124,7 +124,7 @@ public class WeakCache<K, V> extends AbstractMap<K, V> {
     }
 
     /* (non-Javadoc)
-	 * @see com.c2kernel.utils.NonStrongRefCache#entrySet()
+	 * @see org.cristalise.kernel.utils.NonStrongRefCache#entrySet()
 	 */
     @Override
 	public Set<Map.Entry<K, V>> entrySet() {
diff --git a/src/main/java/com/c2kernel/utils/XmlElementParser.java b/src/main/java/org/cristalise/kernel/utils/XmlElementParser.java
index 06718c1..a722410 100644
--- a/src/main/java/com/c2kernel/utils/XmlElementParser.java
+++ b/src/main/java/org/cristalise/kernel/utils/XmlElementParser.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils;
+package org.cristalise.kernel.utils;
 
 import java.io.StringReader;
 import java.util.StringTokenizer;
diff --git a/src/main/java/com/c2kernel/utils/server/SimpleTCPIPServer.java b/src/main/java/org/cristalise/kernel/utils/server/SimpleTCPIPServer.java
index f34f0cc..16beffe 100644
--- a/src/main/java/com/c2kernel/utils/server/SimpleTCPIPServer.java
+++ b/src/main/java/org/cristalise/kernel/utils/server/SimpleTCPIPServer.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils.server;
+package org.cristalise.kernel.utils.server;
 
 import java.io.InterruptedIOException;
 import java.net.ServerSocket;
@@ -27,7 +27,8 @@ import java.util.ArrayList;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.utils.Logger;
+
 
 
 public class SimpleTCPIPServer implements Runnable
diff --git a/src/main/java/com/c2kernel/utils/server/SocketHandler.java b/src/main/java/org/cristalise/kernel/utils/server/SocketHandler.java
index a9aedd9..457fc52 100644
--- a/src/main/java/com/c2kernel/utils/server/SocketHandler.java
+++ b/src/main/java/org/cristalise/kernel/utils/server/SocketHandler.java
@@ -18,7 +18,7 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.utils.server;
+package org.cristalise.kernel.utils.server;
 
 import java.net.Socket;
 
diff --git a/src/main/java/com/c2kernel/persistency/MemoryOnlyClusterStorage.java b/src/main/java/org/cristalise/storage/MemoryOnlyClusterStorage.java
index 7408da3..737a173 100644
--- a/src/main/java/com/c2kernel/persistency/MemoryOnlyClusterStorage.java
+++ b/src/main/java/org/cristalise/storage/MemoryOnlyClusterStorage.java
@@ -18,18 +18,20 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency;
+package org.cristalise.storage;
 
 import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.process.auth.Authenticator;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.process.auth.Authenticator;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class MemoryOnlyClusterStorage extends ClusterStorage {
 
diff --git a/src/main/java/com/c2kernel/persistency/ProxyLoader.java b/src/main/java/org/cristalise/storage/ProxyLoader.java
index 88b6f03..8922e35 100644
--- a/src/main/java/com/c2kernel/persistency/ProxyLoader.java
+++ b/src/main/java/org/cristalise/storage/ProxyLoader.java
@@ -18,22 +18,24 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency;
+package org.cristalise.storage;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.AgentHelper;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.entity.Item;
-import com.c2kernel.entity.ItemHelper;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.Lookup;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.process.auth.Authenticator;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.AgentHelper;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.entity.Item;
+import org.cristalise.kernel.entity.ItemHelper;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.lookup.Lookup;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.process.auth.Authenticator;
+import org.cristalise.kernel.utils.Logger;
+
 
 /** Used by proxies to load clusters by queryData from the Entity.
 *   Last client storage - only used if not cached elsewhere
diff --git a/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java b/src/main/java/org/cristalise/storage/XMLClusterStorage.java
index 4a250e5..3ac864e 100644
--- a/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java
+++ b/src/main/java/org/cristalise/storage/XMLClusterStorage.java
@@ -18,19 +18,21 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-package com.c2kernel.persistency;
+package org.cristalise.storage;
 import java.io.File;
 import java.util.ArrayList;
 
-import com.c2kernel.common.PersistencyException;
-import com.c2kernel.entity.C2KLocalObject;
-import com.c2kernel.lookup.InvalidItemPathException;
-import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.process.auth.Authenticator;
-import com.c2kernel.utils.FileStringUtility;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.common.PersistencyException;
+import org.cristalise.kernel.entity.C2KLocalObject;
+import org.cristalise.kernel.lookup.InvalidItemPathException;
+import org.cristalise.kernel.lookup.ItemPath;
+import org.cristalise.kernel.persistency.ClusterStorage;
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.process.auth.Authenticator;
+import org.cristalise.kernel.utils.FileStringUtility;
+import org.cristalise.kernel.utils.Logger;
+
 
 public class XMLClusterStorage extends ClusterStorage {
     String rootDir=null;
diff --git a/src/main/resources/boot/SC/ServerNewEntity.xml b/src/main/resources/boot/SC/ServerNewEntity.xml
index 1a07de9..b6734a5 100644
--- a/src/main/resources/boot/SC/ServerNewEntity.xml
+++ b/src/main/resources/boot/SC/ServerNewEntity.xml
@@ -22,7 +22,7 @@
 
 -->
 <cristalscript>
-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+	<output name="errors" type="org.cristalise.kernel.scripting.ErrorInfo"/>
 	<script language="javascript" name="ServerNewEntity"><![CDATA[
 
 		var schema = job.getActPropString("SchemaType");
diff --git a/src/main/resources/mapFiles/CollectionMap.xml b/src/main/resources/mapFiles/CollectionMap.xml
index 33cbd3e..024b206 100644
--- a/src/main/resources/mapFiles/CollectionMap.xml
+++ b/src/main/resources/mapFiles/CollectionMap.xml
@@ -22,17 +22,17 @@
 
 -->
 <mapping>
-    <class name="com.c2kernel.collection.CollectionMemberList">
+    <class name="org.cristalise.kernel.collection.CollectionMemberList">
     	<map-to xml="CollectionMemberList"/>
     	<field name="list" 
     		   collection="arraylist" 
     		   direct="true" 
-    		   type="com.c2kernel.collection.CollectionMember">
+    		   type="org.cristalise.kernel.collection.CollectionMember">
 			<bind-xml auto-naming="deriveByClass" node="element"/>
 	    </field>	
    	</class>    
    	   	      	
-	<class name="com.c2kernel.collection.DependencyMember">
+	<class name="org.cristalise.kernel.collection.DependencyMember">
 		<map-to xml="DependencyMember"/>
 		<field name="ID" type="integer" direct="false">
 			<bind-xml name="ID" node="attribute"/>
@@ -45,7 +45,7 @@
 			<bind-xml name="ChildUUID" node="attribute"/>
 		</field>
 		<field name="mProperties" 
-			   type="com.c2kernel.utils.KeyValuePair"
+			   type="org.cristalise.kernel.utils.KeyValuePair"
 			   collection="array"
 			   container="false"
 			   direct="false"
@@ -55,8 +55,8 @@
 		</field>
 	</class>
 
-	<class name="com.c2kernel.collection.AggregationMember" 
-			extends="com.c2kernel.graph.model.GraphableVertex">
+	<class name="org.cristalise.kernel.collection.AggregationMember" 
+			extends="org.cristalise.kernel.graph.model.GraphableVertex">
 		<map-to xml="AggregationMember"/>
 		<field name="mItemPath"
 		       type="string"
@@ -75,10 +75,10 @@
 	</class>
 		
 	
-	<class name="com.c2kernel.collection.Collection">
+	<class name="org.cristalise.kernel.collection.Collection">
 		<map-to xml="Collection"/>
 		<field name="mMembers"
-		       type="com.c2kernel.collection.CollectionMemberList"
+		       type="org.cristalise.kernel.collection.CollectionMemberList"
 		       direct="false"
 		       get-method="getMembers"
 		       set-method="setMembers">
@@ -100,7 +100,7 @@
 		</field>
 
 	</class>
-	<class name="com.c2kernel.collection.Dependency" extends="com.c2kernel.collection.Collection">
+	<class name="org.cristalise.kernel.collection.Dependency" extends="org.cristalise.kernel.collection.Collection">
 		<map-to xml="Dependency"/>
 		<field name="mClassProps"
 			   type="string"
@@ -110,7 +110,7 @@
 			<bind-xml name="ClassProps" node="attribute"/>
 		</field>
 		<field name="mProperties" 
-			   type="com.c2kernel.utils.KeyValuePair"
+			   type="org.cristalise.kernel.utils.KeyValuePair"
 			   collection="array"
 			   container="false"
 			   direct="false"
@@ -119,27 +119,27 @@
 			<bind-xml name="Properties" node="element"/>
 		</field>		
 	</class>
-	<class name="com.c2kernel.collection.DependencyDescription" extends="com.c2kernel.collection.Dependency">
+	<class name="org.cristalise.kernel.collection.DependencyDescription" extends="org.cristalise.kernel.collection.Dependency">
 		<map-to xml="DependencyDescription"/>
 	</class>
-	<class name="com.c2kernel.collection.Aggregation" extends="com.c2kernel.collection.Collection">
+	<class name="org.cristalise.kernel.collection.Aggregation" extends="org.cristalise.kernel.collection.Collection">
 		<map-to xml="Aggregation"/>
-		<field name="mLayout" type="com.c2kernel.graph.model.GraphModel" direct="false" get-method="getLayout" set-method="setLayout">
+		<field name="mLayout" type="org.cristalise.kernel.graph.model.GraphModel" direct="false" get-method="getLayout" set-method="setLayout">
 			<bind-xml name="Layout" node="element"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.collection.AggregationDescription" extends="com.c2kernel.collection.Aggregation">
+	<class name="org.cristalise.kernel.collection.AggregationDescription" extends="org.cristalise.kernel.collection.Aggregation">
 		<map-to xml="AggregationDescription"/>
 	</class>
-	<class name="com.c2kernel.collection.AggregationInstance" extends="com.c2kernel.collection.Aggregation">
+	<class name="org.cristalise.kernel.collection.AggregationInstance" extends="org.cristalise.kernel.collection.Aggregation">
 		<map-to xml="AggregationInstance"/>
 	</class>
-	    <class name="com.c2kernel.collection.CollectionArrayList">
+	    <class name="org.cristalise.kernel.collection.CollectionArrayList">
     	<map-to xml="CollectionList"/>
     	<field name="list" 
     		   collection="arraylist" 
     		   direct="true" 
-    		   type="com.c2kernel.collection.Collection">    		   
+    		   type="org.cristalise.kernel.collection.Collection">    		   
 			<bind-xml auto-naming="deriveByClass" node="element"/>
     	</field>
    	</class> 
diff --git a/src/main/resources/mapFiles/HistoryMap.xml b/src/main/resources/mapFiles/HistoryMap.xml
index ecc6ab5..b044018 100644
--- a/src/main/resources/mapFiles/HistoryMap.xml
+++ b/src/main/resources/mapFiles/HistoryMap.xml
@@ -23,7 +23,7 @@
 -->
 <mapping>
 
-   <class name="com.c2kernel.events.Event">
+   <class name="org.cristalise.kernel.events.Event">
       <map-to xml="Event"/>
       <field name="mID" type="integer" direct="false" get-method="getID" set-method="setID">
          <bind-xml name="ID" node="attribute"/>
@@ -73,7 +73,7 @@
             <bind-xml name="AgentRole" node="attribute"/>
       </field>
 
-      <field name="mTimeStamp" type="com.c2kernel.common.GTimeStamp" direct="false" get-method="getTimeStamp" set-method="setTimeStamp">
+      <field name="mTimeStamp" type="org.cristalise.kernel.common.GTimeStamp" direct="false" get-method="getTimeStamp" set-method="setTimeStamp">
          <bind-xml name="TimeStamp" node="element"/>
       </field>
    </class>
diff --git a/src/main/resources/mapFiles/JobListMap.xml b/src/main/resources/mapFiles/JobListMap.xml
index dca933e..7d63dfa 100644
--- a/src/main/resources/mapFiles/JobListMap.xml
+++ b/src/main/resources/mapFiles/JobListMap.xml
@@ -22,7 +22,7 @@
 
 -->
 <mapping>
-	<class name="com.c2kernel.entity.agent.Job">
+	<class name="org.cristalise.kernel.entity.agent.Job">
 		<map-to xml="Job"/>
 		<field name="id" type="integer" direct="false" get-method="getId" set-method="setId">
 			<bind-xml name="Id" node="attribute"/>
@@ -39,7 +39,7 @@
 		<field name="stepPath" type="string" direct="false" get-method="getStepPath" set-method="setStepPath">
 			<bind-xml name="StepPath" node="attribute"/>
 		</field>
-		<field name="transition" type="com.c2kernel.lifecycle.instance.stateMachine.Transition" direct="false" get-method="getTransition" set-method="setTransition">
+		<field name="transition" type="org.cristalise.kernel.lifecycle.instance.stateMachine.Transition" direct="false" get-method="getTransition" set-method="setTransition">
 			<bind-xml name="Transition" node="element"/>
 		</field>
         <field name="mAgentPath" type="string" direct="false" get-method="getAgentUUID" set-method="setAgentUUID">
@@ -54,13 +54,13 @@
 		<field name="agentRole" type="string" direct="false" get-method="getAgentRole" set-method="setAgentRole">
 			<bind-xml name="AgentRole" node="attribute"/>
 		</field>
-		<field name="actProps" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false" get-method="getKeyValuePairs" set-method="setKeyValuePairs">
+		<field name="actProps" type="org.cristalise.kernel.utils.KeyValuePair" collection="array" container="false" direct="false" get-method="getKeyValuePairs" set-method="setKeyValuePairs">
 			<bind-xml name="ActProps" node="element"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.entity.agent.JobArrayList">
+	<class name="org.cristalise.kernel.entity.agent.JobArrayList">
 		<map-to xml="JobArrayList"/>
-		<field name="list" collection="arraylist" direct="true" type="com.c2kernel.entity.agent.Job">
+		<field name="list" collection="arraylist" direct="true" type="org.cristalise.kernel.entity.agent.Job">
 			<bind-xml name="JobArrayList" node="element"/>
 		</field>
 	</class>
diff --git a/src/main/resources/mapFiles/KeyValuePairMap.xml b/src/main/resources/mapFiles/KeyValuePairMap.xml
index 65103f1..cd12f9f 100644
--- a/src/main/resources/mapFiles/KeyValuePairMap.xml
+++ b/src/main/resources/mapFiles/KeyValuePairMap.xml
@@ -22,7 +22,7 @@
 
 -->
 <mapping>
-	<class name="com.c2kernel.utils.KeyValuePair">
+	<class name="org.cristalise.kernel.utils.KeyValuePair">
 		<map-to xml="KeyValuePair"/>
 		<field name="mKey"
 		       type="string"
@@ -59,7 +59,7 @@
 		       <bind-xml name="Boolean" node="attribute"/>
 		</field>				
 	</class>
-	<class name="com.c2kernel.common.GTimeStamp">
+	<class name="org.cristalise.kernel.common.GTimeStamp">
 		<map-to xml="TimeStamp"/>
 		<field name="mYear" type="java.lang.Integer" direct="true"><bind-xml name="Y" node="attribute"/></field>
 		<field name="mMonth" type="java.lang.Integer" direct="true"><bind-xml name="Mo" node="attribute"/></field>
diff --git a/src/main/resources/mapFiles/LifeCycleMap.xml b/src/main/resources/mapFiles/LifeCycleMap.xml
index 51b74ba..6bada93 100644
--- a/src/main/resources/mapFiles/LifeCycleMap.xml
+++ b/src/main/resources/mapFiles/LifeCycleMap.xml
@@ -22,50 +22,50 @@
 
 -->
 <mapping>
-	<class name="com.c2kernel.lifecycle.NextDef" extends="com.c2kernel.graph.model.GraphableEdge">
+	<class name="org.cristalise.kernel.lifecycle.NextDef" extends="org.cristalise.kernel.graph.model.GraphableEdge">
 		<map-to xml="NextDef"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.WfVertexDef" extends="com.c2kernel.graph.model.GraphableVertex">
+	<class name="org.cristalise.kernel.lifecycle.WfVertexDef" extends="org.cristalise.kernel.graph.model.GraphableVertex">
 		<map-to xml="WfVertexDef"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.ActivityDef" extends="com.c2kernel.lifecycle.WfVertexDef">
+	<class name="org.cristalise.kernel.lifecycle.ActivityDef" extends="org.cristalise.kernel.lifecycle.WfVertexDef">
 		<map-to xml="ActivityDef"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.CompositeActivityDef" extends="com.c2kernel.lifecycle.ActivityDef">
+	<class name="org.cristalise.kernel.lifecycle.CompositeActivityDef" extends="org.cristalise.kernel.lifecycle.ActivityDef">
 		<map-to xml="CompositeActivityDef"/>
 		<field name="castorNonLayoutableChildren" type="string" direct="false" collection="array">
 			<bind-xml name="castorNonLayoutableChildren" node="element"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.lifecycle.ActivitySlotDef" extends="com.c2kernel.lifecycle.WfVertexDef">
+	<class name="org.cristalise.kernel.lifecycle.ActivitySlotDef" extends="org.cristalise.kernel.lifecycle.WfVertexDef">
 		<map-to xml="ActivitySlotDef"/>
 		<field name="activityDef" type="string" direct="false">
 			<bind-xml name="activityDef" node="element"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.lifecycle.JoinDef" extends="com.c2kernel.lifecycle.WfVertexDef">
+	<class name="org.cristalise.kernel.lifecycle.JoinDef" extends="org.cristalise.kernel.lifecycle.WfVertexDef">
 		<map-to xml="JoinDef"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.AndSplitDef" extends="com.c2kernel.lifecycle.WfVertexDef">
+	<class name="org.cristalise.kernel.lifecycle.AndSplitDef" extends="org.cristalise.kernel.lifecycle.WfVertexDef">
 		<map-to xml="AndSplitDef"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.OrSplitDef" extends="com.c2kernel.lifecycle.AndSplitDef">
+	<class name="org.cristalise.kernel.lifecycle.OrSplitDef" extends="org.cristalise.kernel.lifecycle.AndSplitDef">
 		<map-to xml="OrSplitDef"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.XOrSplitDef" extends="com.c2kernel.lifecycle.AndSplitDef">
+	<class name="org.cristalise.kernel.lifecycle.XOrSplitDef" extends="org.cristalise.kernel.lifecycle.AndSplitDef">
 		<map-to xml="XOrSplitDef"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.LoopDef" extends="com.c2kernel.lifecycle.XOrSplitDef">
+	<class name="org.cristalise.kernel.lifecycle.LoopDef" extends="org.cristalise.kernel.lifecycle.XOrSplitDef">
 		<map-to xml="LoopDef"/>
 		<field name="isNext" type="integer" direct="true">
 			<bind-xml name="isNext" node="attribute"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.Next" extends="com.c2kernel.graph.model.GraphableEdge">
+	<class name="org.cristalise.kernel.lifecycle.instance.Next" extends="org.cristalise.kernel.graph.model.GraphableEdge">
 		<map-to xml="Next"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.WfVertex" extends="com.c2kernel.graph.model.GraphableVertex"/>
-	<class name="com.c2kernel.lifecycle.instance.Activity" extends="com.c2kernel.lifecycle.instance.WfVertex">
+	<class name="org.cristalise.kernel.lifecycle.instance.WfVertex" extends="org.cristalise.kernel.graph.model.GraphableVertex"/>
+	<class name="org.cristalise.kernel.lifecycle.instance.Activity" extends="org.cristalise.kernel.lifecycle.instance.WfVertex">
 		<map-to xml="AtomicActivity"/>
 		<field name="active" type="boolean" direct="false">
 			<bind-xml name="active" node="attribute"/>
@@ -79,58 +79,58 @@
 		<field name="eventIds" type="string" transient="true">
 			<bind-xml name="eventIds" node="element"/>
 		</field>
-		<field name="stateDate" type="com.c2kernel.common.GTimeStamp" direct="false">
+		<field name="stateDate" type="org.cristalise.kernel.common.GTimeStamp" direct="false">
 			<bind-xml name="stateDate" node="element"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.CompositeActivity" extends="com.c2kernel.lifecycle.instance.Activity">
+	<class name="org.cristalise.kernel.lifecycle.instance.CompositeActivity" extends="org.cristalise.kernel.lifecycle.instance.Activity">
 		<map-to xml="CompositeActivity"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.Workflow" extends="com.c2kernel.lifecycle.instance.CompositeActivity">
+	<class name="org.cristalise.kernel.lifecycle.instance.Workflow" extends="org.cristalise.kernel.lifecycle.instance.CompositeActivity">
 		<map-to xml="Workflow"/>
 		<field name="mItemPath" type="string" direct="false" get-method="getItemUUID" set-method="setItemUUID">
             <bind-xml name="ItemUUID" node="attribute"/>
 	    </field>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.Join" extends="com.c2kernel.lifecycle.instance.WfVertex">
+	<class name="org.cristalise.kernel.lifecycle.instance.Join" extends="org.cristalise.kernel.lifecycle.instance.WfVertex">
 		<map-to xml="Join"/>
 		<field name="counter" type="integer" direct="true">
 			<bind-xml name="counter" node="attribute"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.Split" extends="com.c2kernel.lifecycle.instance.WfVertex">
+	<class name="org.cristalise.kernel.lifecycle.instance.Split" extends="org.cristalise.kernel.lifecycle.instance.WfVertex">
 		<map-to xml="Split"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.AndSplit" extends="com.c2kernel.lifecycle.instance.Split">
+	<class name="org.cristalise.kernel.lifecycle.instance.AndSplit" extends="org.cristalise.kernel.lifecycle.instance.Split">
 		<map-to xml="AndSplit"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.OrSplit" extends="com.c2kernel.lifecycle.instance.Split">
+	<class name="org.cristalise.kernel.lifecycle.instance.OrSplit" extends="org.cristalise.kernel.lifecycle.instance.Split">
 		<map-to xml="OrSplit"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.XOrSplit" extends="com.c2kernel.lifecycle.instance.Split">
+	<class name="org.cristalise.kernel.lifecycle.instance.XOrSplit" extends="org.cristalise.kernel.lifecycle.instance.Split">
 		<map-to xml="XOrSplit"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.Loop" extends="com.c2kernel.lifecycle.instance.XOrSplit">
+	<class name="org.cristalise.kernel.lifecycle.instance.Loop" extends="org.cristalise.kernel.lifecycle.instance.XOrSplit">
 		<map-to xml="Loop"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer">
+	<class name="org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer">
 		<field name="ID" type="integer" direct="false">
 			<bind-xml name="id" node="attribute"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.predefined.server.ServerPredefinedStepContainer" 
-		extends="com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer">
+	<class name="org.cristalise.kernel.lifecycle.instance.predefined.server.ServerPredefinedStepContainer" 
+		extends="org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer">
 		<map-to xml="ServerPredefinedStepContainer"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.predefined.item.ItemPredefinedStepContainer" 
-		extends="com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer">
+	<class name="org.cristalise.kernel.lifecycle.instance.predefined.item.ItemPredefinedStepContainer" 
+		extends="org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer">
 		<map-to xml="PredefinedStepContainer"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.predefined.agent.AgentPredefinedStepContainer" 
-		extends="com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer">
+	<class name="org.cristalise.kernel.lifecycle.instance.predefined.agent.AgentPredefinedStepContainer" 
+		extends="org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer">
 		<map-to xml="AgentPredefinedStepContainer"/>
 	</class>	
-	<class name="com.c2kernel.scripting.ErrorInfo">
+	<class name="org.cristalise.kernel.scripting.ErrorInfo">
 		<map-to xml="Errors"/>
 		<field name="fatal" type="boolean" direct="false">
 			<bind-xml name="fatal" node="attribute"/>
diff --git a/src/main/resources/mapFiles/ModuleMap.xml b/src/main/resources/mapFiles/ModuleMap.xml
index 38f6648..ab021ff 100644
--- a/src/main/resources/mapFiles/ModuleMap.xml
+++ b/src/main/resources/mapFiles/ModuleMap.xml
@@ -22,7 +22,7 @@
 
 -->
 <mapping>
-	<class name="com.c2kernel.process.module.Module">
+	<class name="org.cristalise.kernel.process.module.Module">
 		<map-to xml="CristalModule" />
 		<field name="ns" direct="false" type="string" get-method="getNamespace" set-method="setNamespace">
 			<bind-xml name="ns" node="attribute" />
@@ -33,29 +33,29 @@
 		<field name="id" direct="false" type="string" get-method="getID" set-method="setID">
 			<bind-xml name="id" node="attribute" />
 		</field>		
-		<field name="info" direct="false" type="com.c2kernel.process.module.ModuleInfo">
+		<field name="info" direct="false" type="org.cristalise.kernel.process.module.ModuleInfo">
 			<bind-xml name="Info" node="element" />
 		</field>
 		<field name="resURL" direct="false" type="string">
 			<bind-xml name="ResourceURL" node="element" />
 		</field>
-		<field name="imports" direct="false" type="com.c2kernel.process.module.ModuleImports">
+		<field name="imports" direct="false" type="org.cristalise.kernel.process.module.ModuleImports">
 			<bind-xml name="Imports" node="element" />
 		</field>
-    	<field name="config" collection="arraylist" direct="false" type="com.c2kernel.process.module.ModuleConfig">    		   
+    	<field name="config" collection="arraylist" direct="false" type="org.cristalise.kernel.process.module.ModuleConfig">    		   
 			<bind-xml name="Config" node="element" />
     		</field>
-    	<field name="scripts" collection="arraylist" direct="false" type="com.c2kernel.process.module.ModuleScript">    		   
+    	<field name="scripts" collection="arraylist" direct="false" type="org.cristalise.kernel.process.module.ModuleScript">    		   
 			<bind-xml name="Script" node="element" />
     	</field>    		
 	</class>
-	<class name="com.c2kernel.process.module.ModuleImports">
+	<class name="org.cristalise.kernel.process.module.ModuleImports">
 		<map-to xml="Imports"/>
-		<field name="list" collection="arraylist" direct="true" type="com.c2kernel.process.module.ModuleImport">    		   
+		<field name="list" collection="arraylist" direct="true" type="org.cristalise.kernel.process.module.ModuleImport">    		   
 				<bind-xml auto-naming="deriveByClass" node="element" />
 		</field>
    	</class>  
-   	<class name="com.c2kernel.process.module.ModuleInfo">
+   	<class name="org.cristalise.kernel.process.module.ModuleInfo">
     	<map-to xml="Info"/>
 		<field name="desc" direct="true" type="string">
 			<bind-xml name="Description" node="element" />
@@ -68,7 +68,7 @@
 			<bind-xml name="Dependency" node="element" />
 		</field>
    	</class> 
-   	<class name="com.c2kernel.process.module.ModuleImport">
+   	<class name="org.cristalise.kernel.process.module.ModuleImport">
    		<field name="name" direct="false" type="string">
 			<bind-xml name="name" node="attribute" />
 		</field>
@@ -76,7 +76,7 @@
 			<bind-xml name="id" node="attribute" />
 		</field>
    	</class>
-	<class name="com.c2kernel.process.module.ModuleResource" extends="com.c2kernel.process.module.ModuleImport">
+	<class name="org.cristalise.kernel.process.module.ModuleResource" extends="org.cristalise.kernel.process.module.ModuleImport">
 		<map-to xml="Resource"/>
 		<field name="version" direct="false" type="integer">
 			<bind-xml name="version" node="attribute" />
@@ -88,7 +88,7 @@
 			<bind-xml node="text" />
 		</field>
 	</class>
-	<class name="com.c2kernel.process.module.ModuleConfig">
+	<class name="org.cristalise.kernel.process.module.ModuleConfig">
 		<map-to xml="Config"/>
 		<field name="name" direct="true" type="string">
 			<bind-xml name="name" node="attribute" />
@@ -100,7 +100,7 @@
 			<bind-xml node="text" />
 		</field>
 	</class>
-	<class name="com.c2kernel.process.module.ModuleScript">
+	<class name="org.cristalise.kernel.process.module.ModuleScript">
 		<map-to xml="Script"/>
 		<field name="target" direct="true" type="string">
 			<bind-xml name="target" node="attribute" />
diff --git a/src/main/resources/mapFiles/NewEntityMap.xml b/src/main/resources/mapFiles/NewEntityMap.xml
index e54be90..6b2376e 100644
--- a/src/main/resources/mapFiles/NewEntityMap.xml
+++ b/src/main/resources/mapFiles/NewEntityMap.xml
@@ -22,7 +22,7 @@
 
 -->
 <mapping>
-	<class name="com.c2kernel.entity.imports.ImportItem">
+	<class name="org.cristalise.kernel.entity.imports.ImportItem">
 		<map-to xml="Item"/>
 		<field name="name" type="string" direct="false">
 			<bind-xml name="name" node="attribute"/>
@@ -39,20 +39,20 @@
 		<field name="workflowVer" type="integer" direct="false">
 			<bind-xml name="workflowVer" node="attribute"/>
 		</field>		
-		<field name="properties" collection="arraylist" direct="false" type="com.c2kernel.property.Property">
+		<field name="properties" collection="arraylist" direct="false" type="org.cristalise.kernel.property.Property">
 			<bind-xml name="Property" node="element"/>
 		</field>
-		<field name="outcomes" collection="arraylist" direct="false" type="com.c2kernel.entity.imports.ImportOutcome">
+		<field name="outcomes" collection="arraylist" direct="false" type="org.cristalise.kernel.entity.imports.ImportOutcome">
 			<bind-xml name="Outcome" node="element"/>
 		</field>
-		<field name="dependencyList" collection="arraylist" direct="false" type="com.c2kernel.entity.imports.ImportDependency">
+		<field name="dependencyList" collection="arraylist" direct="false" type="org.cristalise.kernel.entity.imports.ImportDependency">
 			<bind-xml name="Dependency" node="element"/>
 		</field>
-		<field name="aggregationList" collection="arraylist" direct="false" type="com.c2kernel.entity.imports.ImportAggregation">
+		<field name="aggregationList" collection="arraylist" direct="false" type="org.cristalise.kernel.entity.imports.ImportAggregation">
 			<bind-xml name="Aggregation" node="element"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.entity.imports.ImportAggregation">
+	<class name="org.cristalise.kernel.entity.imports.ImportAggregation">
 		<field name="name" type="string" direct="true">
 			<bind-xml name="name" node="attribute"/>
 		</field>
@@ -62,11 +62,11 @@
 		<field name="isDescription" type="boolean" direct="true">
 			<bind-xml name="isDescription" node="attribute"/>
 		</field>
-		<field name="aggregationMemberList" collection="arraylist" direct="true" type="com.c2kernel.entity.imports.ImportAggregationMember">
+		<field name="aggregationMemberList" collection="arraylist" direct="true" type="org.cristalise.kernel.entity.imports.ImportAggregationMember">
 			<bind-xml name="AggregationMember" node="element"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.entity.imports.ImportAggregationMember">
+	<class name="org.cristalise.kernel.entity.imports.ImportAggregationMember">
 		<field name="slotNo" type="int" direct="true">
 			<bind-xml name="slotNo" node="attribute"/>
 		</field>
@@ -79,15 +79,15 @@
 		<field name="itemPath" type="string" direct="true">
 			<bind-xml name="itemPath" node="attribute"/>
 		</field>
-		<field name="geometry" direct="true" type="com.c2kernel.entity.imports.Geometry">
+		<field name="geometry" direct="true" type="org.cristalise.kernel.entity.imports.Geometry">
 			<bind-xml name="Geometry" node="element"/>
 		</field>
-		<field name="props" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
+		<field name="props" type="org.cristalise.kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
 			   get-method="getKeyValuePairs" set-method="setKeyValuePairs">
 			<bind-xml name="MemberProperties" node="element"/>
 		</field>		
 	</class>
-	<class name="com.c2kernel.entity.imports.Geometry">
+	<class name="org.cristalise.kernel.entity.imports.Geometry">
 		<field name="x" type="int" direct="true">
 			<bind-xml name="x" node="attribute"/>
 		</field>
@@ -101,7 +101,7 @@
 			<bind-xml name="height" node="attribute"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.entity.imports.ImportDependency">
+	<class name="org.cristalise.kernel.entity.imports.ImportDependency">
 		<field name="name" type="string" direct="true">
 			<bind-xml name="name" node="attribute"/>
 		</field>
@@ -117,24 +117,24 @@
 		<field name="itemDescriptionVersion" type="string" direct="true">
 			<bind-xml name="itemDescriptionVersion" node="attribute"/>
 		</field>		
-		<field name="dependencyMemberList" collection="arraylist" direct="true" type="com.c2kernel.entity.imports.ImportDependencyMember">
+		<field name="dependencyMemberList" collection="arraylist" direct="true" type="org.cristalise.kernel.entity.imports.ImportDependencyMember">
 			<bind-xml name="DependencyMember" node="element"/>
 		</field>
-		<field name="props" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
+		<field name="props" type="org.cristalise.kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
 			   get-method="getKeyValuePairs" set-method="setKeyValuePairs">
 			<bind-xml name="CollectionProperties" node="element"/>
 		</field>		
 	</class>
-	<class name="com.c2kernel.entity.imports.ImportDependencyMember">
+	<class name="org.cristalise.kernel.entity.imports.ImportDependencyMember">
 		<field name="itemPath" type="string" direct="true">
 			<bind-xml name="itemPath" node="attribute"/>
 		</field>
-		<field name="props" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
+		<field name="props" type="org.cristalise.kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
 			   get-method="getKeyValuePairs" set-method="setKeyValuePairs">
 			<bind-xml name="MemberProperties" node="element"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.entity.imports.ImportOutcome">
+	<class name="org.cristalise.kernel.entity.imports.ImportOutcome">
 		<field name="viewname" type="string" direct="true">
 			<bind-xml name="viewname" node="attribute"/>
 		</field>
@@ -148,7 +148,7 @@
 			<bind-xml name="viewname" node="text"/>
 		</field>
 	</class>		
-	<class name="com.c2kernel.entity.imports.ImportAgent">
+	<class name="org.cristalise.kernel.entity.imports.ImportAgent">
 		<map-to xml="Agent"/>
 		<field name="name" type="string" direct="false">
 			<bind-xml name="name" node="attribute"/>
@@ -159,14 +159,14 @@
 		<field name="roles" collection="arraylist" direct="false" type="string">
 			<bind-xml name="Role" node="element"/>
 		</field>
-		<field name="properties" collection="arraylist" direct="false" type="com.c2kernel.property.Property">
+		<field name="properties" collection="arraylist" direct="false" type="org.cristalise.kernel.property.Property">
 			<bind-xml name="Property" node="element"/>
 		</field>
 		<field name="mItemPath" type="string" direct="false" get-method="getID" set-method="setID">
             <bind-xml name="id" node="attribute"/>
 	    </field>
 	</class>	
-	<class name="com.c2kernel.entity.imports.ImportRole">
+	<class name="org.cristalise.kernel.entity.imports.ImportRole">
 		<map-to xml="Role"/>
 		<field name="name" type="string" direct="false">
 			<bind-xml name="name" node="text"/>
diff --git a/src/main/resources/mapFiles/PropertiesMap.xml b/src/main/resources/mapFiles/PropertiesMap.xml
index acd5b7d..daf956d 100644
--- a/src/main/resources/mapFiles/PropertiesMap.xml
+++ b/src/main/resources/mapFiles/PropertiesMap.xml
@@ -22,7 +22,7 @@
 
 -->
 <mapping>
-	<class name="com.c2kernel.property.Property">
+	<class name="org.cristalise.kernel.property.Property">
 		<map-to xml="Property"/>
 		<field name="mName" type="string" direct="false" get-method="getName" set-method="setName">
 			<bind-xml name="name" node="attribute"/>
@@ -35,7 +35,7 @@
 		</field>
 	</class>
 
-	<class name="com.c2kernel.property.PropertyDescription">
+	<class name="org.cristalise.kernel.property.PropertyDescription">
 		<map-to xml="PropertyDescription"/>
 		<field name="mName" type="string" direct="false" get-method="getName" set-method="setName">
 			<bind-xml name="Name" node="attribute"/>
@@ -52,19 +52,19 @@
 	</class>
 
 
-    <class name="com.c2kernel.property.PropertyDescriptionList">
+    <class name="org.cristalise.kernel.property.PropertyDescriptionList">
     	<map-to xml="AllProperties"/>
-    	<field name="list" collection="arraylist" direct="true" type="com.c2kernel.property.PropertyDescription">
+    	<field name="list" collection="arraylist" direct="true" type="org.cristalise.kernel.property.PropertyDescription">
 			<bind-xml name="PropertyDescription" node="element"/>
 	    </field>	
    	</class>    
 
-    <class name="com.c2kernel.property.PropertyArrayList">
+    <class name="org.cristalise.kernel.property.PropertyArrayList">
     	<map-to xml="PropertyList"/>
     	<field name="list" 
     		   collection="arraylist" 
     		   direct="true" 
-    		   type="com.c2kernel.property.Property">    		   
+    		   type="org.cristalise.kernel.property.Property">    		   
 			<bind-xml name="Property" node="element"/>
     	</field>
    	</class>       	   	 
diff --git a/src/main/resources/mapFiles/StateMachineMap.xml b/src/main/resources/mapFiles/StateMachineMap.xml
index 027eace..eb1da1b 100644
--- a/src/main/resources/mapFiles/StateMachineMap.xml
+++ b/src/main/resources/mapFiles/StateMachineMap.xml
@@ -22,14 +22,14 @@
 
 -->
 <mapping>
-	<class name="com.c2kernel.lifecycle.instance.stateMachine.StateMachine">
+	<class name="org.cristalise.kernel.lifecycle.instance.stateMachine.StateMachine">
 		<map-to xml="StateMachine" />
-		<field name="states" type="com.c2kernel.lifecycle.instance.stateMachine.State"
+		<field name="states" type="org.cristalise.kernel.lifecycle.instance.stateMachine.State"
 			collection="arraylist" direct="false" get-method="getStates" set-method="setStates">
 			<bind-xml name="State" node="element" />
 		</field>
 		<field name="transitions"
-			type="com.c2kernel.lifecycle.instance.stateMachine.Transition"
+			type="org.cristalise.kernel.lifecycle.instance.stateMachine.Transition"
 			collection="arraylist" direct="false">
 			<bind-xml name="Transition" node="element" />
 		</field>
@@ -37,7 +37,7 @@
 			<bind-xml name="initialState" node="attribute" />
 		</field>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.stateMachine.State">
+	<class name="org.cristalise.kernel.lifecycle.instance.stateMachine.State">
 		<map-to xml="State"/>
 		<field name="id" type="integer" direct="false">
 			<bind-xml name="id" node="attribute" />
@@ -49,7 +49,7 @@
 			<bind-xml name="proceeds" node="attribute" />
 		</field>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.stateMachine.Transition">
+	<class name="org.cristalise.kernel.lifecycle.instance.stateMachine.Transition">
 		<map-to xml="Transition"/>
 		<field name="id" type="integer" direct="false">
 			<bind-xml name="id" node="attribute" />
@@ -72,14 +72,14 @@
 		<field name="reservation" type="string" direct="false">
 			<bind-xml name="reservation" node="attribute" />
 		</field>		
-		<field name="outcome" type="com.c2kernel.lifecycle.instance.stateMachine.TransitionOutcome" direct="false">
+		<field name="outcome" type="org.cristalise.kernel.lifecycle.instance.stateMachine.TransitionOutcome" direct="false">
 			<bind-xml name="Outcome" node="element" />
 		</field>
-		<field name="script" type="com.c2kernel.lifecycle.instance.stateMachine.TransitionScript" direct="false">
+		<field name="script" type="org.cristalise.kernel.lifecycle.instance.stateMachine.TransitionScript" direct="false">
 			<bind-xml name="Script" node="element" />
 		</field>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.stateMachine.TransitionOutcome">
+	<class name="org.cristalise.kernel.lifecycle.instance.stateMachine.TransitionOutcome">
 		<map-to xml="Outcome"/>
 		<field name="schemaName" type="string" direct="false">
 			<bind-xml name="name" node="attribute" />
@@ -91,7 +91,7 @@
 			<bind-xml name="required" node="attribute" />
 		</field>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.stateMachine.TransitionScript">
+	<class name="org.cristalise.kernel.lifecycle.instance.stateMachine.TransitionScript">
 		<map-to xml="Script"/>
 		<field name="scriptName" type="string" direct="false">
 			<bind-xml name="name" node="attribute" />
diff --git a/src/main/resources/mapFiles/TransferMap.xml b/src/main/resources/mapFiles/TransferMap.xml
index 089efc8..fb27ff6 100644
--- a/src/main/resources/mapFiles/TransferMap.xml
+++ b/src/main/resources/mapFiles/TransferMap.xml
@@ -22,14 +22,14 @@
 
 -->
 <mapping>
-	<class name="com.c2kernel.entity.transfer.TransferSet">
+	<class name="org.cristalise.kernel.entity.transfer.TransferSet">
 		<map-to xml="TransferSet"/>
     	<field name="items" collection="arraylist" direct="true" 
-    		   type="com.c2kernel.entity.transfer.TransferItem">    		   
+    		   type="org.cristalise.kernel.entity.transfer.TransferItem">    		   
 			<bind-xml name="Item" node="element"/>
     	</field>
    	</class>		
-	<class name="com.c2kernel.entity.transfer.TransferItem">
+	<class name="org.cristalise.kernel.entity.transfer.TransferItem">
       <field name="mItemPath" type="string" direct="false" get-method="getUUID" set-method="setUUID">
          <bind-xml name="ItemUUID" node="attribute"/>
 	  </field>
diff --git a/src/main/resources/mapFiles/ViewpointMap.xml b/src/main/resources/mapFiles/ViewpointMap.xml
index 4010a13..f165bee 100644
--- a/src/main/resources/mapFiles/ViewpointMap.xml
+++ b/src/main/resources/mapFiles/ViewpointMap.xml
@@ -22,7 +22,7 @@
 
 -->
 <mapping>
-	<class name="com.c2kernel.persistency.outcome.Viewpoint">
+	<class name="org.cristalise.kernel.persistency.outcome.Viewpoint">
 		<map-to xml="Viewpoint"/>
         <field name="mItemPath" type="string" direct="false" get-method="getItemUUID" set-method="setItemUUID">
            <bind-xml name="ItemUUID" node="attribute"/>
diff --git a/src/main/resources/mapFiles/graphModelMap.xml b/src/main/resources/mapFiles/graphModelMap.xml
index a09ce9b..6317525 100644
--- a/src/main/resources/mapFiles/graphModelMap.xml
+++ b/src/main/resources/mapFiles/graphModelMap.xml
@@ -22,13 +22,13 @@
 
 -->
 <mapping>
-	<class name="com.c2kernel.graph.model.GraphModel">
+	<class name="org.cristalise.kernel.graph.model.GraphModel">
 		<map-to xml="GraphModel"/>
-		<field name="GraphModelCastorData" type="com.c2kernel.graph.model.GraphModelCastorData" direct="false">
+		<field name="GraphModelCastorData" type="org.cristalise.kernel.graph.model.GraphModelCastorData" direct="false">
 			<bind-xml auto-naming="deriveByClass" node="element"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.graph.model.GraphPoint">
+	<class name="org.cristalise.kernel.graph.model.GraphPoint">
 		<map-to xml="GraphPoint"/>
 		<field name="x" type="integer" direct="true">
 			<bind-xml name="x" node="attribute"/>
@@ -37,15 +37,15 @@
 			<bind-xml name="y" node="attribute"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.graph.model.GraphModelCastorData">
+	<class name="org.cristalise.kernel.graph.model.GraphModelCastorData">
 		<map-to xml="GraphModelCastorData"/>
 		<field name="mClassNameOfVertexOutlineCreator" type="string" direct="true">
 			<bind-xml name="ClassNameOfVertexOutlineCreator" node="attribute"/>
 		</field>
-		<field name="mVertexImpls" type="com.c2kernel.graph.model.Vertex" direct="true" collection="array">
+		<field name="mVertexImpls" type="org.cristalise.kernel.graph.model.Vertex" direct="true" collection="array">
 			<bind-xml auto-naming="deriveByClass"  node="element"/>
 		</field>
-		<field name="mEdgeImpls" type="com.c2kernel.graph.model.DirectedEdge" direct="true" collection="array">
+		<field name="mEdgeImpls" type="org.cristalise.kernel.graph.model.DirectedEdge" direct="true" collection="array">
 			<bind-xml auto-naming="deriveByClass" node="element"/>
 		</field>
 		<field name="mStartVertexId" type="integer" direct="true">
@@ -55,7 +55,7 @@
 			<bind-xml name="NextId" node="attribute"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.graph.model.Vertex">
+	<class name="org.cristalise.kernel.graph.model.Vertex">
 		<map-to xml="Vertex"/>
 		<field name="ID" type="integer" direct="false">
 			<bind-xml name="ID" node="attribute"/>
@@ -69,10 +69,10 @@
 		<field name="Width" type="integer" direct="false">
 			<bind-xml name="Width" node="attribute"/>
 		</field>
-		<field name="CentrePoint" type="com.c2kernel.graph.model.GraphPoint" direct="false">
+		<field name="CentrePoint" type="org.cristalise.kernel.graph.model.GraphPoint" direct="false">
 			<bind-xml name="CentrePoint" node="element"/>
 		</field>
-		<field name="OutlinePoints" type="com.c2kernel.graph.model.GraphPoint" direct="false" collection="array">
+		<field name="OutlinePoints" type="org.cristalise.kernel.graph.model.GraphPoint" direct="false" collection="array">
 			<bind-xml name="OutlinePoint" node="element"/>
 		</field>
 		<field name="InEdgeIds" type="integer" direct="false" collection="array">
@@ -82,15 +82,15 @@
 			<bind-xml name="OutEdgeId" node="element"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.graph.model.DirectedEdge">
+	<class name="org.cristalise.kernel.graph.model.DirectedEdge">
 		<map-to xml="DirectedEdge"/>
 		<field name="ID" type="integer" direct="false">
 			<bind-xml name="ID" node="attribute"/>
 		</field>
-		<field name="OriginPoint" type="com.c2kernel.graph.model.GraphPoint" direct="false">
+		<field name="OriginPoint" type="org.cristalise.kernel.graph.model.GraphPoint" direct="false">
 			<bind-xml name="OriginPoint" node="element"/>
 		</field>
-		<field name="TerminusPoint" type="com.c2kernel.graph.model.GraphPoint" direct="false">
+		<field name="TerminusPoint" type="org.cristalise.kernel.graph.model.GraphPoint" direct="false">
 			<bind-xml name="TerminusPoint" node="element"/>
 		</field>
 		<field name="OriginVertexId" type="integer" direct="false">
@@ -100,10 +100,10 @@
 			<bind-xml name="TerminusVertexId" node="attribute"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.graph.model.GraphableEdge" extends="com.c2kernel.graph.model.DirectedEdge">
+	<class name="org.cristalise.kernel.graph.model.GraphableEdge" extends="org.cristalise.kernel.graph.model.DirectedEdge">
 		<map-to xml="GraphableEdge"/>
 		<field name="mProperties" 
-			   type="com.c2kernel.utils.KeyValuePair"
+			   type="org.cristalise.kernel.utils.KeyValuePair"
 			   collection="array"
 			   container="false"
 			   direct="false"
@@ -112,7 +112,7 @@
 			<bind-xml name="Properties" node="element"/>
 		</field>
 	</class>
-	<class name="com.c2kernel.graph.model.GraphableVertex" extends="com.c2kernel.graph.model.Vertex">
+	<class name="org.cristalise.kernel.graph.model.GraphableVertex" extends="org.cristalise.kernel.graph.model.Vertex">
 		<map-to xml="GraphableVertex"/>
 		<field name="mIsLayoutable" 
 			   type="boolean" 
@@ -128,11 +128,11 @@
 			   set-method="setIsComposite">
 			<bind-xml name="IsComposite" node="attribute"/>
 		</field>
-		<field name="childrenGraphModel" type="com.c2kernel.graph.model.GraphModel" direct="false">
+		<field name="childrenGraphModel" type="org.cristalise.kernel.graph.model.GraphModel" direct="false">
 			<bind-xml name="childrenGraphModel" node="element"/>
 		</field>
 		<field name="mProperties" 
-			   type="com.c2kernel.utils.KeyValuePair"
+			   type="org.cristalise.kernel.utils.KeyValuePair"
 			   collection="array"
 			   container="false"
 			   direct="false"
diff --git a/src/main/resources/textFiles/consoleScript.javascript.txt b/src/main/resources/textFiles/consoleScript.javascript.txt
index 4775a71..fbfaa93 100644
--- a/src/main/resources/textFiles/consoleScript.javascript.txt
+++ b/src/main/resources/textFiles/consoleScript.javascript.txt
@@ -1,8 +1,8 @@
-importClass(com.c2kernel.process.Gateway);
+importClass(org.cristalise.kernel.process.Gateway);
 
 function log(level) { 
-	com.c2kernel.utils.Logger.removeLogStream(output); 
-	com.c2kernel.utils.Logger.addLogStream(output, level);
+	org.cristalise.kernel.utils.Logger.removeLogStream(output); 
+	org.cristalise.kernel.utils.Logger.addLogStream(output, level);
 }
 function help() { 
 	var help = Gateway.getResource().getAllTextResources("textFiles/consoleHelp.txt").values().iterator();
@@ -14,5 +14,5 @@ function version() {
 	print("Modules loaded: "+Gateway.getModuleManager().getModuleVersions());
 }
 function shutdown() { 
-	com.c2kernel.process.AbstractMain.shutdown(0);  
+	org.cristalise.kernel.process.AbstractMain.shutdown(0);  
 }
diff --git a/src/test/java/LauncherTest.java b/src/test/java/LauncherTest.java
index 403d4e3..62a188d 100644
--- a/src/test/java/LauncherTest.java
+++ b/src/test/java/LauncherTest.java
@@ -20,9 +20,10 @@
  */
 import java.util.Properties;
 
-import com.c2kernel.process.AbstractMain;
-import com.c2kernel.process.resource.BadArgumentsException;
-import com.c2kernel.utils.Logger;
+import org.cristalise.kernel.process.AbstractMain;
+import org.cristalise.kernel.process.resource.BadArgumentsException;
+import org.cristalise.kernel.utils.Logger;
+
 
 
 public class LauncherTest {
diff --git a/src/test/java/MainTest.java b/src/test/java/MainTest.java
index 9154dca..c92bb7d 100644
--- a/src/test/java/MainTest.java
+++ b/src/test/java/MainTest.java
@@ -22,18 +22,18 @@ import java.util.HashMap;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
+import org.cristalise.kernel.common.ObjectNotFoundException;
+import org.cristalise.kernel.lifecycle.instance.stateMachine.StateMachine;
+import org.cristalise.kernel.persistency.outcome.OutcomeValidator;
+import org.cristalise.kernel.persistency.outcome.Schema;
+import org.cristalise.kernel.persistency.outcome.SchemaValidator;
+import org.cristalise.kernel.process.Gateway;
+import org.cristalise.kernel.scripting.Script;
+import org.cristalise.kernel.utils.CastorXMLUtility;
+import org.cristalise.kernel.utils.FileStringUtility;
+import org.cristalise.kernel.utils.Logger;
 import org.custommonkey.xmlunit.XMLUnit;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;
-import com.c2kernel.persistency.outcome.OutcomeValidator;
-import com.c2kernel.persistency.outcome.Schema;
-import com.c2kernel.persistency.outcome.SchemaValidator;
-import com.c2kernel.process.Gateway;
-import com.c2kernel.scripting.Script;
-import com.c2kernel.utils.CastorXMLUtility;
-import com.c2kernel.utils.FileStringUtility;
-import com.c2kernel.utils.Logger;
 
 public class MainTest {
 
diff --git a/src/test/java/OutcomeTest.java b/src/test/java/OutcomeTest.java
index 7d40ed9..cd22cff 100644
--- a/src/test/java/OutcomeTest.java
+++ b/src/test/java/OutcomeTest.java
@@ -18,11 +18,11 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
+import org.cristalise.kernel.persistency.outcome.Outcome;
+import org.cristalise.kernel.utils.FileStringUtility;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.c2kernel.persistency.outcome.Outcome;
-import com.c2kernel.utils.FileStringUtility;
 
 
 public class OutcomeTest {
diff --git a/src/test/resources/NewServerPredefStepTest.js b/src/test/resources/NewServerPredefStepTest.js
index 51cdd74..0306bef 100644
--- a/src/test/resources/NewServerPredefStepTest.js
+++ b/src/test/resources/NewServerPredefStepTest.js
@@ -18,14 +18,14 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-var serverPath=new com.c2kernel.lookup.DomainPath("/servers/pcuwe04.cern.ch");
+var serverPath=new org.cristalise.kernel.lookup.DomainPath("/servers/pcuwe04.cern.ch");
 var serverItem=proxy.getProxy(serverPath);
 
 var predef = "AddDomainContext"; var params = new Array(1); params[0] = "/test/context"; agent.execute(serverItem, predef, params);
 var predef = "RemoveDomainContext"; agent.execute(serverItem, predef, params);
 params[0] = "/test"; agent.execute(serverItem, predef, params);
 var predef = "SetAgentPassword"; params = Array(2); params[0] = "dev"; params[1] = "hunter2"; agent.execute(serverItem, predef, params); 
-com.c2kernel.process.Gateway.login("dev", "hunter2");
+org.cristalise.kernel.process.Gateway.login("dev", "hunter2");
 var predef = "SetAgentRoles"; agent.execute(serverItem, predef, params); //Role shouldn't exist
 params = Array(3); params[0] = "dev"; params[1] = "Admin"; params[2] = "UserCode"; agent.execute(serverItem, predef, params);
 params = Array(2); params[0] = "dev"; params[1] = "Admin"; agent.execute(serverItem, predef, params);
diff --git a/src/test/resources/searchPropDesc.js b/src/test/resources/searchPropDesc.js
index bfcc277..11da340 100644
--- a/src/test/resources/searchPropDesc.js
+++ b/src/test/resources/searchPropDesc.js
@@ -18,9 +18,9 @@
  *
  * http://www.fsf.org/licensing/licenses/lgpl.html
  */
-importClass(com.c2kernel.lookup.DomainPath);
-importClass(com.c2kernel.process.Gateway);
-importClass(com.c2kernel.utils.Logger);
+importClass(org.cristalise.kernel.lookup.DomainPath);
+importClass(org.cristalise.kernel.process.Gateway);
+importClass(org.cristalise.kernel.utils.Logger);
 
 function searchType(factoryname) {
 	var desc = proxy.getProxy(new DomainPath("/desc/dev/"+factoryname));
author	Andrew Branson <andrew.branson@cern.ch>	2014-10-07 09:18:11 +0200
committer	Andrew Branson <andrew.branson@cern.ch>	2014-10-07 09:18:11 +0200
commit	0ed2c1124cf1b9e49a2ec1fa0126a8df09f9e758 (patch)
tree	e3a56cee83865f8c703deb790c15d3e79e871a82
parent	50aa8aaab42fa62267aa1ae6a6070013096f5082 (diff)