diff --git a/pom.xml b/pom.xml
index 9ec9cd2..457674d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,9 +29,9 @@
 	<module>vasc-ejb3</module>
 	<module>vasc-xpql</module>
 	<module>vasc-xpql-ejb3</module>
-	<module>vasc-backends</module>
-	<module>vasc-frontends</module>
-	<module>vasc-demos</module>
+	<module>vasc-backend</module>
+	<module>vasc-frontend</module>
+	<module>vasc-demo</module>
 </modules>
 <properties>
 	<hg.repo.url>https://...vasc/</hg.repo.url>
diff --git a/vasc-backends/.classpath b/vasc-backend/.classpath
similarity index 100%
rename from vasc-backends/.classpath
rename to vasc-backend/.classpath
diff --git a/vasc-backends/.project b/vasc-backend/.project
similarity index 100%
rename from vasc-backends/.project
rename to vasc-backend/.project
diff --git a/vasc-backends/.settings/org.eclipse.core.resources.prefs b/vasc-backend/.settings/org.eclipse.core.resources.prefs
similarity index 86%
rename from vasc-backends/.settings/org.eclipse.core.resources.prefs
rename to vasc-backend/.settings/org.eclipse.core.resources.prefs
index 780c6fb..26f6df6 100644
--- a/vasc-backends/.settings/org.eclipse.core.resources.prefs
+++ b/vasc-backend/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Sat Dec 31 00:09:30 CET 2011
+#Sat Dec 31 00:40:49 CET 2011
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
diff --git a/vasc-backends/.settings/org.eclipse.jdt.core.prefs b/vasc-backend/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-backends/.settings/org.eclipse.jdt.core.prefs
rename to vasc-backend/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-backends/.settings/org.eclipse.m2e.core.prefs b/vasc-backend/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-backends/.settings/org.eclipse.m2e.core.prefs
rename to vasc-backend/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-backends/pom.xml b/vasc-backend/pom.xml
similarity index 81%
rename from vasc-backends/pom.xml
rename to vasc-backend/pom.xml
index c266dc9..8cde017 100644
--- a/vasc-backends/pom.xml
+++ b/vasc-backend/pom.xml
@@ -5,10 +5,10 @@
     <groupId>net.forwardfire.vasc</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
-  <artifactId>vasc-backends</artifactId>
+  <artifactId>vasc-backend</artifactId>
   <packaging>pom</packaging>
-  <name>vasc-backends</name>
-  <description>vasc-backends</description>
+  <name>vasc-backend</name>
+  <description>vasc-backend</description>
   <modules>
 	<module>vasc-backend-jpa</module>
 	<module>vasc-backend-ldap</module>
diff --git a/vasc-backends/vasc-backend-jpa/.classpath b/vasc-backend/vasc-backend-jpa/.classpath
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/.classpath
rename to vasc-backend/vasc-backend-jpa/.classpath
diff --git a/vasc-backends/vasc-backend-jpa/.project b/vasc-backend/vasc-backend-jpa/.project
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/.project
rename to vasc-backend/vasc-backend-jpa/.project
diff --git a/vasc-backends/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs b/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs
similarity index 86%
rename from vasc-backends/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs
rename to vasc-backend/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs
index 6d54e61..26f6df6 100644
--- a/vasc-backends/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs
+++ b/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Sun Dec 25 17:29:07 CET 2011
+#Sat Dec 31 00:40:49 CET 2011
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
diff --git a/vasc-backends/vasc-backend-jpa/.settings/org.eclipse.jdt.core.prefs b/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/.settings/org.eclipse.jdt.core.prefs
rename to vasc-backend/vasc-backend-jpa/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-backends/vasc-backend-jpa/.settings/org.eclipse.m2e.core.prefs b/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/.settings/org.eclipse.m2e.core.prefs
rename to vasc-backend/vasc-backend-jpa/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-backends/vasc-backend-jpa/.settings/org.maven.ide.eclipse.prefs b/vasc-backend/vasc-backend-jpa/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/.settings/org.maven.ide.eclipse.prefs
rename to vasc-backend/vasc-backend-jpa/.settings/org.maven.ide.eclipse.prefs
diff --git a/vasc-backends/vasc-backend-jpa/pom.xml b/vasc-backend/vasc-backend-jpa/pom.xml
similarity index 95%
rename from vasc-backends/vasc-backend-jpa/pom.xml
rename to vasc-backend/vasc-backend-jpa/pom.xml
index 21e7bd1..44d781a 100644
--- a/vasc-backends/vasc-backend-jpa/pom.xml
+++ b/vasc-backend/vasc-backend-jpa/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>vasc-backends</artifactId>
+    <artifactId>vasc-backend</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
diff --git a/vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractHibernateVascBackend.java b/vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractHibernateVascBackend.java
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractHibernateVascBackend.java
rename to vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractHibernateVascBackend.java
diff --git a/vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractPersistenceVascBackend.java b/vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractPersistenceVascBackend.java
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractPersistenceVascBackend.java
rename to vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractPersistenceVascBackend.java
diff --git a/vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/EntityManagerProvider.java b/vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/EntityManagerProvider.java
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/EntityManagerProvider.java
rename to vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/EntityManagerProvider.java
diff --git a/vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/HibernateSessionProvider.java b/vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/HibernateSessionProvider.java
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/HibernateSessionProvider.java
rename to vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/HibernateSessionProvider.java
diff --git a/vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlHibernateVascBackend.java b/vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlHibernateVascBackend.java
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlHibernateVascBackend.java
rename to vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlHibernateVascBackend.java
diff --git a/vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java b/vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java
rename to vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java
diff --git a/vasc-backends/vasc-backend-jpa/src/main/resources/.empty b/vasc-backend/vasc-backend-jpa/src/main/resources/.empty
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/src/main/resources/.empty
rename to vasc-backend/vasc-backend-jpa/src/main/resources/.empty
diff --git a/vasc-backends/vasc-backend-jpa/src/test/java/.empty b/vasc-backend/vasc-backend-jpa/src/test/java/.empty
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/src/test/java/.empty
rename to vasc-backend/vasc-backend-jpa/src/test/java/.empty
diff --git a/vasc-backends/vasc-backend-jpa/src/test/resources/.empty b/vasc-backend/vasc-backend-jpa/src/test/resources/.empty
similarity index 100%
rename from vasc-backends/vasc-backend-jpa/src/test/resources/.empty
rename to vasc-backend/vasc-backend-jpa/src/test/resources/.empty
diff --git a/vasc-backends/vasc-backend-ldap/.classpath b/vasc-backend/vasc-backend-ldap/.classpath
similarity index 100%
rename from vasc-backends/vasc-backend-ldap/.classpath
rename to vasc-backend/vasc-backend-ldap/.classpath
diff --git a/vasc-backends/vasc-backend-ldap/.project b/vasc-backend/vasc-backend-ldap/.project
similarity index 100%
rename from vasc-backends/vasc-backend-ldap/.project
rename to vasc-backend/vasc-backend-ldap/.project
diff --git a/vasc-backends/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs b/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs
similarity index 86%
rename from vasc-backends/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs
rename to vasc-backend/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs
index 155f2f0..26f6df6 100644
--- a/vasc-backends/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs
+++ b/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Sun Dec 25 17:29:06 CET 2011
+#Sat Dec 31 00:40:49 CET 2011
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
diff --git a/vasc-backends/vasc-backend-ldap/.settings/org.eclipse.jdt.core.prefs b/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-backends/vasc-backend-ldap/.settings/org.eclipse.jdt.core.prefs
rename to vasc-backend/vasc-backend-ldap/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-backends/vasc-backend-ldap/.settings/org.eclipse.m2e.core.prefs b/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-backends/vasc-backend-ldap/.settings/org.eclipse.m2e.core.prefs
rename to vasc-backend/vasc-backend-ldap/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-backends/vasc-backend-ldap/.settings/org.maven.ide.eclipse.prefs b/vasc-backend/vasc-backend-ldap/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from vasc-backends/vasc-backend-ldap/.settings/org.maven.ide.eclipse.prefs
rename to vasc-backend/vasc-backend-ldap/.settings/org.maven.ide.eclipse.prefs
diff --git a/vasc-backends/vasc-backend-ldap/pom.xml b/vasc-backend/vasc-backend-ldap/pom.xml
similarity index 94%
rename from vasc-backends/vasc-backend-ldap/pom.xml
rename to vasc-backend/vasc-backend-ldap/pom.xml
index 531002c..073994d 100644
--- a/vasc-backends/vasc-backend-ldap/pom.xml
+++ b/vasc-backend/vasc-backend-ldap/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>vasc-backends</artifactId>
+    <artifactId>vasc-backend</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
diff --git a/vasc-backends/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapConnectionProvider.java b/vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapConnectionProvider.java
similarity index 100%
rename from vasc-backends/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapConnectionProvider.java
rename to vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapConnectionProvider.java
diff --git a/vasc-backends/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapVascBackend.java b/vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapVascBackend.java
similarity index 100%
rename from vasc-backends/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapVascBackend.java
rename to vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapVascBackend.java
diff --git a/vasc-backends/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/SimpleLdapConnectionProvider.java b/vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/SimpleLdapConnectionProvider.java
similarity index 100%
rename from vasc-backends/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/SimpleLdapConnectionProvider.java
rename to vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/SimpleLdapConnectionProvider.java
diff --git a/vasc-backends/vasc-backend-ldap/src/main/resources/.empty b/vasc-backend/vasc-backend-ldap/src/main/resources/.empty
similarity index 100%
rename from vasc-backends/vasc-backend-ldap/src/main/resources/.empty
rename to vasc-backend/vasc-backend-ldap/src/main/resources/.empty
diff --git a/vasc-backends/vasc-backend-ldap/src/test/java/.empty b/vasc-backend/vasc-backend-ldap/src/test/java/.empty
similarity index 100%
rename from vasc-backends/vasc-backend-ldap/src/test/java/.empty
rename to vasc-backend/vasc-backend-ldap/src/test/java/.empty
diff --git a/vasc-backends/vasc-backend-ldap/src/test/resources/.empty b/vasc-backend/vasc-backend-ldap/src/test/resources/.empty
similarity index 100%
rename from vasc-backends/vasc-backend-ldap/src/test/resources/.empty
rename to vasc-backend/vasc-backend-ldap/src/test/resources/.empty
diff --git a/vasc-demos/vasc-demo-swing/.classpath b/vasc-backend/vasc-backend-mongodb/.classpath
similarity index 60%
rename from vasc-demos/vasc-demo-swing/.classpath
rename to vasc-backend/vasc-backend-mongodb/.classpath
index 3c96d64..f9479ba 100644
--- a/vasc-demos/vasc-demo-swing/.classpath
+++ b/vasc-backend/vasc-backend-mongodb/.classpath
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/vasc-backends/vasc-backend-mongodb/.project b/vasc-backend/vasc-backend-mongodb/.project
similarity index 100%
rename from vasc-backends/vasc-backend-mongodb/.project
rename to vasc-backend/vasc-backend-mongodb/.project
diff --git a/vasc-backends/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs b/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs
similarity index 86%
rename from vasc-backends/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs
rename to vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs
index 549f612..26f6df6 100644
--- a/vasc-backends/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs
+++ b/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Fri Dec 30 00:10:52 CET 2011
+#Sat Dec 31 00:40:49 CET 2011
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
diff --git a/vasc-backends/vasc-backend-mongodb/.settings/org.eclipse.jdt.core.prefs b/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-backends/vasc-backend-mongodb/.settings/org.eclipse.jdt.core.prefs
rename to vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-backends/vasc-backend-mongodb/.settings/org.eclipse.m2e.core.prefs b/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-backends/vasc-backend-mongodb/.settings/org.eclipse.m2e.core.prefs
rename to vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-backends/vasc-backend-mongodb/pom.xml b/vasc-backend/vasc-backend-mongodb/pom.xml
similarity index 94%
rename from vasc-backends/vasc-backend-mongodb/pom.xml
rename to vasc-backend/vasc-backend-mongodb/pom.xml
index c0490a5..171f7cd 100644
--- a/vasc-backends/vasc-backend-mongodb/pom.xml
+++ b/vasc-backend/vasc-backend-mongodb/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>vasc-backends</artifactId>
+    <artifactId>vasc-backend</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
     <version>0.3.5-SNAPSHOT</version>
     <relativePath>..</relativePath>
diff --git a/vasc-backends/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnection.java b/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnection.java
similarity index 100%
rename from vasc-backends/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnection.java
rename to vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnection.java
diff --git a/vasc-backends/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnectionProvider.java b/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnectionProvider.java
similarity index 100%
rename from vasc-backends/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnectionProvider.java
rename to vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnectionProvider.java
diff --git a/vasc-backends/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascBackend.java b/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascBackend.java
similarity index 100%
rename from vasc-backends/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascBackend.java
rename to vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascBackend.java
diff --git a/vasc-backends/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryFieldValue.java b/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryFieldValue.java
similarity index 100%
rename from vasc-backends/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryFieldValue.java
rename to vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryFieldValue.java
diff --git a/vasc-backends/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryRecordCreator.java b/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryRecordCreator.java
similarity index 100%
rename from vasc-backends/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryRecordCreator.java
rename to vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryRecordCreator.java
diff --git a/vasc-core/.settings/org.eclipse.core.resources.prefs b/vasc-core/.settings/org.eclipse.core.resources.prefs
index 155f2f0..df55c2e 100644
--- a/vasc-core/.settings/org.eclipse.core.resources.prefs
+++ b/vasc-core/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Sun Dec 25 17:29:06 CET 2011
+#Sat Dec 31 00:40:48 CET 2011
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
diff --git a/vasc-backends/vasc-backend-mongodb/.classpath b/vasc-demo/.classpath
similarity index 100%
rename from vasc-backends/vasc-backend-mongodb/.classpath
rename to vasc-demo/.classpath
diff --git a/vasc-demos/.project b/vasc-demo/.project
similarity index 100%
rename from vasc-demos/.project
rename to vasc-demo/.project
diff --git a/vasc-demo/.settings/org.eclipse.core.resources.prefs b/vasc-demo/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..26f6df6
--- /dev/null
+++ b/vasc-demo/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,7 @@
+#Sat Dec 31 00:40:49 CET 2011
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/vasc-demos/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-demos/.settings/org.eclipse.jdt.core.prefs
rename to vasc-demo/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-demos/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-demos/.settings/org.eclipse.m2e.core.prefs
rename to vasc-demo/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-demos/pom.xml b/vasc-demo/pom.xml
similarity index 77%
rename from vasc-demos/pom.xml
rename to vasc-demo/pom.xml
index b3b9d7d..3325983 100644
--- a/vasc-demos/pom.xml
+++ b/vasc-demo/pom.xml
@@ -6,11 +6,11 @@
     <version>0.3.5-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>vasc-demos</artifactId>
-  <groupId>net.forwardfire.vasc.demos</groupId>
+  <artifactId>vasc-demo</artifactId>
+  <groupId>net.forwardfire.vasc.demo</groupId>
   <packaging>pom</packaging>
-  <name>vasc-demos</name>
-  <description>vasc-demos</description>
+  <name>vasc-demo</name>
+  <description>vasc-demo</description>
   <modules>
   	<module>vasc-demo-petstore-j2ee5</module>
   	<module>vasc-demo-swing</module>
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/.classpath b/vasc-demo/vasc-demo-petstore-j2ee5/.classpath
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/.classpath
rename to vasc-demo/vasc-demo-petstore-j2ee5/.classpath
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/.project b/vasc-demo/vasc-demo-petstore-j2ee5/.project
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/.project
rename to vasc-demo/vasc-demo-petstore-j2ee5/.project
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/.settings/org.eclipse.core.resources.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.core.resources.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/.settings/org.eclipse.jdt.core.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/.settings/org.eclipse.m2e.core.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/.settings/org.maven.ide.eclipse.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/.settings/org.maven.ide.eclipse.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.maven.ide.eclipse.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/pom.xml b/vasc-demo/vasc-demo-petstore-j2ee5/pom.xml
similarity index 82%
rename from vasc-demos/vasc-demo-petstore-j2ee5/pom.xml
rename to vasc-demo/vasc-demo-petstore-j2ee5/pom.xml
index 8788104..93f3df8 100644
--- a/vasc-demos/vasc-demo-petstore-j2ee5/pom.xml
+++ b/vasc-demo/vasc-demo-petstore-j2ee5/pom.xml
@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>vasc-demos</artifactId>
-    <groupId>net.forwardfire.vasc.demos</groupId>
+    <artifactId>vasc-demo</artifactId>
+    <groupId>net.forwardfire.vasc.demo</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
-  <groupId>net.forwardfire.vasc.demos</groupId>
+  <groupId>net.forwardfire.vasc.demo</groupId>
   <artifactId>vasc-demo-petstore-j2ee5</artifactId>
   <version>0.3.5-SNAPSHOT</version>
   <packaging>pom</packaging>
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.classpath b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.classpath
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.classpath
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.classpath
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.project b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.project
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.project
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.project
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.core.resources.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.core.resources.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.jdt.core.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.m2e.core.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.maven.ide.eclipse.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.maven.ide.eclipse.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.maven.ide.eclipse.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/pom.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/pom.xml
similarity index 83%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/pom.xml
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/pom.xml
index 6adae31..8fa2b60 100644
--- a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/pom.xml
+++ b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/pom.xml
@@ -2,10 +2,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>vasc-demo-petstore-j2ee5</artifactId>
-    <groupId>net.forwardfire.vasc.demos</groupId>
+    <groupId>net.forwardfire.vasc.demo</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
-  <groupId>net.forwardfire.vasc.demos</groupId>
+  <groupId>net.forwardfire.vasc.demo</groupId>
   <artifactId>vasc-demo-petstore-j2ee5-ear</artifactId>
   <version>0.3.5-SNAPSHOT</version>
   <name>vasc-demo-petstore-j2ee5-ear</name>
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.classpath b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.classpath
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.classpath
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.classpath
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.project b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.project
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.project
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.project
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.core.resources.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.core.resources.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.jdt.core.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.m2e.core.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.maven.ide.eclipse.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.maven.ide.eclipse.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.maven.ide.eclipse.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/pom.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/pom.xml
similarity index 96%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/pom.xml
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/pom.xml
index cfd77c6..9dfa216 100644
--- a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/pom.xml
+++ b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/pom.xml
@@ -2,10 +2,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>vasc-demo-petstore-j2ee5</artifactId>
-    <groupId>net.forwardfire.vasc.demos</groupId>
+    <groupId>net.forwardfire.vasc.demo</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
-  <groupId>net.forwardfire.vasc.demos</groupId>
+  <groupId>net.forwardfire.vasc.demo</groupId>
   <artifactId>vasc-demo-petstore-j2ee5-ejb</artifactId>
   <version>0.3.5-SNAPSHOT</version>
   <packaging>ejb</packaging>
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreEntity.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreEntity.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreEntity.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreEntity.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreFieldTemplates.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreFieldTemplates.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreFieldTemplates.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreFieldTemplates.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Category.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Category.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Category.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Category.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/CategoryProduct.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/CategoryProduct.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/CategoryProduct.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/CategoryProduct.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Item.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Item.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Item.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Item.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemInventory.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemInventory.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemInventory.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemInventory.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemSupplier.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemSupplier.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemSupplier.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemSupplier.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Order.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Order.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Order.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Order.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderLine.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderLine.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderLine.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderLine.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderStatus.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderStatus.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderStatus.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderStatus.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserAccount.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserAccount.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserAccount.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserAccount.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserCredential.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserCredential.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserCredential.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserCredential.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserProfile.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserProfile.java
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserProfile.java
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserProfile.java
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/persistence.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/persistence.xml
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/persistence.xml
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/vasc-ejb3.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/vasc-ejb3.xml
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/vasc-ejb3.xml
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/vasc-ejb3.xml
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/xtes-xpql-ejb3.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/xtes-xpql-ejb3.xml
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/xtes-xpql-ejb3.xml
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/xtes-xpql-ejb3.xml
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/vasc/petstore.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/vasc/petstore.xml
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/vasc/petstore.xml
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/vasc/petstore.xml
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/xpql/petstore.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/xpql/petstore.xml
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/xpql/petstore.xml
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/xpql/petstore.xml
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.classpath b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.classpath
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.classpath
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.classpath
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.project b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.project
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.project
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.project
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.core.resources.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.core.resources.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.jdt.core.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.m2e.core.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.maven.ide.eclipse.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.maven.ide.eclipse.prefs
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.maven.ide.eclipse.prefs
diff --git a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/pom.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/pom.xml
similarity index 90%
rename from vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/pom.xml
rename to vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/pom.xml
index c441653..b89ea9f 100644
--- a/vasc-demos/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/pom.xml
+++ b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>vasc-demo-petstore-j2ee5</artifactId>
-    <groupId>net.forwardfire.vasc.demos</groupId>
+    <groupId>net.forwardfire.vasc.demo</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
   <groupId>net.forwardfire.vasc.demos</groupId>
diff --git a/vasc-demo/vasc-demo-swing/.classpath b/vasc-demo/vasc-demo-swing/.classpath
new file mode 100644
index 0000000..b6fb50e
--- /dev/null
+++ b/vasc-demo/vasc-demo-swing/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/vasc-demos/vasc-demo-swing/.project b/vasc-demo/vasc-demo-swing/.project
similarity index 100%
rename from vasc-demos/vasc-demo-swing/.project
rename to vasc-demo/vasc-demo-swing/.project
diff --git a/vasc-demo/vasc-demo-swing/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-swing/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..26f6df6
--- /dev/null
+++ b/vasc-demo/vasc-demo-swing/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,7 @@
+#Sat Dec 31 00:40:49 CET 2011
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/vasc-demos/vasc-demo-swing/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-swing/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-swing/.settings/org.eclipse.jdt.core.prefs
rename to vasc-demo/vasc-demo-swing/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-demos/vasc-demo-swing/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-swing/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-demos/vasc-demo-swing/.settings/org.eclipse.m2e.core.prefs
rename to vasc-demo/vasc-demo-swing/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-demos/vasc-demo-swing/pom.xml b/vasc-demo/vasc-demo-swing/pom.xml
similarity index 75%
rename from vasc-demos/vasc-demo-swing/pom.xml
rename to vasc-demo/vasc-demo-swing/pom.xml
index 7a77cee..d51d5ae 100644
--- a/vasc-demos/vasc-demo-swing/pom.xml
+++ b/vasc-demo/vasc-demo-swing/pom.xml
@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>vasc-demos</artifactId>
-    <groupId>net.forwardfire.vasc.demos</groupId>
+    <artifactId>vasc-demo</artifactId>
+    <groupId>net.forwardfire.vasc.demo</groupId>
     <version>0.3.5-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>vasc-demo-swing</artifactId>
-  <groupId>net.forwardfire.vasc.demos</groupId>
+  <groupId>net.forwardfire.vasc.demo</groupId>
   <name>vasc-demo-swing</name>
   <description>vasc-demo-swing</description>
 </project>
\ No newline at end of file
diff --git a/vasc-demos/.settings/org.eclipse.core.resources.prefs b/vasc-demos/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index e92b3c2..0000000
--- a/vasc-demos/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:19:32 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-demos/vasc-demo-swing/.settings/org.eclipse.core.resources.prefs b/vasc-demos/vasc-demo-swing/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index a27fa70..0000000
--- a/vasc-demos/vasc-demo-swing/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:34:57 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-ejb3/.settings/org.eclipse.core.resources.prefs b/vasc-ejb3/.settings/org.eclipse.core.resources.prefs
index 657c1b9..26f6df6 100644
--- a/vasc-ejb3/.settings/org.eclipse.core.resources.prefs
+++ b/vasc-ejb3/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Sat Dec 24 00:45:43 CET 2011
+#Sat Dec 31 00:40:49 CET 2011
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
diff --git a/vasc-demos/.classpath b/vasc-frontend/.classpath
similarity index 100%
rename from vasc-demos/.classpath
rename to vasc-frontend/.classpath
diff --git a/vasc-frontends/.project b/vasc-frontend/.project
similarity index 100%
rename from vasc-frontends/.project
rename to vasc-frontend/.project
diff --git a/vasc-frontend/.settings/org.eclipse.core.resources.prefs b/vasc-frontend/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..26f6df6
--- /dev/null
+++ b/vasc-frontend/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,7 @@
+#Sat Dec 31 00:40:49 CET 2011
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/vasc-frontends/.settings/org.eclipse.jdt.core.prefs b/vasc-frontend/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-frontends/.settings/org.eclipse.jdt.core.prefs
rename to vasc-frontend/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-frontends/.settings/org.eclipse.m2e.core.prefs b/vasc-frontend/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-frontends/.settings/org.eclipse.m2e.core.prefs
rename to vasc-frontend/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-frontends/pom.xml b/vasc-frontend/pom.xml
similarity index 82%
rename from vasc-frontends/pom.xml
rename to vasc-frontend/pom.xml
index 788e09f..21cba7a 100644
--- a/vasc-frontends/pom.xml
+++ b/vasc-frontend/pom.xml
@@ -6,10 +6,10 @@
     <version>0.3.5-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>vasc-frontends</artifactId>
+  <artifactId>vasc-frontend</artifactId>
   <packaging>pom</packaging>
-  <name>vasc-frontends</name>
-  <description>vasc-frontends</description>
+  <name>vasc-frontend</name>
+  <description>vasc-frontend</description>
   <modules>
 	<module>vasc-frontend-swing</module>
 	<module>vasc-frontend-swt</module>
diff --git a/vasc-frontends/vasc-frontend-swing/.classpath b/vasc-frontend/vasc-frontend-swing/.classpath
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/.classpath
rename to vasc-frontend/vasc-frontend-swing/.classpath
diff --git a/vasc-frontends/vasc-frontend-swing/.project b/vasc-frontend/vasc-frontend-swing/.project
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/.project
rename to vasc-frontend/vasc-frontend-swing/.project
diff --git a/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs b/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..26f6df6
--- /dev/null
+++ b/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,7 @@
+#Sat Dec 31 00:40:49 CET 2011
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/vasc-frontends/vasc-frontend-swing/.settings/org.eclipse.jdt.core.prefs b/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/.settings/org.eclipse.jdt.core.prefs
rename to vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-frontends/vasc-frontend-swing/.settings/org.eclipse.m2e.core.prefs b/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/.settings/org.eclipse.m2e.core.prefs
rename to vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-frontends/vasc-frontend-swing/.settings/org.maven.ide.eclipse.prefs b/vasc-frontend/vasc-frontend-swing/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/.settings/org.maven.ide.eclipse.prefs
rename to vasc-frontend/vasc-frontend-swing/.settings/org.maven.ide.eclipse.prefs
diff --git a/vasc-frontends/vasc-frontend-swing/pom.xml b/vasc-frontend/vasc-frontend-swing/pom.xml
similarity index 95%
rename from vasc-frontends/vasc-frontend-swing/pom.xml
rename to vasc-frontend/vasc-frontend-swing/pom.xml
index 82bddb3..5824db7 100644
--- a/vasc-frontends/vasc-frontend-swing/pom.xml
+++ b/vasc-frontend/vasc-frontend-swing/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>vasc-frontends</artifactId>
+    <artifactId>vasc-frontend</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
diff --git a/vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/SwingVascFrontend.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/SwingVascFrontend.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/SwingVascFrontend.java
rename to vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/SwingVascFrontend.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingBoolean.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingBoolean.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingBoolean.java
rename to vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingBoolean.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingButton.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingButton.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingButton.java
rename to vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingButton.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingColorChooser.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingColorChooser.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingColorChooser.java
rename to vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingColorChooser.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingDate.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingDate.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingDate.java
rename to vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingDate.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingLabel.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingLabel.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingLabel.java
rename to vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingLabel.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingList.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingList.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingList.java
rename to vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingList.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingText.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingText.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingText.java
rename to vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingText.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingTextArea.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingTextArea.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingTextArea.java
rename to vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingTextArea.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/main/resources/.empty b/vasc-frontend/vasc-frontend-swing/src/main/resources/.empty
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/main/resources/.empty
rename to vasc-frontend/vasc-frontend-swing/src/main/resources/.empty
diff --git a/vasc-frontends/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/SwingTest.java b/vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/SwingTest.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/SwingTest.java
rename to vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/SwingTest.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModel.java b/vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModel.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModel.java
rename to vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModel.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModelVascDataSource.java b/vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModelVascDataSource.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModelVascDataSource.java
rename to vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModelVascDataSource.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestTable.java b/vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestTable.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestTable.java
rename to vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestTable.java
diff --git a/vasc-frontends/vasc-frontend-swing/src/test/resources/.empty b/vasc-frontend/vasc-frontend-swing/src/test/resources/.empty
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/test/resources/.empty
rename to vasc-frontend/vasc-frontend-swing/src/test/resources/.empty
diff --git a/vasc-frontends/vasc-frontend-swing/src/test/resources/net/forwardfire/vasc/tables.xml b/vasc-frontend/vasc-frontend-swing/src/test/resources/net/forwardfire/vasc/tables.xml
similarity index 100%
rename from vasc-frontends/vasc-frontend-swing/src/test/resources/net/forwardfire/vasc/tables.xml
rename to vasc-frontend/vasc-frontend-swing/src/test/resources/net/forwardfire/vasc/tables.xml
diff --git a/vasc-frontends/vasc-frontend-swt/.classpath b/vasc-frontend/vasc-frontend-swt/.classpath
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/.classpath
rename to vasc-frontend/vasc-frontend-swt/.classpath
diff --git a/vasc-frontends/vasc-frontend-swt/.project b/vasc-frontend/vasc-frontend-swt/.project
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/.project
rename to vasc-frontend/vasc-frontend-swt/.project
diff --git a/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs b/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..26f6df6
--- /dev/null
+++ b/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,7 @@
+#Sat Dec 31 00:40:49 CET 2011
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/vasc-frontends/vasc-frontend-swt/.settings/org.eclipse.jdt.core.prefs b/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/.settings/org.eclipse.jdt.core.prefs
rename to vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-frontends/vasc-frontend-swt/.settings/org.eclipse.m2e.core.prefs b/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/.settings/org.eclipse.m2e.core.prefs
rename to vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-frontends/vasc-frontend-swt/.settings/org.maven.ide.eclipse.prefs b/vasc-frontend/vasc-frontend-swt/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/.settings/org.maven.ide.eclipse.prefs
rename to vasc-frontend/vasc-frontend-swt/.settings/org.maven.ide.eclipse.prefs
diff --git a/vasc-frontends/vasc-frontend-swt/pom.xml b/vasc-frontend/vasc-frontend-swt/pom.xml
similarity index 98%
rename from vasc-frontends/vasc-frontend-swt/pom.xml
rename to vasc-frontend/vasc-frontend-swt/pom.xml
index 913b867..e91868a 100644
--- a/vasc-frontends/vasc-frontend-swt/pom.xml
+++ b/vasc-frontend/vasc-frontend-swt/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>vasc-frontends</artifactId>
+    <artifactId>vasc-frontend</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
diff --git a/vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascEditDialog.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascEditDialog.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascEditDialog.java
rename to vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascEditDialog.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascFrontend.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascFrontend.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascFrontend.java
rename to vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascFrontend.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtBoolean.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtBoolean.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtBoolean.java
rename to vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtBoolean.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtButton.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtButton.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtButton.java
rename to vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtButton.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtLabel.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtLabel.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtLabel.java
rename to vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtLabel.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtList.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtList.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtList.java
rename to vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtList.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtText.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtText.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtText.java
rename to vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtText.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtTextArea.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtTextArea.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtTextArea.java
rename to vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/ui/SwtTextArea.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/main/resources/.empty b/vasc-frontend/vasc-frontend-swt/src/main/resources/.empty
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/main/resources/.empty
rename to vasc-frontend/vasc-frontend-swt/src/main/resources/.empty
diff --git a/vasc-frontends/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTableViewerTest.java b/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTableViewerTest.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTableViewerTest.java
rename to vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTableViewerTest.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTest.java b/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTest.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTest.java
rename to vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTest.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestModel.java b/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestModel.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestModel.java
rename to vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestModel.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestModelVascDataSource.java b/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestModelVascDataSource.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestModelVascDataSource.java
rename to vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestModelVascDataSource.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestTable.java b/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestTable.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestTable.java
rename to vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/TestTable.java
diff --git a/vasc-frontends/vasc-frontend-swt/src/test/resources/.empty b/vasc-frontend/vasc-frontend-swt/src/test/resources/.empty
similarity index 100%
rename from vasc-frontends/vasc-frontend-swt/src/test/resources/.empty
rename to vasc-frontend/vasc-frontend-swt/src/test/resources/.empty
diff --git a/vasc-frontends/vasc-frontend-web-jsf/.classpath b/vasc-frontend/vasc-frontend-web-jsf/.classpath
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/.classpath
rename to vasc-frontend/vasc-frontend-web-jsf/.classpath
diff --git a/vasc-frontends/vasc-frontend-web-jsf/.project b/vasc-frontend/vasc-frontend-web-jsf/.project
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/.project
rename to vasc-frontend/vasc-frontend-web-jsf/.project
diff --git a/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs b/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..26f6df6
--- /dev/null
+++ b/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,7 @@
+#Sat Dec 31 00:40:49 CET 2011
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/vasc-frontends/vasc-frontend-web-jsf/.settings/org.eclipse.jdt.core.prefs b/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/.settings/org.eclipse.jdt.core.prefs
rename to vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.jdt.core.prefs
diff --git a/vasc-frontends/vasc-frontend-web-jsf/.settings/org.eclipse.m2e.core.prefs b/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/.settings/org.eclipse.m2e.core.prefs
rename to vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.m2e.core.prefs
diff --git a/vasc-frontends/vasc-frontend-web-jsf/.settings/org.maven.ide.eclipse.prefs b/vasc-frontend/vasc-frontend-web-jsf/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/.settings/org.maven.ide.eclipse.prefs
rename to vasc-frontend/vasc-frontend-web-jsf/.settings/org.maven.ide.eclipse.prefs
diff --git a/vasc-frontends/vasc-frontend-web-jsf/pom.xml b/vasc-frontend/vasc-frontend-web-jsf/pom.xml
similarity index 97%
rename from vasc-frontends/vasc-frontend-web-jsf/pom.xml
rename to vasc-frontend/vasc-frontend-web-jsf/pom.xml
index 6f50af3..270d069 100644
--- a/vasc-frontends/vasc-frontend-web-jsf/pom.xml
+++ b/vasc-frontend/vasc-frontend-web-jsf/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>vasc-frontends</artifactId>
+    <artifactId>vasc-frontend</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntryEventListener.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntryEventListener.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntryEventListener.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntryEventListener.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponent.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponent.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponent.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponent.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentTag.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentTag.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentTag.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentTag.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/OldVascUIComponent.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/OldVascUIComponent.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/OldVascUIComponent.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/OldVascUIComponent.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascDataBackendBean.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascDataBackendBean.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascDataBackendBean.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascDataBackendBean.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascRequestFacesFilter.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascRequestFacesFilter.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascRequestFacesFilter.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascRequestFacesFilter.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascViewHandler.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascViewHandler.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascViewHandler.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascViewHandler.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/AbstractJSFBaseComponent.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/AbstractJSFBaseComponent.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/AbstractJSFBaseComponent.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/AbstractJSFBaseComponent.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFBoolean.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFBoolean.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFBoolean.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFBoolean.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFLabel.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFLabel.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFLabel.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFLabel.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFList.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFList.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFList.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFList.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFListModel.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFListModel.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFListModel.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFListModel.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFText.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFText.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFText.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFText.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFTextArea.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFTextArea.java
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFTextArea.java
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/ui/JSFTextArea.java
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/resources/META-INF/faces-config.xml b/vasc-frontend/vasc-frontend-web-jsf/src/main/resources/META-INF/faces-config.xml
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/resources/META-INF/faces-config.xml
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/resources/META-INF/faces-config.xml
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.taglib.xml b/vasc-frontend/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.taglib.xml
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.taglib.xml
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.taglib.xml
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.tld b/vasc-frontend/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.tld
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.tld
rename to vasc-frontend/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.tld
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/test/java/.empty b/vasc-frontend/vasc-frontend-web-jsf/src/test/java/.empty
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/test/java/.empty
rename to vasc-frontend/vasc-frontend-web-jsf/src/test/java/.empty
diff --git a/vasc-frontends/vasc-frontend-web-jsf/src/test/resources/.empty b/vasc-frontend/vasc-frontend-web-jsf/src/test/resources/.empty
similarity index 100%
rename from vasc-frontends/vasc-frontend-web-jsf/src/test/resources/.empty
rename to vasc-frontend/vasc-frontend-web-jsf/src/test/resources/.empty
diff --git a/vasc-frontends/.classpath b/vasc-frontends/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-frontends/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-frontends/.settings/org.eclipse.core.resources.prefs b/vasc-frontends/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index de55ee3..0000000
--- a/vasc-frontends/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:15:40 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-frontends/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs b/vasc-frontends/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6d54e61..0000000
--- a/vasc-frontends/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun Dec 25 17:29:07 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-frontends/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs b/vasc-frontends/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6d54e61..0000000
--- a/vasc-frontends/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun Dec 25 17:29:07 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-frontends/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs b/vasc-frontends/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6d54e61..0000000
--- a/vasc-frontends/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun Dec 25 17:29:07 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-xpql-ejb3/.settings/org.eclipse.core.resources.prefs b/vasc-xpql-ejb3/.settings/org.eclipse.core.resources.prefs
index 6d54e61..26f6df6 100644
--- a/vasc-xpql-ejb3/.settings/org.eclipse.core.resources.prefs
+++ b/vasc-xpql-ejb3/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Sun Dec 25 17:29:07 CET 2011
+#Sat Dec 31 00:40:49 CET 2011
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
diff --git a/vasc-xpql/.settings/org.eclipse.core.resources.prefs b/vasc-xpql/.settings/org.eclipse.core.resources.prefs
index 155f2f0..26f6df6 100644
--- a/vasc-xpql/.settings/org.eclipse.core.resources.prefs
+++ b/vasc-xpql/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Sun Dec 25 17:29:06 CET 2011
+#Sat Dec 31 00:40:49 CET 2011
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8