diff --git a/.classpath b/.classpath
index 2750cc7..7bdf471 100644
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
@@ -12,5 +11,16 @@
 	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.5.jar"/>
 	<classpathentry kind="lib" path="lib/devinsy-utils-0.2.0.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.8.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.utility"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.project b/.project
index c9ea52e..0d23734 100644
--- a/.project
+++ b/.project
@@ -5,13 +5,26 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/src/fr/devinsy/util/web/FileItemHelper.java b/src/fr/devinsy/kiss4web/FileItemHelper.java
similarity index 90%
rename from src/fr/devinsy/util/web/FileItemHelper.java
rename to src/fr/devinsy/kiss4web/FileItemHelper.java
index b43e73f..0c930c5 100644
--- a/src/fr/devinsy/util/web/FileItemHelper.java
+++ b/src/fr/devinsy/kiss4web/FileItemHelper.java
@@ -1,4 +1,4 @@
-package fr.devinsy.util.web;
+package fr.devinsy.kiss4web;
 
 import java.util.List;
 
diff --git a/src/fr/devinsy/util/web/Redirector.java b/src/fr/devinsy/kiss4web/Redirector.java
similarity index 89%
rename from src/fr/devinsy/util/web/Redirector.java
rename to src/fr/devinsy/kiss4web/Redirector.java
index d1bfaba..0ba3720 100644
--- a/src/fr/devinsy/util/web/Redirector.java
+++ b/src/fr/devinsy/kiss4web/Redirector.java
@@ -1,4 +1,4 @@
-package fr.devinsy.util.web;
+package fr.devinsy.kiss4web;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/fr/devinsy/util/web/SimpleSecurityAgent.java b/src/fr/devinsy/kiss4web/SimpleSecurityAgent.java
similarity index 98%
rename from src/fr/devinsy/util/web/SimpleSecurityAgent.java
rename to src/fr/devinsy/kiss4web/SimpleSecurityAgent.java
index 367d8ab..ac83328 100644
--- a/src/fr/devinsy/util/web/SimpleSecurityAgent.java
+++ b/src/fr/devinsy/kiss4web/SimpleSecurityAgent.java
@@ -1,4 +1,4 @@
-package fr.devinsy.util.web;
+package fr.devinsy.kiss4web;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -7,7 +7,6 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fr.devinsy.kiss4web.CookieHelper;
 
 /**
  *