diff --git a/trunk/WebImages/.classpath b/trunk/WebImages/.classpath
new file mode 100644
index 00000000..df3eee2f
--- /dev/null
+++ b/trunk/WebImages/.classpath
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/ashwood-2.0.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/avalon-framework-4.2.0.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/batik-all-1.7.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-codec-1.4.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-collections-3.1.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-httpclient-3.1.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-io-1.4.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-lang-2.4.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-validator-1.3.1.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/evologger.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/evolute.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/jdom-1.1.1.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/log4j-1.2.15.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/org.springframework.beans-3.0.0.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/org.springframework.context-3.0.0.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/org.springframework.core-3.0.0.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/postgresql-9.0-801.jdbc4.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/shst.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/spring-ws-core-1.5.9.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/spring-ws-core-tiger-1.5.9.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/spring-ws-support-1.5.9.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/spring-xml-1.5.9.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/truelicense.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/xalan-2.7.0.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/xercesImpl-2.7.1.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/xml-apis-1.3.04.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/xml-apis-ext-1.3.04.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/xmlgraphics-commons-1.3.1.jar"/>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>
diff --git a/trunk/WebImages/.project b/trunk/WebImages/.project
new file mode 100644
index 00000000..5ca5788b
--- /dev/null
+++ b/trunk/WebImages/.project
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>SIPRPImages</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</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.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>
diff --git a/trunk/WebImages/.settings/.jsdtscope b/trunk/WebImages/.settings/.jsdtscope
new file mode 100644
index 00000000..1db10bca
--- /dev/null
+++ b/trunk/WebImages/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="web"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/trunk/WebImages/.settings/org.eclipse.jdt.core.prefs b/trunk/WebImages/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..c537b630
--- /dev/null
+++ b/trunk/WebImages/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/trunk/WebImages/.settings/org.eclipse.wst.common.component b/trunk/WebImages/.settings/org.eclipse.wst.common.component
new file mode 100644
index 00000000..ba2539ab
--- /dev/null
+++ b/trunk/WebImages/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="SIPRPImages">
+        <wb-resource deploy-path="/" source-path="/web" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <property name="context-root" value="SIPRPImages"/>
+        <property name="java-output-path" value="/SIPRPImages/build/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/trunk/WebImages/.settings/org.eclipse.wst.common.project.facet.core.xml b/trunk/WebImages/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 00000000..ff51a506
--- /dev/null
+++ b/trunk/WebImages/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Apache Tomcat v6.0"/>
+  <fixed facet="wst.jsdt.web"/>
+  <fixed facet="java"/>
+  <fixed facet="jst.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/trunk/WebImages/.settings/org.eclipse.wst.jsdt.ui.superType.container b/trunk/WebImages/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 00000000..3bd5d0a4
--- /dev/null
+++ b/trunk/WebImages/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/trunk/WebImages/.settings/org.eclipse.wst.jsdt.ui.superType.name b/trunk/WebImages/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 00000000..05bd71b6
--- /dev/null
+++ b/trunk/WebImages/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/trunk/WebImages/web/META-INF/MANIFEST.MF b/trunk/WebImages/web/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..5e949512
--- /dev/null
+++ b/trunk/WebImages/web/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/trunk/WebImages/lib/ashwood-2.0.jar b/trunk/WebImages/web/WEB-INF/lib/ashwood-2.0.jar
similarity index 100%
rename from trunk/WebImages/lib/ashwood-2.0.jar
rename to trunk/WebImages/web/WEB-INF/lib/ashwood-2.0.jar
diff --git a/trunk/WebImages/lib/avalon-framework-4.2.0.jar b/trunk/WebImages/web/WEB-INF/lib/avalon-framework-4.2.0.jar
similarity index 100%
rename from trunk/WebImages/lib/avalon-framework-4.2.0.jar
rename to trunk/WebImages/web/WEB-INF/lib/avalon-framework-4.2.0.jar
diff --git a/trunk/WebImages/lib/batik-all-1.7.jar b/trunk/WebImages/web/WEB-INF/lib/batik-all-1.7.jar
similarity index 100%
rename from trunk/WebImages/lib/batik-all-1.7.jar
rename to trunk/WebImages/web/WEB-INF/lib/batik-all-1.7.jar
diff --git a/trunk/WebImages/lib/commons-codec-1.4.jar b/trunk/WebImages/web/WEB-INF/lib/commons-codec-1.4.jar
similarity index 100%
rename from trunk/WebImages/lib/commons-codec-1.4.jar
rename to trunk/WebImages/web/WEB-INF/lib/commons-codec-1.4.jar
diff --git a/trunk/WebImages/lib/commons-collections-3.1.jar b/trunk/WebImages/web/WEB-INF/lib/commons-collections-3.1.jar
similarity index 100%
rename from trunk/WebImages/lib/commons-collections-3.1.jar
rename to trunk/WebImages/web/WEB-INF/lib/commons-collections-3.1.jar
diff --git a/trunk/WebImages/lib/commons-httpclient-3.1.jar b/trunk/WebImages/web/WEB-INF/lib/commons-httpclient-3.1.jar
similarity index 100%
rename from trunk/WebImages/lib/commons-httpclient-3.1.jar
rename to trunk/WebImages/web/WEB-INF/lib/commons-httpclient-3.1.jar
diff --git a/trunk/WebImages/lib/commons-io-1.4.jar b/trunk/WebImages/web/WEB-INF/lib/commons-io-1.4.jar
similarity index 100%
rename from trunk/WebImages/lib/commons-io-1.4.jar
rename to trunk/WebImages/web/WEB-INF/lib/commons-io-1.4.jar
diff --git a/trunk/WebImages/lib/commons-lang-2.4.jar b/trunk/WebImages/web/WEB-INF/lib/commons-lang-2.4.jar
similarity index 100%
rename from trunk/WebImages/lib/commons-lang-2.4.jar
rename to trunk/WebImages/web/WEB-INF/lib/commons-lang-2.4.jar
diff --git a/trunk/WebImages/lib/commons-logging-1.1.1.jar b/trunk/WebImages/web/WEB-INF/lib/commons-logging-1.1.1.jar
similarity index 100%
rename from trunk/WebImages/lib/commons-logging-1.1.1.jar
rename to trunk/WebImages/web/WEB-INF/lib/commons-logging-1.1.1.jar
diff --git a/trunk/WebImages/lib/commons-validator-1.3.1.jar b/trunk/WebImages/web/WEB-INF/lib/commons-validator-1.3.1.jar
similarity index 100%
rename from trunk/WebImages/lib/commons-validator-1.3.1.jar
rename to trunk/WebImages/web/WEB-INF/lib/commons-validator-1.3.1.jar
diff --git a/trunk/WebImages/lib/evologger.jar b/trunk/WebImages/web/WEB-INF/lib/evologger.jar
similarity index 100%
rename from trunk/WebImages/lib/evologger.jar
rename to trunk/WebImages/web/WEB-INF/lib/evologger.jar
diff --git a/trunk/WebImages/lib/evolute.jar b/trunk/WebImages/web/WEB-INF/lib/evolute.jar
similarity index 100%
rename from trunk/WebImages/lib/evolute.jar
rename to trunk/WebImages/web/WEB-INF/lib/evolute.jar
diff --git a/trunk/WebImages/lib/jdom-1.1.1.jar b/trunk/WebImages/web/WEB-INF/lib/jdom-1.1.1.jar
similarity index 100%
rename from trunk/WebImages/lib/jdom-1.1.1.jar
rename to trunk/WebImages/web/WEB-INF/lib/jdom-1.1.1.jar
diff --git a/trunk/WebImages/lib/log4j-1.2.15.jar b/trunk/WebImages/web/WEB-INF/lib/log4j-1.2.15.jar
similarity index 100%
rename from trunk/WebImages/lib/log4j-1.2.15.jar
rename to trunk/WebImages/web/WEB-INF/lib/log4j-1.2.15.jar
diff --git a/trunk/WebImages/lib/nblibraries.properties b/trunk/WebImages/web/WEB-INF/lib/nblibraries.properties
similarity index 100%
rename from trunk/WebImages/lib/nblibraries.properties
rename to trunk/WebImages/web/WEB-INF/lib/nblibraries.properties
diff --git a/trunk/WebImages/lib/org.springframework.beans-3.0.0.jar b/trunk/WebImages/web/WEB-INF/lib/org.springframework.beans-3.0.0.jar
similarity index 100%
rename from trunk/WebImages/lib/org.springframework.beans-3.0.0.jar
rename to trunk/WebImages/web/WEB-INF/lib/org.springframework.beans-3.0.0.jar
diff --git a/trunk/WebImages/lib/org.springframework.context-3.0.0.jar b/trunk/WebImages/web/WEB-INF/lib/org.springframework.context-3.0.0.jar
similarity index 100%
rename from trunk/WebImages/lib/org.springframework.context-3.0.0.jar
rename to trunk/WebImages/web/WEB-INF/lib/org.springframework.context-3.0.0.jar
diff --git a/trunk/WebImages/lib/org.springframework.core-3.0.0.jar b/trunk/WebImages/web/WEB-INF/lib/org.springframework.core-3.0.0.jar
similarity index 100%
rename from trunk/WebImages/lib/org.springframework.core-3.0.0.jar
rename to trunk/WebImages/web/WEB-INF/lib/org.springframework.core-3.0.0.jar
diff --git a/trunk/WebImages/lib/postgresql-9.0-801.jdbc4.jar b/trunk/WebImages/web/WEB-INF/lib/postgresql-9.0-801.jdbc4.jar
similarity index 100%
rename from trunk/WebImages/lib/postgresql-9.0-801.jdbc4.jar
rename to trunk/WebImages/web/WEB-INF/lib/postgresql-9.0-801.jdbc4.jar
diff --git a/trunk/WebImages/lib/shst.jar b/trunk/WebImages/web/WEB-INF/lib/shst.jar
similarity index 100%
rename from trunk/WebImages/lib/shst.jar
rename to trunk/WebImages/web/WEB-INF/lib/shst.jar
diff --git a/trunk/WebImages/lib/spring-ws-core-1.5.9.jar b/trunk/WebImages/web/WEB-INF/lib/spring-ws-core-1.5.9.jar
similarity index 100%
rename from trunk/WebImages/lib/spring-ws-core-1.5.9.jar
rename to trunk/WebImages/web/WEB-INF/lib/spring-ws-core-1.5.9.jar
diff --git a/trunk/WebImages/lib/spring-ws-core-tiger-1.5.9.jar b/trunk/WebImages/web/WEB-INF/lib/spring-ws-core-tiger-1.5.9.jar
similarity index 100%
rename from trunk/WebImages/lib/spring-ws-core-tiger-1.5.9.jar
rename to trunk/WebImages/web/WEB-INF/lib/spring-ws-core-tiger-1.5.9.jar
diff --git a/trunk/WebImages/lib/spring-ws-support-1.5.9.jar b/trunk/WebImages/web/WEB-INF/lib/spring-ws-support-1.5.9.jar
similarity index 100%
rename from trunk/WebImages/lib/spring-ws-support-1.5.9.jar
rename to trunk/WebImages/web/WEB-INF/lib/spring-ws-support-1.5.9.jar
diff --git a/trunk/WebImages/lib/spring-xml-1.5.9.jar b/trunk/WebImages/web/WEB-INF/lib/spring-xml-1.5.9.jar
similarity index 100%
rename from trunk/WebImages/lib/spring-xml-1.5.9.jar
rename to trunk/WebImages/web/WEB-INF/lib/spring-xml-1.5.9.jar
diff --git a/trunk/WebImages/lib/truelicense.jar b/trunk/WebImages/web/WEB-INF/lib/truelicense.jar
similarity index 100%
rename from trunk/WebImages/lib/truelicense.jar
rename to trunk/WebImages/web/WEB-INF/lib/truelicense.jar
diff --git a/trunk/WebImages/lib/xalan-2.7.0.jar b/trunk/WebImages/web/WEB-INF/lib/xalan-2.7.0.jar
similarity index 100%
rename from trunk/WebImages/lib/xalan-2.7.0.jar
rename to trunk/WebImages/web/WEB-INF/lib/xalan-2.7.0.jar
diff --git a/trunk/WebImages/lib/xercesImpl-2.7.1.jar b/trunk/WebImages/web/WEB-INF/lib/xercesImpl-2.7.1.jar
similarity index 100%
rename from trunk/WebImages/lib/xercesImpl-2.7.1.jar
rename to trunk/WebImages/web/WEB-INF/lib/xercesImpl-2.7.1.jar
diff --git a/trunk/WebImages/lib/xml-apis-1.3.04.jar b/trunk/WebImages/web/WEB-INF/lib/xml-apis-1.3.04.jar
similarity index 100%
rename from trunk/WebImages/lib/xml-apis-1.3.04.jar
rename to trunk/WebImages/web/WEB-INF/lib/xml-apis-1.3.04.jar
diff --git a/trunk/WebImages/lib/xml-apis-ext-1.3.04.jar b/trunk/WebImages/web/WEB-INF/lib/xml-apis-ext-1.3.04.jar
similarity index 100%
rename from trunk/WebImages/lib/xml-apis-ext-1.3.04.jar
rename to trunk/WebImages/web/WEB-INF/lib/xml-apis-ext-1.3.04.jar
diff --git a/trunk/WebImages/lib/xmlgraphics-commons-1.3.1.jar b/trunk/WebImages/web/WEB-INF/lib/xmlgraphics-commons-1.3.1.jar
similarity index 100%
rename from trunk/WebImages/lib/xmlgraphics-commons-1.3.1.jar
rename to trunk/WebImages/web/WEB-INF/lib/xmlgraphics-commons-1.3.1.jar
diff --git a/trunk/WebImages/web/WEB-INF/web.xml b/trunk/WebImages/web/WEB-INF/web.xml
index 8a856d65..7f2d6400 100644
--- a/trunk/WebImages/web/WEB-INF/web.xml
+++ b/trunk/WebImages/web/WEB-INF/web.xml
@@ -1,19 +1,12 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-"http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
-
-  <servlet>
-    <servlet-class>siprp.images.servlet.ImagesServlet</servlet-class>
-    <servlet-name>imageServlet</servlet-name>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>imageServlet</servlet-name>
-    <url-pattern>/image</url-pattern>
-  </servlet-mapping>
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+  <display-name>SIPRPImages</display-name>
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.htm</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+    <welcome-file>default.html</welcome-file>
+    <welcome-file>default.htm</welcome-file>
+    <welcome-file>default.jsp</welcome-file>
+  </welcome-file-list>
+</web-app>
\ No newline at end of file