diff --git a/.gitignore b/.gitignore
index fe86331..645a374 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,8 +37,8 @@ pom.xml.versionsBackup
 *~
 
 # Ignore some eclipse files
-##.settings
-##.classpath
+.settings
+.classpath
 
 # Ignore netbeans directory
 nbproject
diff --git a/pom.xml b/pom.xml
index 23038fb..5d0b207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 </scm>
 <modules>
 	<module>vasc-core</module>
-	<module>vasc-ejb3</module>
+	<module>vasc-core-ejb3</module>
 	<module>vasc-xpql</module>
 	<module>vasc-xpql-ejb3-server</module>
 	<module>vasc-xpql-ejb3-client</module>
@@ -34,6 +34,7 @@
 	<module>vasc-frontend</module>
 	<module>vasc-demo</module>
 	<module>vasc-test</module>
+	<module>vasc-lib</module>
 </modules>
 <properties>
 	<hg.repo.url>https://...vasc/</hg.repo.url>
diff --git a/vasc-ejb3/.project b/vasc-core-ejb3/.project
similarity index 97%
rename from vasc-ejb3/.project
rename to vasc-core-ejb3/.project
index d4d7137..fd650fb 100644
--- a/vasc-ejb3/.project
+++ b/vasc-core-ejb3/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>vasc-ejb3</name>
+	<name>vasc-core-ejb3</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/vasc-ejb3/pom.xml b/vasc-core-ejb3/pom.xml
similarity index 91%
rename from vasc-ejb3/pom.xml
rename to vasc-core-ejb3/pom.xml
index a6dad52..25356b3 100644
--- a/vasc-ejb3/pom.xml
+++ b/vasc-core-ejb3/pom.xml
@@ -6,10 +6,10 @@
     <version>0.3.5-SNAPSHOT</version>
   </parent>
   <groupId>net.forwardfire.vasc</groupId>
-  <artifactId>vasc-ejb3</artifactId>
+  <artifactId>vasc-core-ejb3</artifactId>
   <version>0.3.5-SNAPSHOT</version>
-  <name>vasc-ejb3</name>
-  <description>vasc-ejb3</description>
+  <name>vasc-core-ejb3</name>
+  <description>vasc-core-ejb3</description>
   <dependencies>
   	<dependency>
 		<groupId>net.forwardfire.vasc</groupId>
diff --git a/vasc-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManager.java b/vasc-core-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManager.java
similarity index 100%
rename from vasc-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManager.java
rename to vasc-core-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManager.java
diff --git a/vasc-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java b/vasc-core-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java
similarity index 100%
rename from vasc-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java
rename to vasc-core-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java
diff --git a/vasc-ejb3/src/main/resources/.empty b/vasc-core-ejb3/src/main/resources/.empty
similarity index 100%
rename from vasc-ejb3/src/main/resources/.empty
rename to vasc-core-ejb3/src/main/resources/.empty
diff --git a/vasc-ejb3/src/test/java/.empty b/vasc-core-ejb3/src/test/java/.empty
similarity index 100%
rename from vasc-ejb3/src/test/java/.empty
rename to vasc-core-ejb3/src/test/java/.empty
diff --git a/vasc-ejb3/src/test/resources/.empty b/vasc-core-ejb3/src/test/resources/.empty
similarity index 100%
rename from vasc-ejb3/src/test/resources/.empty
rename to vasc-core-ejb3/src/test/resources/.empty
diff --git a/vasc-demo/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
index 9dfa216..f7b91d9 100644
--- a/vasc-demo/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
@@ -82,7 +82,7 @@
     </dependency>
     <dependency>
 		<groupId>net.forwardfire.vasc</groupId>
-  		<artifactId>vasc-ejb3</artifactId>
+  		<artifactId>vasc-core-ejb3</artifactId>
   		<version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/vasc-lib/.project b/vasc-lib/.project
new file mode 100644
index 0000000..d1e7d3c
--- /dev/null
+++ b/vasc-lib/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>vasc-lib</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/vasc-lib/pom.xml b/vasc-lib/pom.xml
new file mode 100644
index 0000000..71fc322
--- /dev/null
+++ b/vasc-lib/pom.xml
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>vasc</artifactId>
+    <groupId>net.forwardfire.vasc</groupId>
+    <version>0.3.5-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>vasc-lib</artifactId>
+  <packaging>pom</packaging>
+  <name>vasc-lib</name>
+  <description>vasc-lib</description>
+  <modules>
+  	<module>vasc-lib-i18n</module>
+  </modules>
+</project>
\ No newline at end of file
diff --git a/vasc-lib/vasc-lib-i18n/.project b/vasc-lib/vasc-lib-i18n/.project
new file mode 100644
index 0000000..5b238b2
--- /dev/null
+++ b/vasc-lib/vasc-lib-i18n/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>vasc-lib-i18n</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/vasc-lib/vasc-lib-i18n/pom.xml b/vasc-lib/vasc-lib-i18n/pom.xml
new file mode 100644
index 0000000..324fa94
--- /dev/null
+++ b/vasc-lib/vasc-lib-i18n/pom.xml
@@ -0,0 +1,12 @@
+<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-lib</artifactId>
+    <groupId>net.forwardfire.vasc</groupId>
+    <version>0.3.5-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>vasc-lib-i18n</artifactId>
+  <name>vasc-lib-i18n</name>
+  <description>vasc-lib-i18n</description>
+</project>
\ No newline at end of file