diff --git a/build.xml b/build.xml
index 3863c7686457db52188ac17a909c17f089e6424f..21b2f2869915518589fb2867af94556871094ef7 100644
--- a/build.xml
+++ b/build.xml
@@ -66,7 +66,7 @@
       <fileset dir="classes" includes="**/*.class"/>
     </delete>
     <antcall target="compile"/>
-    <ant dir="plugins" target="compileall" />
+    <ant dir="plugins/neon" target="compileall" />
   </target>
 
   <!-- tested -->
@@ -159,7 +159,7 @@
        <!--exclude name="org/semanticweb/owl/**"/-->
      </packageset>
      <!-- This works but the classpath is not set correctly -->
-     <!--packageset dir="plugins/src" defaultexcludes="yes">
+     <!--packageset dir="plugins/neon/src" defaultexcludes="yes">
 	 <include name="fr/inrialpes/**"/>
      </packageset-->
      <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
@@ -189,7 +189,7 @@
     <antcall target="compileall"/>
     <antcall target="jar"/>
     <antcall target="javadoc"/>
-    <ant dir="plugins" target="jar">
+    <ant dir="plugins/neon" target="jar">
       <property name="version" value="${version}"/>
     </ant>
     <!-- may be useful to change directory -->
@@ -197,7 +197,7 @@
       <fileset dir=".">
 	<include name="**/*"/>
 	<exclude name="**/.svn"/>
-	<exclude name="plugins/lib"/>
+	<exclude name="plugins/neon/lib"/>
       </fileset>
     </zip>
   </target>
diff --git a/plugins/README.TXT b/plugins/neon/README.TXT
similarity index 100%
rename from plugins/README.TXT
rename to plugins/neon/README.TXT
diff --git a/plugins/build.xml b/plugins/neon/build.xml
similarity index 96%
rename from plugins/build.xml
rename to plugins/neon/build.xml
index f18060bd1be13bc6e936f6186415aca3d440fd33..faa02d1e659d30dc108b09eea7b4a71f3222a34c 100644
--- a/plugins/build.xml
+++ b/plugins/neon/build.xml
@@ -42,7 +42,7 @@
       <fileset dir="./lib">
 	<include name="*.jar"/>
       </fileset>
-      <fileset dir="../lib">
+      <fileset dir="../../lib">
 	<include name="align.jar"/>
 	<include name="procalign.jar"/>
       </fileset>
@@ -71,13 +71,13 @@
   <!-- tested -->
   <target name="jar" depends="compileall">
     <echo message="Jarchiving..."/>
-    <copy file="../distrib/LICENSE.TXT" tofile="neonalign/LICENSE.TXT" filtering="true"/>
+    <copy file="../../distrib/LICENSE.TXT" tofile="neonalign/LICENSE.TXT" filtering="true"/>
     <copy file="distrib/plugin.xml" tofile="neonalign/plugin.xml" filtering="true"/>
     <copy todir="neonalign/icons" filtering="false">
       <fileset dir="distrib" includes="*.gif"/>
     </copy>
     <copy todir="neonalign/lib">
-      <fileset dir="../lib">
+      <fileset dir="../../lib">
 	<include name="align.jar"/>
 	<include name="alignwn.jar"/>
 	<include name="api.jar"/>
diff --git a/plugins/distrib/MANIFEST.MF b/plugins/neon/distrib/MANIFEST.MF
similarity index 100%
rename from plugins/distrib/MANIFEST.MF
rename to plugins/neon/distrib/MANIFEST.MF
diff --git a/plugins/distrib/align.gif b/plugins/neon/distrib/align.gif
similarity index 100%
rename from plugins/distrib/align.gif
rename to plugins/neon/distrib/align.gif
diff --git a/plugins/distrib/plugin.xml b/plugins/neon/distrib/plugin.xml
similarity index 100%
rename from plugins/distrib/plugin.xml
rename to plugins/neon/distrib/plugin.xml
diff --git a/plugins/distrib/sample3.gif b/plugins/neon/distrib/sample3.gif
similarity index 100%
rename from plugins/distrib/sample3.gif
rename to plugins/neon/distrib/sample3.gif
diff --git a/plugins/lib/datamodelBase.jar b/plugins/neon/lib/datamodelBase.jar
similarity index 100%
rename from plugins/lib/datamodelBase.jar
rename to plugins/neon/lib/datamodelBase.jar
diff --git a/plugins/lib/ontostudio-datamodel.jar b/plugins/neon/lib/ontostudio-datamodel.jar
similarity index 100%
rename from plugins/lib/ontostudio-datamodel.jar
rename to plugins/neon/lib/ontostudio-datamodel.jar
diff --git a/plugins/lib/ontostudio-gui.jar b/plugins/neon/lib/ontostudio-gui.jar
similarity index 100%
rename from plugins/lib/ontostudio-gui.jar
rename to plugins/neon/lib/ontostudio-gui.jar
diff --git a/plugins/lib/ontostudio-io.jar b/plugins/neon/lib/ontostudio-io.jar
similarity index 100%
rename from plugins/lib/ontostudio-io.jar
rename to plugins/neon/lib/ontostudio-io.jar
diff --git a/plugins/lib/org.eclipse.core.commands_3.2.0.I20060605-1400.jar b/plugins/neon/lib/org.eclipse.core.commands_3.2.0.I20060605-1400.jar
similarity index 100%
rename from plugins/lib/org.eclipse.core.commands_3.2.0.I20060605-1400.jar
rename to plugins/neon/lib/org.eclipse.core.commands_3.2.0.I20060605-1400.jar
diff --git a/plugins/lib/org.eclipse.core.runtime_3.2.0.v20060603.jar b/plugins/neon/lib/org.eclipse.core.runtime_3.2.0.v20060603.jar
similarity index 100%
rename from plugins/lib/org.eclipse.core.runtime_3.2.0.v20060603.jar
rename to plugins/neon/lib/org.eclipse.core.runtime_3.2.0.v20060603.jar
diff --git a/plugins/lib/org.eclipse.equinox.common_3.2.0.v20060603.jar b/plugins/neon/lib/org.eclipse.equinox.common_3.2.0.v20060603.jar
similarity index 100%
rename from plugins/lib/org.eclipse.equinox.common_3.2.0.v20060603.jar
rename to plugins/neon/lib/org.eclipse.equinox.common_3.2.0.v20060603.jar
diff --git a/plugins/lib/org.eclipse.equinox.registry_3.2.1.R32x_v20060814.jar b/plugins/neon/lib/org.eclipse.equinox.registry_3.2.1.R32x_v20060814.jar
similarity index 100%
rename from plugins/lib/org.eclipse.equinox.registry_3.2.1.R32x_v20060814.jar
rename to plugins/neon/lib/org.eclipse.equinox.registry_3.2.1.R32x_v20060814.jar
diff --git a/plugins/lib/org.eclipse.jface_3.2.2.M20061214-1200.jar b/plugins/neon/lib/org.eclipse.jface_3.2.2.M20061214-1200.jar
similarity index 100%
rename from plugins/lib/org.eclipse.jface_3.2.2.M20061214-1200.jar
rename to plugins/neon/lib/org.eclipse.jface_3.2.2.M20061214-1200.jar
diff --git a/plugins/lib/org.eclipse.osgi_3.2.2.R32x_v20070118.jar b/plugins/neon/lib/org.eclipse.osgi_3.2.2.R32x_v20070118.jar
similarity index 100%
rename from plugins/lib/org.eclipse.osgi_3.2.2.R32x_v20070118.jar
rename to plugins/neon/lib/org.eclipse.osgi_3.2.2.R32x_v20070118.jar
diff --git a/plugins/lib/org.eclipse.swt.gtk.linux.x86_3.2.2.v3236.jar b/plugins/neon/lib/org.eclipse.swt.gtk.linux.x86_3.2.2.v3236.jar
similarity index 100%
rename from plugins/lib/org.eclipse.swt.gtk.linux.x86_3.2.2.v3236.jar
rename to plugins/neon/lib/org.eclipse.swt.gtk.linux.x86_3.2.2.v3236.jar
diff --git a/plugins/lib/org.eclipse.swt_3.2.2.v3236b.jar b/plugins/neon/lib/org.eclipse.swt_3.2.2.v3236b.jar
similarity index 100%
rename from plugins/lib/org.eclipse.swt_3.2.2.v3236b.jar
rename to plugins/neon/lib/org.eclipse.swt_3.2.2.v3236b.jar
diff --git a/plugins/lib/org.eclipse.ui.workbench_3.2.2.M20070119-0800.jar b/plugins/neon/lib/org.eclipse.ui.workbench_3.2.2.M20070119-0800.jar
similarity index 100%
rename from plugins/lib/org.eclipse.ui.workbench_3.2.2.M20070119-0800.jar
rename to plugins/neon/lib/org.eclipse.ui.workbench_3.2.2.M20070119-0800.jar
diff --git a/plugins/src/fr/inrialpes/exmo/align/plugin/neontk/AlignAction.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignAction.java
similarity index 100%
rename from plugins/src/fr/inrialpes/exmo/align/plugin/neontk/AlignAction.java
rename to plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignAction.java
diff --git a/plugins/src/fr/inrialpes/exmo/align/plugin/neontk/AlignmentPlugin.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignmentPlugin.java
similarity index 100%
rename from plugins/src/fr/inrialpes/exmo/align/plugin/neontk/AlignmentPlugin.java
rename to plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignmentPlugin.java
diff --git a/plugins/src/fr/inrialpes/exmo/align/plugin/neontk/NavigationView.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/NavigationView.java
similarity index 100%
rename from plugins/src/fr/inrialpes/exmo/align/plugin/neontk/NavigationView.java
rename to plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/NavigationView.java
diff --git a/plugins/src/fr/inrialpes/exmo/align/plugin/neontk/OfflineAlign.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OfflineAlign.java
similarity index 100%
rename from plugins/src/fr/inrialpes/exmo/align/plugin/neontk/OfflineAlign.java
rename to plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OfflineAlign.java
diff --git a/plugins/src/fr/inrialpes/exmo/align/plugin/neontk/OnlineAlign.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OnlineAlign.java
similarity index 100%
rename from plugins/src/fr/inrialpes/exmo/align/plugin/neontk/OnlineAlign.java
rename to plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OnlineAlign.java
diff --git a/plugins/src/fr/inrialpes/exmo/align/plugin/neontk/SWTInterface.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/SWTInterface.java
similarity index 100%
rename from plugins/src/fr/inrialpes/exmo/align/plugin/neontk/SWTInterface.java
rename to plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/SWTInterface.java
diff --git a/plugins/src/fr/inrialpes/exmo/align/plugin/neontk/View.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/View.java
similarity index 100%
rename from plugins/src/fr/inrialpes/exmo/align/plugin/neontk/View.java
rename to plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/View.java