16 files changed, 64 insertions, 64 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/Activator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/Activator.java
index 31865bbd7e3..c89f6e39d7c 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/Activator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/Activator.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.properties.runtime.uml;
+package org.eclipse.papyrus.uml.properties.runtime;
 
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/Messages.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/Messages.java
index 8854864d542..8c2e223a4d9 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/Messages.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/Messages.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml;
+package org.eclipse.papyrus.uml.properties.runtime;
 
 import org.eclipse.osgi.util.NLS;
 
@@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS;
  */
 public class Messages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.properties.runtime.uml.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.properties.runtime.messages"; //$NON-NLS-1$
 
 	/** feature of AssociationEndOwnerModelHandler_ComboValue_Association */
 	public static String AssociationEndOwnerModelHandler_ComboValue_Association;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/messages.properties b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/messages.properties
index 0a081a7cea9..0a081a7cea9 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/messages.properties
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/messages.properties
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndNavigationHandlerState.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndNavigationHandlerState.java
index 7a8e285f2e5..0f1f9feb57d 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndNavigationHandlerState.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndNavigationHandlerState.java
@@ -9,15 +9,15 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.modelhandler;
+package org.eclipse.papyrus.uml.properties.runtime.modelhandler;
 
 import java.beans.PropertyChangeListener;
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.IEMFModelHandlerState;
-import org.eclipse.papyrus.properties.runtime.state.AbstractState;
-import org.eclipse.papyrus.properties.runtime.state.ITraversableModelElement;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.IEMFModelHandlerState;
+import org.eclipse.papyrus.views.properties.runtime.state.AbstractState;
+import org.eclipse.papyrus.views.properties.runtime.state.ITraversableModelElement;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndNavigationModelHandler.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndNavigationModelHandler.java
index 2e648e0c0f1..c8e5226ea16 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndNavigationModelHandler.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndNavigationModelHandler.java
@@ -10,7 +10,7 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *  Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.modelhandler;
+package org.eclipse.papyrus.uml.properties.runtime.modelhandler;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,11 +22,11 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.properties.runtime.controller.EMFPropertyEditorController;
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.IEMFModelHandler;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.IBoundedValuesPropertyEditorDescriptor;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.IPropertyEditorDescriptor;
-import org.eclipse.papyrus.properties.runtime.uml.Activator;
+import org.eclipse.papyrus.views.properties.runtime.controller.EMFPropertyEditorController;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.IEMFModelHandler;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.IBoundedValuesPropertyEditorDescriptor;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.IPropertyEditorDescriptor;
+import org.eclipse.papyrus.uml.properties.runtime.Activator;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.uml2.uml.Association;
@@ -274,7 +274,7 @@ public class AssociationEndNavigationModelHandler implements IEMFModelHandler {
 
 	/**
 	 * 
-	 * @see org.eclipse.papyrus.properties.runtime.modelhandler.emf.IEMFModelHandler#getSetRequest(org.eclipse.emf.transaction.TransactionalEditingDomain,
+	 * @see org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.IEMFModelHandler#getSetRequest(org.eclipse.emf.transaction.TransactionalEditingDomain,
 	 *      org.eclipse.emf.ecore.EObject, java.lang.Object)
 	 * 
 	 * @param domain
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndNavigationModelHandlerFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndNavigationModelHandlerFactory.java
index f35a006a459..8de3b4a84bf 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndNavigationModelHandlerFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndNavigationModelHandlerFactory.java
@@ -9,9 +9,9 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.modelhandler;
+package org.eclipse.papyrus.uml.properties.runtime.modelhandler;
 
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.EMFModelHandlerFactory;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.EMFModelHandlerFactory;
 import org.w3c.dom.Node;
 
 
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndOwnerHandlerState.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndOwnerHandlerState.java
index 8fb37fda2c8..d2c7a39afdf 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndOwnerHandlerState.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndOwnerHandlerState.java
@@ -9,15 +9,15 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.modelhandler;
+package org.eclipse.papyrus.uml.properties.runtime.modelhandler;
 
 import java.beans.PropertyChangeListener;
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.IEMFModelHandlerState;
-import org.eclipse.papyrus.properties.runtime.state.AbstractState;
-import org.eclipse.papyrus.properties.runtime.state.ITraversableModelElement;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.IEMFModelHandlerState;
+import org.eclipse.papyrus.views.properties.runtime.state.AbstractState;
+import org.eclipse.papyrus.views.properties.runtime.state.ITraversableModelElement;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndOwnerModelHandler.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndOwnerModelHandler.java
index 348ef755c3d..53f94be8b40 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndOwnerModelHandler.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndOwnerModelHandler.java
@@ -10,7 +10,7 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *  Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.modelhandler;
+package org.eclipse.papyrus.uml.properties.runtime.modelhandler;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,12 +22,12 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.properties.runtime.controller.EMFPropertyEditorController;
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.IEMFModelHandler;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.IBoundedValuesPropertyEditorDescriptor;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.IPropertyEditorDescriptor;
-import org.eclipse.papyrus.properties.runtime.uml.Activator;
-import org.eclipse.papyrus.properties.runtime.uml.Messages;
+import org.eclipse.papyrus.views.properties.runtime.controller.EMFPropertyEditorController;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.IEMFModelHandler;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.IBoundedValuesPropertyEditorDescriptor;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.IPropertyEditorDescriptor;
+import org.eclipse.papyrus.uml.properties.runtime.Activator;
+import org.eclipse.papyrus.uml.properties.runtime.Messages;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.uml2.uml.Association;
@@ -282,7 +282,7 @@ public class AssociationEndOwnerModelHandler implements IEMFModelHandler {
 
 	/**
 	 * 
-	 * @see org.eclipse.papyrus.properties.runtime.modelhandler.emf.IEMFModelHandler#getSetRequest(org.eclipse.emf.transaction.TransactionalEditingDomain,
+	 * @see org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.IEMFModelHandler#getSetRequest(org.eclipse.emf.transaction.TransactionalEditingDomain,
 	 *      org.eclipse.emf.ecore.EObject, java.lang.Object)
 	 * 
 	 * @param domain
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndOwnerModelHandlerFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndOwnerModelHandlerFactory.java
index eaa6529253f..8e46921e0e3 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/AssociationEndOwnerModelHandlerFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/AssociationEndOwnerModelHandlerFactory.java
@@ -9,10 +9,10 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.modelhandler;
+package org.eclipse.papyrus.uml.properties.runtime.modelhandler;
 
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.EMFModelHandlerFactory;
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.IEMFModelHandler;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.EMFModelHandlerFactory;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.IEMFModelHandler;
 import org.w3c.dom.Node;
 
 
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/MultiplicityHandlerState.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/MultiplicityHandlerState.java
index b24adad23e5..e53bb12f788 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/MultiplicityHandlerState.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/MultiplicityHandlerState.java
@@ -9,15 +9,15 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.modelhandler;
+package org.eclipse.papyrus.uml.properties.runtime.modelhandler;
 
 import java.beans.PropertyChangeListener;
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.IEMFModelHandlerState;
-import org.eclipse.papyrus.properties.runtime.state.AbstractState;
-import org.eclipse.papyrus.properties.runtime.state.ITraversableModelElement;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.IEMFModelHandlerState;
+import org.eclipse.papyrus.views.properties.runtime.state.AbstractState;
+import org.eclipse.papyrus.views.properties.runtime.state.ITraversableModelElement;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/MultiplicityModelHandler.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/MultiplicityModelHandler.java
index 1d2907373db..85aaa4b4d4c 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/MultiplicityModelHandler.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/MultiplicityModelHandler.java
@@ -10,7 +10,7 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *  Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.modelhandler;
+package org.eclipse.papyrus.uml.properties.runtime.modelhandler;
 
 import java.util.List;
 
@@ -20,12 +20,12 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.properties.runtime.controller.EMFPropertyEditorController;
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.EMFUtils;
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.IEMFModelHandler;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.IBoundedValuesPropertyEditorDescriptor;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.IPropertyEditorDescriptor;
-import org.eclipse.papyrus.properties.runtime.uml.Activator;
+import org.eclipse.papyrus.views.properties.runtime.controller.EMFPropertyEditorController;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.EMFUtils;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.IEMFModelHandler;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.IBoundedValuesPropertyEditorDescriptor;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.IPropertyEditorDescriptor;
+import org.eclipse.papyrus.uml.properties.runtime.Activator;
 import org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -322,7 +322,7 @@ public class MultiplicityModelHandler implements IEMFModelHandler {
 
 	/**
 	 * 
-	 * @see org.eclipse.papyrus.properties.runtime.modelhandler.emf.IEMFModelHandler#getSetRequest(org.eclipse.emf.transaction.TransactionalEditingDomain,
+	 * @see org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.IEMFModelHandler#getSetRequest(org.eclipse.emf.transaction.TransactionalEditingDomain,
 	 *      org.eclipse.emf.ecore.EObject, java.lang.Object)
 	 * 
 	 * @param domain
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/MultiplicityModelHandlerFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/MultiplicityModelHandlerFactory.java
index b073b404181..4d0744f1bc8 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/modelhandler/MultiplicityModelHandlerFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/modelhandler/MultiplicityModelHandlerFactory.java
@@ -9,13 +9,13 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.modelhandler;
+package org.eclipse.papyrus.uml.properties.runtime.modelhandler;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.EMFModelHandlerFactory;
-import org.eclipse.papyrus.properties.runtime.modelhandler.emf.IEMFModelHandler;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.EMFModelHandlerFactory;
+import org.eclipse.papyrus.views.properties.runtime.modelhandler.emf.IEMFModelHandler;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/propertyeditor/MultiplicityPropertyEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/propertyeditor/MultiplicityPropertyEditor.java
index b9848c80feb..6f34723d00d 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/propertyeditor/MultiplicityPropertyEditor.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/propertyeditor/MultiplicityPropertyEditor.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2010 CEA LIST.
- *    
+ * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,17 +9,17 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.propertyeditor;
+package org.eclipse.papyrus.uml.properties.runtime.propertyeditor;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.papyrus.properties.runtime.Activator;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.AbstractPropertyEditor;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.IBoundedValuesPropertyEditorDescriptor;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.IPropertyEditorDescriptor;
+import org.eclipse.papyrus.views.properties.runtime.Activator;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.AbstractPropertyEditor;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.IBoundedValuesPropertyEditorDescriptor;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.IPropertyEditorDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.events.FocusEvent;
@@ -37,7 +37,7 @@ import org.eclipse.swt.widgets.Composite;
 public class MultiplicityPropertyEditor extends AbstractPropertyEditor {
 
 	/** id of this editor */
-	public static final String ID = "org.eclipse.papyrus.properties.view.uml.multiplicityPropertyEditor";
+	public static final String ID = "org.eclipse.papyrus.uml.properties.view.multiplicityPropertyEditor";
 
 	/** main composite created by this property editor */
 	private Composite composite;
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/propertyeditor/MultiplicityPropertyEditorValidator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/propertyeditor/MultiplicityPropertyEditorValidator.java
index aaa5946a7ff..8de15182f59 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/propertyeditor/MultiplicityPropertyEditorValidator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/propertyeditor/MultiplicityPropertyEditorValidator.java
@@ -9,10 +9,10 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.propertyeditor;
+package org.eclipse.papyrus.uml.properties.runtime.propertyeditor;
 
-import org.eclipse.papyrus.properties.runtime.propertyeditor.AbstractPropertyEditor;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.IPropertyEditorTypeValidator;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.AbstractPropertyEditor;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.IPropertyEditorTypeValidator;
 
 /**
  * Validator for the simple reference property editors
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/propertyeditor/descriptor/MultiplicityPropertyEditorDescriptor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/propertyeditor/descriptor/MultiplicityPropertyEditorDescriptor.java
index b8ff464de80..74c475ba92e 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/propertyeditor/descriptor/MultiplicityPropertyEditorDescriptor.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/propertyeditor/descriptor/MultiplicityPropertyEditorDescriptor.java
@@ -9,13 +9,13 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.propertyeditor.descriptor;
+package org.eclipse.papyrus.uml.properties.runtime.propertyeditor.descriptor;
 
 import java.util.List;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.IBoundedValuesPropertyEditorDescriptor;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.PropertyEditorDescriptor;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.IBoundedValuesPropertyEditorDescriptor;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.PropertyEditorDescriptor;
 
 
 /**
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/propertyeditor/descriptor/MultiplicityPropertyEditorDescriptorFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/propertyeditor/descriptor/MultiplicityPropertyEditorDescriptorFactory.java
index fc10c623f06..fefa2620934 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/properties/runtime/uml/propertyeditor/descriptor/MultiplicityPropertyEditorDescriptorFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.runtime/src/org/eclipse/papyrus/uml/properties/runtime/propertyeditor/descriptor/MultiplicityPropertyEditorDescriptorFactory.java
@@ -9,12 +9,12 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.runtime.uml.propertyeditor.descriptor;
+package org.eclipse.papyrus.uml.properties.runtime.propertyeditor.descriptor;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.properties.runtime.Activator;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.IPropertyEditorDescriptorFactory;
-import org.eclipse.papyrus.properties.runtime.propertyeditor.descriptor.PropertyEditorDescriptor;
+import org.eclipse.papyrus.views.properties.runtime.Activator;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.IPropertyEditorDescriptorFactory;
+import org.eclipse.papyrus.views.properties.runtime.propertyeditor.descriptor.PropertyEditorDescriptor;
 import org.eclipse.swt.SWT;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;