51 files changed, 576 insertions, 631 deletions
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/CustomFiller.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/CustomFiller.java
index d7874f7e66b..8b128b57ac5 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/CustomFiller.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/CustomFiller.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 
 /**
@@ -15,11 +15,11 @@ package org.eclipse.papyrus.newchild;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.CustomFiller#getClassName <em>Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.CustomFiller#getClassName <em>Class Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getCustomFiller()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getCustomFiller()
  * @model
  * @generated
  */
@@ -34,14 +34,14 @@ public interface CustomFiller extends MenuItem {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Class Name</em>' attribute.
 	 * @see #setClassName(String)
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getCustomFiller_ClassName()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getCustomFiller_ClassName()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getClassName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.CustomFiller#getClassName <em>Class Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.CustomFiller#getClassName <em>Class Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Class Name</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/Menu.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/Menu.java
index 68c393477d5..bf32157b99a 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/Menu.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/Menu.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 
 /**
@@ -15,12 +15,12 @@ package org.eclipse.papyrus.newchild;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.Menu#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.Menu#getIcon <em>Icon</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getIcon <em>Icon</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenu()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenu()
  * @model
  * @generated
  */
@@ -35,14 +35,14 @@ public interface Menu extends MenuContainer, MenuItem {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenu_Name()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenu_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.Menu#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -61,14 +61,14 @@ public interface Menu extends MenuContainer, MenuItem {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Icon</em>' attribute.
 	 * @see #setIcon(String)
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenu_Icon()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenu_Icon()
 	 * @model
 	 * @generated
 	 */
 	String getIcon();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.Menu#getIcon <em>Icon</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getIcon <em>Icon</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Icon</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuAction.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuAction.java
index 45506ac3d95..60bc05ea88d 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuAction.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuAction.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
 
@@ -16,11 +16,11 @@ import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.MenuAction#getElementType <em>Element Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuAction#getElementType <em>Element Type</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuAction()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuAction()
  * @model
  * @generated
  */
@@ -35,14 +35,14 @@ public interface MenuAction extends MenuItem {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Element Type</em>' reference.
 	 * @see #setElementType(ExtendedElementTypeConfiguration)
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuAction_ElementType()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuAction_ElementType()
 	 * @model required="true"
 	 * @generated
 	 */
 	ExtendedElementTypeConfiguration getElementType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuAction#getElementType <em>Element Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuAction#getElementType <em>Element Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Element Type</em>' reference.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuContainer.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuContainer.java
index b1d201726cd..7426628457b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuContainer.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuContainer.java
@@ -4,10 +4,9 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -18,18 +17,18 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.MenuContainer#getSubmenus <em>Submenus</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuContainer#getSubmenus <em>Submenus</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuContainer()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuContainer()
  * @model abstract="true"
  * @generated
  */
 public interface MenuContainer extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Submenus</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.newchild.MenuItem}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.MenuItem}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Submenus</em>' containment reference list isn't clear,
@@ -37,7 +36,7 @@ public interface MenuContainer extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Submenus</em>' containment reference list.
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuContainer_Submenus()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuContainer_Submenus()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuGroup.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuGroup.java
index 68e64110aaa..6399e0cc69f 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuGroup.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuGroup.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 
 /**
@@ -15,13 +15,13 @@ package org.eclipse.papyrus.newchild;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.MenuGroup#getBefore <em>Before</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.MenuGroup#getAfter <em>After</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getBefore <em>Before</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAfter <em>After</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuGroup()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuGroup()
  * @model
  * @generated
  */
@@ -36,14 +36,14 @@ public interface MenuGroup extends MenuContainer {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Before</em>' attribute.
 	 * @see #setBefore(String)
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuGroup_Before()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuGroup_Before()
 	 * @model
 	 * @generated
 	 */
 	String getBefore();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuGroup#getBefore <em>Before</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getBefore <em>Before</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Before</em>' attribute.
@@ -62,14 +62,14 @@ public interface MenuGroup extends MenuContainer {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>After</em>' attribute.
 	 * @see #setAfter(String)
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuGroup_After()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuGroup_After()
 	 * @model
 	 * @generated
 	 */
 	String getAfter();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuGroup#getAfter <em>After</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAfter <em>After</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>After</em>' attribute.
@@ -81,7 +81,7 @@ public interface MenuGroup extends MenuContainer {
 	/**
 	 * Returns the value of the '<em><b>Absolute Position</b></em>' attribute.
 	 * The default value is <code>"top"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.newchild.MenuPosition}.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.emf.newchild.MenuPosition}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Absolute Position</em>' attribute isn't clear,
@@ -89,20 +89,20 @@ public interface MenuGroup extends MenuContainer {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Absolute Position</em>' attribute.
-	 * @see org.eclipse.papyrus.newchild.MenuPosition
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuPosition
 	 * @see #setAbsolutePosition(MenuPosition)
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuGroup_AbsolutePosition()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuGroup_AbsolutePosition()
 	 * @model default="top"
 	 * @generated
 	 */
 	MenuPosition getAbsolutePosition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Absolute Position</em>' attribute.
-	 * @see org.eclipse.papyrus.newchild.MenuPosition
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuPosition
 	 * @see #getAbsolutePosition()
 	 * @generated
 	 */
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuItem.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuItem.java
index 4476eec4144..db237989dea 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuItem.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuItem.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.MenuItem#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem#getId <em>Id</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuItem()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuItem()
  * @model abstract="true"
  * @generated
  */
@@ -35,14 +35,14 @@ public interface MenuItem extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuItem_Id()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuItem_Id()
 	 * @model
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuItem#getId <em>Id</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem#getId <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Id</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuPosition.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuPosition.java
index e90b8309c2e..9c91f068f05 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuPosition.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuPosition.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Menu Position</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuPosition()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuPosition()
  * @model
  * @generated
  */
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuRoot.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuRoot.java
index 570ba2c6ffd..d21d999481b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuRoot.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/MenuRoot.java
@@ -4,11 +4,10 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.papyrus.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
 
 /**
  * <!-- begin-user-doc -->
@@ -18,19 +17,19 @@ import org.eclipse.papyrus.constraints.DisplayUnit;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.MenuRoot#getGroups <em>Groups</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.MenuRoot#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getGroups <em>Groups</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuRoot()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuRoot()
  * @model
  * @generated
  */
 public interface MenuRoot extends MenuContainer, DisplayUnit {
 	/**
 	 * Returns the value of the '<em><b>Groups</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.newchild.MenuGroup}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Groups</em>' containment reference list isn't clear,
@@ -38,7 +37,7 @@ public interface MenuRoot extends MenuContainer, DisplayUnit {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Groups</em>' containment reference list.
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuRoot_Groups()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuRoot_Groups()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -54,14 +53,14 @@ public interface MenuRoot extends MenuContainer, DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getMenuRoot_Name()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getMenuRoot_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.MenuRoot#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildConfiguration.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildConfiguration.java
index a68783266b7..1edc8223792 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildConfiguration.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildConfiguration.java
@@ -4,13 +4,11 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,20 +18,20 @@ import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getRoots <em>Roots</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getNewChildPolicies <em>New Child Policies</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getRoots <em>Roots</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getNewChildPolicies <em>New Child Policies</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getNewchildConfiguration()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getNewchildConfiguration()
  * @model
  * @generated
  */
 public interface NewchildConfiguration extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Roots</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.newchild.MenuRoot}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Roots</em>' containment reference list isn't clear,
@@ -41,7 +39,7 @@ public interface NewchildConfiguration extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Roots</em>' containment reference list.
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getNewchildConfiguration_Roots()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getNewchildConfiguration_Roots()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -57,14 +55,14 @@ public interface NewchildConfiguration extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getNewchildConfiguration_Name()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getNewchildConfiguration_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -75,7 +73,7 @@ public interface NewchildConfiguration extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>New Child Policies</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>New Child Policies</em>' containment reference list isn't clear,
@@ -83,7 +81,7 @@ public interface NewchildConfiguration extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>New Child Policies</em>' containment reference list.
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#getNewchildConfiguration_NewChildPolicies()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getNewchildConfiguration_NewChildPolicies()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildFactory.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildFactory.java
index 977459890bf..0cd266ee3f3 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildFactory.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildFactory.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.NewchildPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage
  * @generated
  */
 public interface NewchildFactory extends EFactory {
@@ -23,7 +23,7 @@ public interface NewchildFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	NewchildFactory eINSTANCE = org.eclipse.papyrus.newchild.impl.NewchildFactoryImpl.init();
+	NewchildFactory eINSTANCE = org.eclipse.papyrus.infra.emf.newchild.impl.NewchildFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Configuration</em>'.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildPackage.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildPackage.java
index bea69675727..24bfbf1cc79 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildPackage.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/NewchildPackage.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.NewchildFactory
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildFactory
  * @model kind="package"
  * @generated
  */
@@ -58,14 +58,14 @@ public interface NewchildPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	NewchildPackage eINSTANCE = org.eclipse.papyrus.newchild.impl.NewchildPackageImpl.init();
+	NewchildPackage eINSTANCE = org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl <em>Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl <em>Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl
-	 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getNewchildConfiguration()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getNewchildConfiguration()
 	 * @generated
 	 */
 	int NEWCHILD_CONFIGURATION = 0;
@@ -107,11 +107,11 @@ public interface NewchildPackage extends EPackage {
 	int NEWCHILD_CONFIGURATION_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuContainerImpl <em>Menu Container</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuContainerImpl <em>Menu Container</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.impl.MenuContainerImpl
-	 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuContainer()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuContainerImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuContainer()
 	 * @generated
 	 */
 	int MENU_CONTAINER = 3;
@@ -135,11 +135,11 @@ public interface NewchildPackage extends EPackage {
 	int MENU_CONTAINER_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl <em>Menu Root</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl <em>Menu Root</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.impl.MenuRootImpl
-	 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuRoot()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuRoot()
 	 * @generated
 	 */
 	int MENU_ROOT = 1;
@@ -199,11 +199,11 @@ public interface NewchildPackage extends EPackage {
 	int MENU_ROOT_FEATURE_COUNT = MENU_CONTAINER_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuItemImpl <em>Menu Item</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuItemImpl <em>Menu Item</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.impl.MenuItemImpl
-	 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuItem()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuItemImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuItem()
 	 * @generated
 	 */
 	int MENU_ITEM = 2;
@@ -227,11 +227,11 @@ public interface NewchildPackage extends EPackage {
 	int MENU_ITEM_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuImpl <em>Menu</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl <em>Menu</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.impl.MenuImpl
-	 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenu()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenu()
 	 * @generated
 	 */
 	int MENU = 4;
@@ -282,11 +282,11 @@ public interface NewchildPackage extends EPackage {
 	int MENU_FEATURE_COUNT = MENU_CONTAINER_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuActionImpl <em>Menu Action</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuActionImpl <em>Menu Action</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.impl.MenuActionImpl
-	 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuAction()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuActionImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuAction()
 	 * @generated
 	 */
 	int MENU_ACTION = 5;
@@ -319,11 +319,11 @@ public interface NewchildPackage extends EPackage {
 	int MENU_ACTION_FEATURE_COUNT = MENU_ITEM_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.SeparatorImpl <em>Separator</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.SeparatorImpl <em>Separator</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.impl.SeparatorImpl
-	 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getSeparator()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.SeparatorImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getSeparator()
 	 * @generated
 	 */
 	int SEPARATOR = 6;
@@ -347,11 +347,11 @@ public interface NewchildPackage extends EPackage {
 	int SEPARATOR_FEATURE_COUNT = MENU_ITEM_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.MenuGroupImpl <em>Menu Group</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl <em>Menu Group</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.impl.MenuGroupImpl
-	 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuGroup()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuGroup()
 	 * @generated
 	 */
 	int MENU_GROUP = 7;
@@ -402,11 +402,11 @@ public interface NewchildPackage extends EPackage {
 	int MENU_GROUP_FEATURE_COUNT = MENU_CONTAINER_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.impl.CustomFillerImpl <em>Custom Filler</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.CustomFillerImpl <em>Custom Filler</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.impl.CustomFillerImpl
-	 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getCustomFiller()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.CustomFillerImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getCustomFiller()
 	 * @generated
 	 */
 	int CUSTOM_FILLER = 8;
@@ -439,266 +439,266 @@ public interface NewchildPackage extends EPackage {
 	int CUSTOM_FILLER_FEATURE_COUNT = MENU_ITEM_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.MenuPosition <em>Menu Position</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuPosition <em>Menu Position</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.MenuPosition
-	 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuPosition()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuPosition
+	 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuPosition()
 	 * @generated
 	 */
 	int MENU_POSITION = 9;
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.NewchildConfiguration <em>Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Configuration</em>'.
-	 * @see org.eclipse.papyrus.newchild.NewchildConfiguration
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration
 	 * @generated
 	 */
 	EClass getNewchildConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getRoots <em>Roots</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getRoots <em>Roots</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Roots</em>'.
-	 * @see org.eclipse.papyrus.newchild.NewchildConfiguration#getRoots()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getRoots()
 	 * @see #getNewchildConfiguration()
 	 * @generated
 	 */
 	EReference getNewchildConfiguration_Roots();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.newchild.NewchildConfiguration#getName()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getName()
 	 * @see #getNewchildConfiguration()
 	 * @generated
 	 */
 	EAttribute getNewchildConfiguration_Name();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.NewchildConfiguration#getNewChildPolicies <em>New Child Policies</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getNewChildPolicies <em>New Child Policies</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>New Child Policies</em>'.
-	 * @see org.eclipse.papyrus.newchild.NewchildConfiguration#getNewChildPolicies()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration#getNewChildPolicies()
 	 * @see #getNewchildConfiguration()
 	 * @generated
 	 */
 	EReference getNewchildConfiguration_NewChildPolicies();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.MenuRoot <em>Menu Root</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot <em>Menu Root</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Menu Root</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuRoot
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuRoot
 	 * @generated
 	 */
 	EClass getMenuRoot();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.MenuRoot#getGroups <em>Groups</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getGroups <em>Groups</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Groups</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuRoot#getGroups()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getGroups()
 	 * @see #getMenuRoot()
 	 * @generated
 	 */
 	EReference getMenuRoot_Groups();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.MenuRoot#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuRoot#getName()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuRoot#getName()
 	 * @see #getMenuRoot()
 	 * @generated
 	 */
 	EAttribute getMenuRoot_Name();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.MenuItem <em>Menu Item</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem <em>Menu Item</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Menu Item</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuItem
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuItem
 	 * @generated
 	 */
 	EClass getMenuItem();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.MenuItem#getId <em>Id</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem#getId <em>Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuItem#getId()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuItem#getId()
 	 * @see #getMenuItem()
 	 * @generated
 	 */
 	EAttribute getMenuItem_Id();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.MenuContainer <em>Menu Container</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuContainer <em>Menu Container</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Menu Container</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuContainer
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuContainer
 	 * @generated
 	 */
 	EClass getMenuContainer();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.MenuContainer#getSubmenus <em>Submenus</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.MenuContainer#getSubmenus <em>Submenus</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Submenus</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuContainer#getSubmenus()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuContainer#getSubmenus()
 	 * @see #getMenuContainer()
 	 * @generated
 	 */
 	EReference getMenuContainer_Submenus();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.Menu <em>Menu</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.Menu <em>Menu</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Menu</em>'.
-	 * @see org.eclipse.papyrus.newchild.Menu
+	 * @see org.eclipse.papyrus.infra.emf.newchild.Menu
 	 * @generated
 	 */
 	EClass getMenu();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.Menu#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.newchild.Menu#getName()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.Menu#getName()
 	 * @see #getMenu()
 	 * @generated
 	 */
 	EAttribute getMenu_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.Menu#getIcon <em>Icon</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.Menu#getIcon <em>Icon</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Icon</em>'.
-	 * @see org.eclipse.papyrus.newchild.Menu#getIcon()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.Menu#getIcon()
 	 * @see #getMenu()
 	 * @generated
 	 */
 	EAttribute getMenu_Icon();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.MenuAction <em>Menu Action</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuAction <em>Menu Action</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Menu Action</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuAction
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuAction
 	 * @generated
 	 */
 	EClass getMenuAction();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.newchild.MenuAction#getElementType <em>Element Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.emf.newchild.MenuAction#getElementType <em>Element Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Element Type</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuAction#getElementType()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuAction#getElementType()
 	 * @see #getMenuAction()
 	 * @generated
 	 */
 	EReference getMenuAction_ElementType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.Separator <em>Separator</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.Separator <em>Separator</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Separator</em>'.
-	 * @see org.eclipse.papyrus.newchild.Separator
+	 * @see org.eclipse.papyrus.infra.emf.newchild.Separator
 	 * @generated
 	 */
 	EClass getSeparator();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.MenuGroup <em>Menu Group</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup <em>Menu Group</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Menu Group</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuGroup
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuGroup
 	 * @generated
 	 */
 	EClass getMenuGroup();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.MenuGroup#getBefore <em>Before</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getBefore <em>Before</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Before</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuGroup#getBefore()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getBefore()
 	 * @see #getMenuGroup()
 	 * @generated
 	 */
 	EAttribute getMenuGroup_Before();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.MenuGroup#getAfter <em>After</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAfter <em>After</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>After</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuGroup#getAfter()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAfter()
 	 * @see #getMenuGroup()
 	 * @generated
 	 */
 	EAttribute getMenuGroup_After();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAbsolutePosition <em>Absolute Position</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Absolute Position</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuGroup#getAbsolutePosition()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuGroup#getAbsolutePosition()
 	 * @see #getMenuGroup()
 	 * @generated
 	 */
 	EAttribute getMenuGroup_AbsolutePosition();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.CustomFiller <em>Custom Filler</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.CustomFiller <em>Custom Filler</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Custom Filler</em>'.
-	 * @see org.eclipse.papyrus.newchild.CustomFiller
+	 * @see org.eclipse.papyrus.infra.emf.newchild.CustomFiller
 	 * @generated
 	 */
 	EClass getCustomFiller();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.CustomFiller#getClassName <em>Class Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.CustomFiller#getClassName <em>Class Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Class Name</em>'.
-	 * @see org.eclipse.papyrus.newchild.CustomFiller#getClassName()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.CustomFiller#getClassName()
 	 * @see #getCustomFiller()
 	 * @generated
 	 */
 	EAttribute getCustomFiller_ClassName();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.newchild.MenuPosition <em>Menu Position</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.emf.newchild.MenuPosition <em>Menu Position</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>Menu Position</em>'.
-	 * @see org.eclipse.papyrus.newchild.MenuPosition
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuPosition
 	 * @generated
 	 */
 	EEnum getMenuPosition();
@@ -726,11 +726,11 @@ public interface NewchildPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl <em>Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl <em>Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl
-		 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getNewchildConfiguration()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getNewchildConfiguration()
 		 * @generated
 		 */
 		EClass NEWCHILD_CONFIGURATION = eINSTANCE.getNewchildConfiguration();
@@ -760,11 +760,11 @@ public interface NewchildPackage extends EPackage {
 		EReference NEWCHILD_CONFIGURATION__NEW_CHILD_POLICIES = eINSTANCE.getNewchildConfiguration_NewChildPolicies();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl <em>Menu Root</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl <em>Menu Root</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.impl.MenuRootImpl
-		 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuRoot()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuRoot()
 		 * @generated
 		 */
 		EClass MENU_ROOT = eINSTANCE.getMenuRoot();
@@ -786,11 +786,11 @@ public interface NewchildPackage extends EPackage {
 		EAttribute MENU_ROOT__NAME = eINSTANCE.getMenuRoot_Name();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuItemImpl <em>Menu Item</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuItemImpl <em>Menu Item</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.impl.MenuItemImpl
-		 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuItem()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuItemImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuItem()
 		 * @generated
 		 */
 		EClass MENU_ITEM = eINSTANCE.getMenuItem();
@@ -804,11 +804,11 @@ public interface NewchildPackage extends EPackage {
 		EAttribute MENU_ITEM__ID = eINSTANCE.getMenuItem_Id();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuContainerImpl <em>Menu Container</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuContainerImpl <em>Menu Container</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.impl.MenuContainerImpl
-		 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuContainer()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuContainerImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuContainer()
 		 * @generated
 		 */
 		EClass MENU_CONTAINER = eINSTANCE.getMenuContainer();
@@ -822,11 +822,11 @@ public interface NewchildPackage extends EPackage {
 		EReference MENU_CONTAINER__SUBMENUS = eINSTANCE.getMenuContainer_Submenus();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuImpl <em>Menu</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl <em>Menu</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.impl.MenuImpl
-		 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenu()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenu()
 		 * @generated
 		 */
 		EClass MENU = eINSTANCE.getMenu();
@@ -848,11 +848,11 @@ public interface NewchildPackage extends EPackage {
 		EAttribute MENU__ICON = eINSTANCE.getMenu_Icon();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuActionImpl <em>Menu Action</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuActionImpl <em>Menu Action</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.impl.MenuActionImpl
-		 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuAction()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuActionImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuAction()
 		 * @generated
 		 */
 		EClass MENU_ACTION = eINSTANCE.getMenuAction();
@@ -866,21 +866,21 @@ public interface NewchildPackage extends EPackage {
 		EReference MENU_ACTION__ELEMENT_TYPE = eINSTANCE.getMenuAction_ElementType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.SeparatorImpl <em>Separator</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.SeparatorImpl <em>Separator</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.impl.SeparatorImpl
-		 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getSeparator()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.SeparatorImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getSeparator()
 		 * @generated
 		 */
 		EClass SEPARATOR = eINSTANCE.getSeparator();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.MenuGroupImpl <em>Menu Group</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl <em>Menu Group</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.impl.MenuGroupImpl
-		 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuGroup()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuGroup()
 		 * @generated
 		 */
 		EClass MENU_GROUP = eINSTANCE.getMenuGroup();
@@ -910,11 +910,11 @@ public interface NewchildPackage extends EPackage {
 		EAttribute MENU_GROUP__ABSOLUTE_POSITION = eINSTANCE.getMenuGroup_AbsolutePosition();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.impl.CustomFillerImpl <em>Custom Filler</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.impl.CustomFillerImpl <em>Custom Filler</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.impl.CustomFillerImpl
-		 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getCustomFiller()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.CustomFillerImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getCustomFiller()
 		 * @generated
 		 */
 		EClass CUSTOM_FILLER = eINSTANCE.getCustomFiller();
@@ -928,11 +928,11 @@ public interface NewchildPackage extends EPackage {
 		EAttribute CUSTOM_FILLER__CLASS_NAME = eINSTANCE.getCustomFiller_ClassName();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.MenuPosition <em>Menu Position</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.MenuPosition <em>Menu Position</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.MenuPosition
-		 * @see org.eclipse.papyrus.newchild.impl.NewchildPackageImpl#getMenuPosition()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.MenuPosition
+		 * @see org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl#getMenuPosition()
 		 * @generated
 		 */
 		EEnum MENU_POSITION = eINSTANCE.getMenuPosition();
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/Separator.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/Separator.java
index 16daf1a5c7c..3f47ddf1dcb 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/Separator.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/Separator.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild;
+package org.eclipse.papyrus.infra.emf.newchild;
 
 
 /**
@@ -13,7 +13,7 @@ package org.eclipse.papyrus.newchild;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.newchild.NewchildPackage#getSeparator()
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#getSeparator()
  * @model
  * @generated
  */
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/CustomFillerImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/CustomFillerImpl.java
index 3c4775aca7c..8cfc28c13e9 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/CustomFillerImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/CustomFillerImpl.java
@@ -4,16 +4,13 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.newchild.CustomFiller;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -22,7 +19,7 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.CustomFillerImpl#getClassName <em>Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.CustomFillerImpl#getClassName <em>Class Name</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuActionImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuActionImpl.java
index e28f082fa17..a203aee2996 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuActionImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuActionImpl.java
@@ -4,19 +4,16 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
 import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
 
-import org.eclipse.papyrus.newchild.MenuAction;
-import org.eclipse.papyrus.newchild.NewchildPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,7 +22,7 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuActionImpl#getElementType <em>Element Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuActionImpl#getElementType <em>Element Type</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuContainerImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuContainerImpl.java
index f522b62dd9f..16d5011d66f 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuContainerImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuContainerImpl.java
@@ -4,25 +4,20 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
 
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.newchild.MenuContainer;
-import org.eclipse.papyrus.newchild.MenuItem;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,7 +26,7 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuContainerImpl#getSubmenus <em>Submenus</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuContainerImpl#getSubmenus <em>Submenus</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuGroupImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuGroupImpl.java
index 20d852ca530..56e2846492b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuGroupImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuGroupImpl.java
@@ -4,17 +4,14 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.newchild.MenuGroup;
-import org.eclipse.papyrus.newchild.MenuPosition;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuPosition;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -23,9 +20,9 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuGroupImpl#getBefore <em>Before</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuGroupImpl#getAfter <em>After</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuGroupImpl#getAbsolutePosition <em>Absolute Position</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl#getBefore <em>Before</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl#getAfter <em>After</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuGroupImpl#getAbsolutePosition <em>Absolute Position</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuImpl.java
index e72d1ef268d..c92ceb2e4d7 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuImpl.java
@@ -4,17 +4,14 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.MenuItem;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -23,9 +20,9 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuImpl#getIcon <em>Icon</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl#getIcon <em>Icon</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuItemImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuItemImpl.java
index 4294c6dfe47..c081acce712 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuItemImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuItemImpl.java
@@ -4,17 +4,14 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.papyrus.newchild.MenuItem;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -23,7 +20,7 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuItemImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuItemImpl#getId <em>Id</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuRootImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuRootImpl.java
index 7f299ab723f..753baf9d44b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuRootImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/MenuRootImpl.java
@@ -4,31 +4,25 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
 
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.newchild.MenuGroup;
-import org.eclipse.papyrus.newchild.MenuRoot;
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,10 +31,10 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl#getConstraints <em>Constraints</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl#getGroups <em>Groups</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.MenuRootImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl#getConstraints <em>Constraints</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl#getGroups <em>Groups</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.MenuRootImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildConfigurationImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildConfigurationImpl.java
index 8caa4e04d7e..bbe4f39a59e 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildConfigurationImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildConfigurationImpl.java
@@ -4,29 +4,24 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
 
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
 
-import org.eclipse.papyrus.newchild.MenuRoot;
-import org.eclipse.papyrus.newchild.NewchildConfiguration;
-import org.eclipse.papyrus.newchild.NewchildPackage;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,9 +30,9 @@ import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl#getRoots <em>Roots</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.impl.NewchildConfigurationImpl#getNewChildPolicies <em>New Child Policies</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl#getRoots <em>Roots</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.impl.NewchildConfigurationImpl#getNewChildPolicies <em>New Child Policies</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildFactoryImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildFactoryImpl.java
index 91aae0ae785..d2b1f8f6aae 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildFactoryImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildFactoryImpl.java
@@ -4,18 +4,24 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.newchild.*;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuPosition;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildFactory;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildPackageImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildPackageImpl.java
index 461160ca1e8..0591570a678 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildPackageImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/NewchildPackageImpl.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -12,29 +12,27 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.MenuPosition;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildFactory;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl;
 import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.uml2.types.TypesPackage;
 
-import org.eclipse.papyrus.newchild.CustomFiller;
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.MenuAction;
-import org.eclipse.papyrus.newchild.MenuContainer;
-import org.eclipse.papyrus.newchild.MenuGroup;
-import org.eclipse.papyrus.newchild.MenuItem;
-import org.eclipse.papyrus.newchild.MenuPosition;
-import org.eclipse.papyrus.newchild.MenuRoot;
-import org.eclipse.papyrus.newchild.NewchildConfiguration;
-import org.eclipse.papyrus.newchild.NewchildFactory;
-import org.eclipse.papyrus.newchild.NewchildPackage;
-import org.eclipse.papyrus.newchild.Separator;
 
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
 
-import org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -124,7 +122,7 @@ public class NewchildPackageImpl extends EPackageImpl implements NewchildPackage
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.newchild.NewchildPackage#eNS_URI
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
@@ -162,6 +160,7 @@ public class NewchildPackageImpl extends EPackageImpl implements NewchildPackage
 		// Initialize simple dependencies
 		ConstraintsPackage.eINSTANCE.eClass();
 		ExtendedtypesPackage.eINSTANCE.eClass();
+		TypesPackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
 		NcpolicyPackageImpl theNcpolicyPackage = (NcpolicyPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NcpolicyPackage.eNS_URI) instanceof NcpolicyPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NcpolicyPackage.eNS_URI) : NcpolicyPackage.eINSTANCE);
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/SeparatorImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/SeparatorImpl.java
index 693a84e7c40..12294f1c70c 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/SeparatorImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/impl/SeparatorImpl.java
@@ -4,12 +4,11 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.impl;
+package org.eclipse.papyrus.infra.emf.newchild.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.papyrus.newchild.NewchildPackage;
-import org.eclipse.papyrus.newchild.Separator;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/CreateIn.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/CreateIn.java
index 95f62108c08..068fc321c7f 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/CreateIn.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/CreateIn.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Create In</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getCreateIn()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getCreateIn()
  * @model
  * @generated
  */
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/CustomPolicy.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/CustomPolicy.java
index d9a46103725..dbdfef7b920 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/CustomPolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/CustomPolicy.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
 
 
 /**
@@ -15,11 +15,11 @@ package org.eclipse.papyrus.newchild.ncpolicy;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getCustomPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getCustomPolicy()
  * @model
  * @generated
  */
@@ -34,14 +34,14 @@ public interface CustomPolicy extends NewChildPolicy {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Class Name</em>' attribute.
 	 * @see #setClassName(String)
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getCustomPolicy_ClassName()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getCustomPolicy_ClassName()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getClassName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Class Name</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/FilterPolicy.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/FilterPolicy.java
index ef7aafd01ba..bf83eed76cd 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/FilterPolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/FilterPolicy.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
 
 
 /**
@@ -13,7 +13,7 @@ package org.eclipse.papyrus.newchild.ncpolicy;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getFilterPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getFilterPolicy()
  * @model
  * @generated
  */
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/Layout.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/Layout.java
index 95047a2e170..ae9c186bd9f 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/Layout.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/Layout.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Layout</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getLayout()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getLayout()
  * @model
  * @generated
  */
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NcpolicyFactory.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NcpolicyFactory.java
index 7f341ca2520..5933299c750 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NcpolicyFactory.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NcpolicyFactory.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage
  * @generated
  */
 public interface NcpolicyFactory extends EFactory {
@@ -23,7 +23,7 @@ public interface NcpolicyFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	NcpolicyFactory eINSTANCE = org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyFactoryImpl.init();
+	NcpolicyFactory eINSTANCE = org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>New EMF Child Menu</em>'.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NcpolicyPackage.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NcpolicyPackage.java
index c40dd4be65c..27aac1d1b5c 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NcpolicyPackage.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NcpolicyPackage.java
@@ -4,17 +4,15 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,7 +25,7 @@ import org.eclipse.papyrus.newchild.NewchildPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyFactory
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyFactory
  * @model kind="package"
  * @generated
  */
@@ -62,14 +60,14 @@ public interface NcpolicyPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	NcpolicyPackage eINSTANCE = org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl.init();
+	NcpolicyPackage eINSTANCE = org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl <em>New EMF Child Menu</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl <em>New EMF Child Menu</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewEMFChildMenu()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewEMFChildMenu()
 	 * @generated
 	 */
 	int NEW_EMF_CHILD_MENU = 0;
@@ -147,11 +145,11 @@ public interface NcpolicyPackage extends EPackage {
 	int NEW_EMF_CHILD_MENU_FEATURE_COUNT = NewchildPackage.MENU_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl <em>New Child Policy Set</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl <em>New Child Policy Set</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicySet()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicySet()
 	 * @generated
 	 */
 	int NEW_CHILD_POLICY_SET = 1;
@@ -202,11 +200,11 @@ public interface NcpolicyPackage extends EPackage {
 	int NEW_CHILD_POLICY_SET_FEATURE_COUNT = ConstraintsPackage.DISPLAY_UNIT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl <em>New Child Policy</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl <em>New Child Policy</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicy()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicy()
 	 * @generated
 	 */
 	int NEW_CHILD_POLICY = 2;
@@ -248,11 +246,11 @@ public interface NcpolicyPackage extends EPackage {
 	int NEW_CHILD_POLICY_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.FilterPolicyImpl <em>Filter Policy</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.FilterPolicyImpl <em>Filter Policy</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.FilterPolicyImpl
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getFilterPolicy()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.FilterPolicyImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getFilterPolicy()
 	 * @generated
 	 */
 	int FILTER_POLICY = 3;
@@ -294,11 +292,11 @@ public interface NcpolicyPackage extends EPackage {
 	int FILTER_POLICY_FEATURE_COUNT = NEW_CHILD_POLICY_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.ReplacePolicyImpl <em>Replace Policy</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.ReplacePolicyImpl <em>Replace Policy</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.ReplacePolicyImpl
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getReplacePolicy()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.ReplacePolicyImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getReplacePolicy()
 	 * @generated
 	 */
 	int REPLACE_POLICY = 4;
@@ -349,11 +347,11 @@ public interface NcpolicyPackage extends EPackage {
 	int REPLACE_POLICY_FEATURE_COUNT = NEW_CHILD_POLICY_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.CustomPolicyImpl <em>Custom Policy</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.CustomPolicyImpl <em>Custom Policy</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.CustomPolicyImpl
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCustomPolicy()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.CustomPolicyImpl
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCustomPolicy()
 	 * @generated
 	 */
 	int CUSTOM_POLICY = 5;
@@ -404,212 +402,212 @@ public interface NcpolicyPackage extends EPackage {
 	int CUSTOM_POLICY_FEATURE_COUNT = NEW_CHILD_POLICY_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.CreateIn <em>Create In</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn <em>Create In</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.CreateIn
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCreateIn()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCreateIn()
 	 * @generated
 	 */
 	int CREATE_IN = 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.newchild.ncpolicy.Layout <em>Layout</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout <em>Layout</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.Layout
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getLayout()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getLayout()
 	 * @generated
 	 */
 	int LAYOUT = 7;
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu <em>New EMF Child Menu</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu <em>New EMF Child Menu</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>New EMF Child Menu</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu
 	 * @generated
 	 */
 	EClass getNewEMFChildMenu();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Create In</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getCreateIn()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getCreateIn()
 	 * @see #getNewEMFChildMenu()
 	 * @generated
 	 */
 	EAttribute getNewEMFChildMenu_CreateIn();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Layout</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getLayout()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getLayout()
 	 * @see #getNewEMFChildMenu()
 	 * @generated
 	 */
 	EAttribute getNewEMFChildMenu_Layout();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getGroups <em>Groups</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getGroups <em>Groups</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Groups</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getGroups()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getGroups()
 	 * @see #getNewEMFChildMenu()
 	 * @generated
 	 */
 	EReference getNewEMFChildMenu_Groups();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet <em>New Child Policy Set</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet <em>New Child Policy Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>New Child Policy Set</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet
 	 * @generated
 	 */
 	EClass getNewChildPolicySet();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getName()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getName()
 	 * @see #getNewChildPolicySet()
 	 * @generated
 	 */
 	EAttribute getNewChildPolicySet_Name();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getPolicies <em>Policies</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getPolicies <em>Policies</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Policies</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getPolicies()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getPolicies()
 	 * @see #getNewChildPolicySet()
 	 * @generated
 	 */
 	EReference getNewChildPolicySet_Policies();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy <em>New Child Policy</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy <em>New Child Policy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>New Child Policy</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy
 	 * @generated
 	 */
 	EClass getNewChildPolicy();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getRoles <em>Roles</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getRoles <em>Roles</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Roles</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getRoles()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getRoles()
 	 * @see #getNewChildPolicy()
 	 * @generated
 	 */
 	EAttribute getNewChildPolicy_Roles();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getEClasses <em>EClasses</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getEClasses <em>EClasses</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>EClasses</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getEClasses()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getEClasses()
 	 * @see #getNewChildPolicy()
 	 * @generated
 	 */
 	EReference getNewChildPolicy_EClasses();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getName()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getName()
 	 * @see #getNewChildPolicy()
 	 * @generated
 	 */
 	EAttribute getNewChildPolicy_Name();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy <em>Filter Policy</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy <em>Filter Policy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Filter Policy</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy
 	 * @generated
 	 */
 	EClass getFilterPolicy();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy <em>Replace Policy</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy <em>Replace Policy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Replace Policy</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy
 	 * @generated
 	 */
 	EClass getReplacePolicy();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy#getReplaceWith <em>Replace With</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy#getReplaceWith <em>Replace With</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Replace With</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy#getReplaceWith()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy#getReplaceWith()
 	 * @see #getReplacePolicy()
 	 * @generated
 	 */
 	EReference getReplacePolicy_ReplaceWith();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy <em>Custom Policy</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy <em>Custom Policy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Custom Policy</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy
 	 * @generated
 	 */
 	EClass getCustomPolicy();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy#getClassName <em>Class Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Class Name</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy#getClassName()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy#getClassName()
 	 * @see #getCustomPolicy()
 	 * @generated
 	 */
 	EAttribute getCustomPolicy_ClassName();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.newchild.ncpolicy.CreateIn <em>Create In</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn <em>Create In</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>Create In</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.CreateIn
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn
 	 * @generated
 	 */
 	EEnum getCreateIn();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.newchild.ncpolicy.Layout <em>Layout</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout <em>Layout</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>Layout</em>'.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.Layout
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout
 	 * @generated
 	 */
 	EEnum getLayout();
@@ -637,11 +635,11 @@ public interface NcpolicyPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl <em>New EMF Child Menu</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl <em>New EMF Child Menu</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewEMFChildMenu()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewEMFChildMenu()
 		 * @generated
 		 */
 		EClass NEW_EMF_CHILD_MENU = eINSTANCE.getNewEMFChildMenu();
@@ -671,11 +669,11 @@ public interface NcpolicyPackage extends EPackage {
 		EReference NEW_EMF_CHILD_MENU__GROUPS = eINSTANCE.getNewEMFChildMenu_Groups();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl <em>New Child Policy Set</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl <em>New Child Policy Set</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicySet()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicySet()
 		 * @generated
 		 */
 		EClass NEW_CHILD_POLICY_SET = eINSTANCE.getNewChildPolicySet();
@@ -697,11 +695,11 @@ public interface NcpolicyPackage extends EPackage {
 		EReference NEW_CHILD_POLICY_SET__POLICIES = eINSTANCE.getNewChildPolicySet_Policies();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl <em>New Child Policy</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl <em>New Child Policy</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicy()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getNewChildPolicy()
 		 * @generated
 		 */
 		EClass NEW_CHILD_POLICY = eINSTANCE.getNewChildPolicy();
@@ -731,21 +729,21 @@ public interface NcpolicyPackage extends EPackage {
 		EAttribute NEW_CHILD_POLICY__NAME = eINSTANCE.getNewChildPolicy_Name();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.FilterPolicyImpl <em>Filter Policy</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.FilterPolicyImpl <em>Filter Policy</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.FilterPolicyImpl
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getFilterPolicy()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.FilterPolicyImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getFilterPolicy()
 		 * @generated
 		 */
 		EClass FILTER_POLICY = eINSTANCE.getFilterPolicy();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.ReplacePolicyImpl <em>Replace Policy</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.ReplacePolicyImpl <em>Replace Policy</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.ReplacePolicyImpl
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getReplacePolicy()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.ReplacePolicyImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getReplacePolicy()
 		 * @generated
 		 */
 		EClass REPLACE_POLICY = eINSTANCE.getReplacePolicy();
@@ -759,11 +757,11 @@ public interface NcpolicyPackage extends EPackage {
 		EReference REPLACE_POLICY__REPLACE_WITH = eINSTANCE.getReplacePolicy_ReplaceWith();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.impl.CustomPolicyImpl <em>Custom Policy</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.CustomPolicyImpl <em>Custom Policy</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.CustomPolicyImpl
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCustomPolicy()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.CustomPolicyImpl
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCustomPolicy()
 		 * @generated
 		 */
 		EClass CUSTOM_POLICY = eINSTANCE.getCustomPolicy();
@@ -777,21 +775,21 @@ public interface NcpolicyPackage extends EPackage {
 		EAttribute CUSTOM_POLICY__CLASS_NAME = eINSTANCE.getCustomPolicy_ClassName();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.CreateIn <em>Create In</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn <em>Create In</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.CreateIn
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCreateIn()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getCreateIn()
 		 * @generated
 		 */
 		EEnum CREATE_IN = eINSTANCE.getCreateIn();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.newchild.ncpolicy.Layout <em>Layout</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout <em>Layout</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.Layout
-		 * @see org.eclipse.papyrus.newchild.ncpolicy.impl.NcpolicyPackageImpl#getLayout()
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout
+		 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NcpolicyPackageImpl#getLayout()
 		 * @generated
 		 */
 		EEnum LAYOUT = eINSTANCE.getLayout();
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewChildPolicy.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewChildPolicy.java
index 401ae8f20b1..d0e05d53d7d 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewChildPolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewChildPolicy.java
@@ -4,10 +4,9 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
@@ -19,13 +18,13 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getRoles <em>Roles</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getEClasses <em>EClasses</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getRoles <em>Roles</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getEClasses <em>EClasses</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy()
  * @model abstract="true"
  * @generated
  */
@@ -40,7 +39,7 @@ public interface NewChildPolicy extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Roles</em>' attribute list.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_Roles()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_Roles()
 	 * @model
 	 * @generated
 	 */
@@ -56,7 +55,7 @@ public interface NewChildPolicy extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>EClasses</em>' reference list.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_EClasses()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_EClasses()
 	 * @model
 	 * @generated
 	 */
@@ -72,14 +71,14 @@ public interface NewChildPolicy extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_Name()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicy_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewChildPolicySet.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewChildPolicySet.java
index 45240617ace..eecb160d1c8 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewChildPolicySet.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewChildPolicySet.java
@@ -4,11 +4,10 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.papyrus.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
 
 /**
  * <!-- begin-user-doc -->
@@ -18,12 +17,12 @@ import org.eclipse.papyrus.constraints.DisplayUnit;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getPolicies <em>Policies</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getPolicies <em>Policies</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet()
  * @model
  * @generated
  */
@@ -38,14 +37,14 @@ public interface NewChildPolicySet extends DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet_Name()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -56,7 +55,7 @@ public interface NewChildPolicySet extends DisplayUnit {
 
 	/**
 	 * Returns the value of the '<em><b>Policies</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Policies</em>' containment reference list isn't clear,
@@ -64,7 +63,7 @@ public interface NewChildPolicySet extends DisplayUnit {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Policies</em>' containment reference list.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet_Policies()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewChildPolicySet_Policies()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewEMFChildMenu.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewEMFChildMenu.java
index 22ec5d470ae..e7b4a5504a8 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewEMFChildMenu.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/NewEMFChildMenu.java
@@ -4,12 +4,11 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
 
 /**
  * <!-- begin-user-doc -->
@@ -19,13 +18,13 @@ import org.eclipse.papyrus.newchild.MenuGroup;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getGroups <em>Groups</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getGroups <em>Groups</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu()
  * @model
  * @generated
  */
@@ -33,7 +32,7 @@ public interface NewEMFChildMenu extends Menu {
 	/**
 	 * Returns the value of the '<em><b>Create In</b></em>' attribute.
 	 * The default value is <code>"self"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.newchild.ncpolicy.CreateIn}.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Create In</em>' attribute isn't clear,
@@ -41,20 +40,20 @@ public interface NewEMFChildMenu extends Menu {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Create In</em>' attribute.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.CreateIn
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn
 	 * @see #setCreateIn(CreateIn)
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_CreateIn()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_CreateIn()
 	 * @model default="self" required="true"
 	 * @generated
 	 */
 	CreateIn getCreateIn();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getCreateIn <em>Create In</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Create In</em>' attribute.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.CreateIn
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn
 	 * @see #getCreateIn()
 	 * @generated
 	 */
@@ -63,7 +62,7 @@ public interface NewEMFChildMenu extends Menu {
 	/**
 	 * Returns the value of the '<em><b>Layout</b></em>' attribute.
 	 * The default value is <code>"hierarchical"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.newchild.ncpolicy.Layout}.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Layout</em>' attribute isn't clear,
@@ -71,20 +70,20 @@ public interface NewEMFChildMenu extends Menu {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Layout</em>' attribute.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.Layout
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout
 	 * @see #setLayout(Layout)
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_Layout()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_Layout()
 	 * @model default="hierarchical" required="true"
 	 * @generated
 	 */
 	Layout getLayout();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu#getLayout <em>Layout</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Layout</em>' attribute.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.Layout
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout
 	 * @see #getLayout()
 	 * @generated
 	 */
@@ -92,7 +91,7 @@ public interface NewEMFChildMenu extends Menu {
 
 	/**
 	 * Returns the value of the '<em><b>Groups</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.newchild.MenuGroup}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Groups</em>' containment reference list isn't clear,
@@ -100,7 +99,7 @@ public interface NewEMFChildMenu extends Menu {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Groups</em>' containment reference list.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_Groups()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getNewEMFChildMenu_Groups()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/ReplacePolicy.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/ReplacePolicy.java
index 43ac0abcc60..ea9538e28c4 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/ReplacePolicy.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/ReplacePolicy.java
@@ -4,11 +4,10 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.papyrus.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
 
 /**
  * <!-- begin-user-doc -->
@@ -18,18 +17,18 @@ import org.eclipse.papyrus.newchild.MenuItem;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy#getReplaceWith <em>Replace With</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy#getReplaceWith <em>Replace With</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getReplacePolicy()
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getReplacePolicy()
  * @model
  * @generated
  */
 public interface ReplacePolicy extends NewChildPolicy {
 	/**
 	 * Returns the value of the '<em><b>Replace With</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.newchild.MenuItem}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.newchild.MenuItem}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Replace With</em>' containment reference list isn't clear,
@@ -37,7 +36,7 @@ public interface ReplacePolicy extends NewChildPolicy {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Replace With</em>' containment reference list.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#getReplacePolicy_ReplaceWith()
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#getReplacePolicy_ReplaceWith()
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/CustomPolicyImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/CustomPolicyImpl.java
index 34a61858384..b70524e630a 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/CustomPolicyImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/CustomPolicyImpl.java
@@ -4,16 +4,13 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -22,7 +19,7 @@ import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.CustomPolicyImpl#getClassName <em>Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.CustomPolicyImpl#getClassName <em>Class Name</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/FilterPolicyImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/FilterPolicyImpl.java
index 166f7b17ab8..2136b5f1686 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/FilterPolicyImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/FilterPolicyImpl.java
@@ -4,12 +4,11 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyFactoryImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NcpolicyFactoryImpl.java
index 54b2f45fb35..b7e8055a3d3 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyFactoryImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NcpolicyFactoryImpl.java
@@ -4,18 +4,23 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.newchild.ncpolicy.*;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyFactory;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyPackageImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NcpolicyPackageImpl.java
index 85a6785777a..e00c254c567 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyPackageImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NcpolicyPackageImpl.java
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -12,27 +12,25 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.constraints.ConstraintsPackage;
-
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.impl.NewchildPackageImpl;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyFactory;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
 import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.uml2.types.TypesPackage;
 
-import org.eclipse.papyrus.newchild.NewchildPackage;
 
-import org.eclipse.papyrus.newchild.impl.NewchildPackageImpl;
 
-import org.eclipse.papyrus.newchild.ncpolicy.CreateIn;
-import org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.Layout;
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyFactory;
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
-import org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu;
-import org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy;
 
 /**
  * <!-- begin-user-doc -->
@@ -108,7 +106,7 @@ public class NcpolicyPackageImpl extends EPackageImpl implements NcpolicyPackage
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage#eNS_URI
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
@@ -146,6 +144,7 @@ public class NcpolicyPackageImpl extends EPackageImpl implements NcpolicyPackage
 		// Initialize simple dependencies
 		ConstraintsPackage.eINSTANCE.eClass();
 		ExtendedtypesPackage.eINSTANCE.eClass();
+		TypesPackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
 		NewchildPackageImpl theNewchildPackage = (NewchildPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NewchildPackage.eNS_URI) instanceof NewchildPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NewchildPackage.eNS_URI) : NewchildPackage.eINSTANCE);
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicyImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewChildPolicyImpl.java
index e279384f8ea..dc65f059a6b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicyImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewChildPolicyImpl.java
@@ -4,24 +4,19 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
 
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,9 +25,9 @@ import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl#getRoles <em>Roles</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl#getEClasses <em>EClasses</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicyImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl#getRoles <em>Roles</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl#getEClasses <em>EClasses</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicyImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicySetImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewChildPolicySetImpl.java
index dcbbc8a35f1..dbf527bad22 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicySetImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewChildPolicySetImpl.java
@@ -4,28 +4,22 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
 
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.constraints.impl.DisplayUnitImpl;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy;
-import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,8 +28,8 @@ import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewChildPolicySetImpl#getPolicies <em>Policies</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewChildPolicySetImpl#getPolicies <em>Policies</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java
index ebb4a8f2d2b..672a01fe405 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java
@@ -4,31 +4,26 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
 
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.impl.MenuImpl;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CreateIn;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.Layout;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
 
-import org.eclipse.papyrus.newchild.MenuGroup;
-
-import org.eclipse.papyrus.newchild.impl.MenuImpl;
 
-import org.eclipse.papyrus.newchild.ncpolicy.CreateIn;
-import org.eclipse.papyrus.newchild.ncpolicy.Layout;
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,9 +32,9 @@ import org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getCreateIn <em>Create In</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getLayout <em>Layout</em>}</li>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getGroups <em>Groups</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getCreateIn <em>Create In</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getLayout <em>Layout</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.NewEMFChildMenuImpl#getGroups <em>Groups</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/ReplacePolicyImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/ReplacePolicyImpl.java
index 3c7ad3c10bb..0ab5128c2ef 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/ReplacePolicyImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/impl/ReplacePolicyImpl.java
@@ -4,24 +4,20 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.impl;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl;
 
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
 
-import org.eclipse.papyrus.newchild.MenuItem;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,7 +26,7 @@ import org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.newchild.ncpolicy.impl.ReplacePolicyImpl#getReplaceWith <em>Replace With</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.impl.ReplacePolicyImpl#getReplaceWith <em>Replace With</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyAdapterFactory.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyAdapterFactory.java
index 653b5fb2264..566e5c685b7 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyAdapterFactory.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyAdapterFactory.java
@@ -4,29 +4,31 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.util;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
 
-import org.eclipse.papyrus.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.MenuContainer;
-import org.eclipse.papyrus.newchild.MenuItem;
-
-import org.eclipse.papyrus.newchild.ncpolicy.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage
  * @generated
  */
 public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
@@ -138,13 +140,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu <em>New EMF Child Menu</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu <em>New EMF Child Menu</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewEMFChildMenu
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu
 	 * @generated
 	 */
 	public Adapter createNewEMFChildMenuAdapter() {
@@ -152,13 +154,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet <em>New Child Policy Set</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet <em>New Child Policy Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet
 	 * @generated
 	 */
 	public Adapter createNewChildPolicySetAdapter() {
@@ -166,13 +168,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy <em>New Child Policy</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy <em>New Child Policy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicy
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy
 	 * @generated
 	 */
 	public Adapter createNewChildPolicyAdapter() {
@@ -180,13 +182,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy <em>Filter Policy</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy <em>Filter Policy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.FilterPolicy
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy
 	 * @generated
 	 */
 	public Adapter createFilterPolicyAdapter() {
@@ -194,13 +196,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy <em>Replace Policy</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy <em>Replace Policy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.ReplacePolicy
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy
 	 * @generated
 	 */
 	public Adapter createReplacePolicyAdapter() {
@@ -208,13 +210,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy <em>Custom Policy</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy <em>Custom Policy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.ncpolicy.CustomPolicy
+	 * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy
 	 * @generated
 	 */
 	public Adapter createCustomPolicyAdapter() {
@@ -222,13 +224,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuContainer <em>Menu Container</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuContainer <em>Menu Container</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.MenuContainer
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuContainer
 	 * @generated
 	 */
 	public Adapter createMenuContainerAdapter() {
@@ -236,13 +238,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuItem <em>Menu Item</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem <em>Menu Item</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.MenuItem
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuItem
 	 * @generated
 	 */
 	public Adapter createMenuItemAdapter() {
@@ -250,13 +252,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.Menu <em>Menu</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.Menu <em>Menu</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.Menu
+	 * @see org.eclipse.papyrus.infra.emf.newchild.Menu
 	 * @generated
 	 */
 	public Adapter createMenuAdapter() {
@@ -264,13 +266,13 @@ public class NcpolicyAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.DisplayUnit <em>Display Unit</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit <em>Display Unit</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.constraints.DisplayUnit
+	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit
 	 * @generated
 	 */
 	public Adapter createDisplayUnitAdapter() {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyResourceFactoryImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyResourceFactoryImpl.java
index 33689ef93bd..ad5257634ca 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyResourceFactoryImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyResourceFactoryImpl.java
@@ -4,21 +4,18 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.util;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
 import org.eclipse.emf.ecore.xmi.XMLResource;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.util.NcpolicyResourceImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util.NcpolicyResourceImpl
  * @generated
  */
 public class NcpolicyResourceFactoryImpl extends ResourceFactoryImpl {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyResourceImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyResourceImpl.java
index b619077ba63..f6bcb8238ea 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyResourceImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyResourceImpl.java
@@ -4,17 +4,16 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.util;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.util.NcpolicyResourceFactoryImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util.NcpolicyResourceFactoryImpl
  * @generated
  */
 public class NcpolicyResourceImpl extends XMLResourceImpl {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicySwitch.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicySwitch.java
index b515a5a57c7..8a19a516f82 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicySwitch.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicySwitch.java
@@ -4,20 +4,23 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.util;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.CustomPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.FilterPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicy;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewChildPolicySet;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NewEMFChildMenu;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.ReplacePolicy;
 
-import org.eclipse.papyrus.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.newchild.Menu;
-import org.eclipse.papyrus.newchild.MenuContainer;
-import org.eclipse.papyrus.newchild.MenuItem;
-
-import org.eclipse.papyrus.newchild.ncpolicy.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,7 +32,7 @@ import org.eclipse.papyrus.newchild.ncpolicy.*;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage
  * @generated
  */
 public class NcpolicySwitch<T> extends Switch<T> {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyXMLProcessor.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyXMLProcessor.java
index cb95b3a47a5..488e102bf5d 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/util/NcpolicyXMLProcessor.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/ncpolicy/util/NcpolicyXMLProcessor.java
@@ -4,17 +4,14 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.ncpolicy.util;
+package org.eclipse.papyrus.infra.emf.newchild.ncpolicy.util;
 
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.papyrus.newchild.ncpolicy.NcpolicyPackage;
+import org.eclipse.papyrus.infra.emf.newchild.ncpolicy.NcpolicyPackage;
 
 /**
  * This class contains helper methods to serialize and deserialize XML documents
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildAdapterFactory.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildAdapterFactory.java
index 00e57378784..eae764cdd91 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildAdapterFactory.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildAdapterFactory.java
@@ -4,25 +4,30 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.newchild.*;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.NewchildPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage
  * @generated
  */
 public class NewchildAdapterFactory extends AdapterFactoryImpl {
@@ -134,13 +139,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.NewchildConfiguration <em>Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.NewchildConfiguration
+	 * @see org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration
 	 * @generated
 	 */
 	public Adapter createNewchildConfigurationAdapter() {
@@ -148,13 +153,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuRoot <em>Menu Root</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuRoot <em>Menu Root</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.MenuRoot
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuRoot
 	 * @generated
 	 */
 	public Adapter createMenuRootAdapter() {
@@ -162,13 +167,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuItem <em>Menu Item</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuItem <em>Menu Item</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.MenuItem
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuItem
 	 * @generated
 	 */
 	public Adapter createMenuItemAdapter() {
@@ -176,13 +181,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuContainer <em>Menu Container</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuContainer <em>Menu Container</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.MenuContainer
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuContainer
 	 * @generated
 	 */
 	public Adapter createMenuContainerAdapter() {
@@ -190,13 +195,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.Menu <em>Menu</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.Menu <em>Menu</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.Menu
+	 * @see org.eclipse.papyrus.infra.emf.newchild.Menu
 	 * @generated
 	 */
 	public Adapter createMenuAdapter() {
@@ -204,13 +209,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuAction <em>Menu Action</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuAction <em>Menu Action</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.MenuAction
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuAction
 	 * @generated
 	 */
 	public Adapter createMenuActionAdapter() {
@@ -218,13 +223,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.Separator <em>Separator</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.Separator <em>Separator</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.Separator
+	 * @see org.eclipse.papyrus.infra.emf.newchild.Separator
 	 * @generated
 	 */
 	public Adapter createSeparatorAdapter() {
@@ -232,13 +237,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.MenuGroup <em>Menu Group</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.MenuGroup <em>Menu Group</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.MenuGroup
+	 * @see org.eclipse.papyrus.infra.emf.newchild.MenuGroup
 	 * @generated
 	 */
 	public Adapter createMenuGroupAdapter() {
@@ -246,13 +251,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.newchild.CustomFiller <em>Custom Filler</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.newchild.CustomFiller <em>Custom Filler</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.newchild.CustomFiller
+	 * @see org.eclipse.papyrus.infra.emf.newchild.CustomFiller
 	 * @generated
 	 */
 	public Adapter createCustomFillerAdapter() {
@@ -260,13 +265,13 @@ public class NewchildAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.constraints.DisplayUnit <em>Display Unit</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit <em>Display Unit</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.constraints.DisplayUnit
+	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit
 	 * @generated
 	 */
 	public Adapter createDisplayUnitAdapter() {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildResourceFactoryImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildResourceFactoryImpl.java
index 53d7b0b85bb..bf3f5cf5a12 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildResourceFactoryImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildResourceFactoryImpl.java
@@ -4,21 +4,18 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
 import org.eclipse.emf.ecore.xmi.XMLResource;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.util.NewchildResourceImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.util.NewchildResourceImpl
  * @generated
  */
 public class NewchildResourceFactoryImpl extends ResourceFactoryImpl {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildResourceImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildResourceImpl.java
index 483e317753c..87f4620d093 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildResourceImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildResourceImpl.java
@@ -4,17 +4,16 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.util.NewchildResourceFactoryImpl
+ * @see org.eclipse.papyrus.infra.emf.newchild.util.NewchildResourceFactoryImpl
  * @generated
  */
 public class NewchildResourceImpl extends XMLResourceImpl {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildSwitch.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildSwitch.java
index e451dbdb8a7..bb7f519d8b1 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildSwitch.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildSwitch.java
@@ -4,16 +4,22 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.newchild.*;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.emf.newchild.CustomFiller;
+import org.eclipse.papyrus.infra.emf.newchild.Menu;
+import org.eclipse.papyrus.infra.emf.newchild.MenuAction;
+import org.eclipse.papyrus.infra.emf.newchild.MenuContainer;
+import org.eclipse.papyrus.infra.emf.newchild.MenuGroup;
+import org.eclipse.papyrus.infra.emf.newchild.MenuItem;
+import org.eclipse.papyrus.infra.emf.newchild.MenuRoot;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildConfiguration;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.Separator;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,7 +31,7 @@ import org.eclipse.papyrus.newchild.*;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.newchild.NewchildPackage
+ * @see org.eclipse.papyrus.infra.emf.newchild.NewchildPackage
  * @generated
  */
 public class NewchildSwitch<T> extends Switch<T> {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildXMLProcessor.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildXMLProcessor.java
index 0979380ff58..aac8d02ecd8 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/util/NewchildXMLProcessor.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/infra/emf/newchild/util/NewchildXMLProcessor.java
@@ -4,17 +4,14 @@
  *
  * $Id$
  */
-package org.eclipse.papyrus.newchild.util;
+package org.eclipse.papyrus.infra.emf.newchild.util;
 
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.papyrus.newchild.NewchildPackage;
+import org.eclipse.papyrus.infra.emf.newchild.NewchildPackage;
 
 /**
  * This class contains helper methods to serialize and deserialize XML documents