diff --git a/mispbridge/mispbridge/META-INF/MANIFEST.MF b/mispbridge/out/META-INF/MANIFEST.MF
similarity index 100%
rename from mispbridge/mispbridge/META-INF/MANIFEST.MF
rename to mispbridge/out/META-INF/MANIFEST.MF
diff --git a/mispbridge/mispbridge/META-INF/war-tracker b/mispbridge/out/META-INF/war-tracker
similarity index 100%
rename from mispbridge/mispbridge/META-INF/war-tracker
rename to mispbridge/out/META-INF/war-tracker
diff --git a/mispbridge/out/WEB-INF/classes/core/BridgeServlet.class b/mispbridge/out/WEB-INF/classes/core/BridgeServlet.class
new file mode 100644
index 0000000..d704733
Binary files /dev/null and b/mispbridge/out/WEB-INF/classes/core/BridgeServlet.class differ
diff --git a/mispbridge/mispbridge/WEB-INF/web.xml b/mispbridge/out/WEB-INF/web.xml
similarity index 93%
rename from mispbridge/mispbridge/WEB-INF/web.xml
rename to mispbridge/out/WEB-INF/web.xml
index d6e2d2a..0d3a1af 100644
--- a/mispbridge/mispbridge/WEB-INF/web.xml
+++ b/mispbridge/out/WEB-INF/web.xml
@@ -12,7 +12,7 @@
 
     <servlet>
         <servlet-name>BridgeServlet</servlet-name>
-        <servlet-class>BridgeServlet</servlet-class>
+        <servlet-class>core.BridgeServlet</servlet-class>
     </servlet>
 
     <servlet-mapping>
diff --git a/mispbridge/mispbridge/hello.jsp b/mispbridge/out/hello.jsp
similarity index 100%
rename from mispbridge/mispbridge/hello.jsp
rename to mispbridge/out/hello.jsp
diff --git a/mispbridge/mispbridge/images/tomcat.gif b/mispbridge/out/images/tomcat.gif
similarity index 100%
rename from mispbridge/mispbridge/images/tomcat.gif
rename to mispbridge/out/images/tomcat.gif
diff --git a/mispbridge/mispbridge/index.html b/mispbridge/out/index.html
similarity index 100%
rename from mispbridge/mispbridge/index.html
rename to mispbridge/out/index.html
diff --git a/mispbridge/out/mispbridge.war b/mispbridge/out/mispbridge.war
new file mode 100644
index 0000000..8be650c
Binary files /dev/null and b/mispbridge/out/mispbridge.war differ
diff --git a/mispclient/mispclient/META-INF/MANIFEST.MF b/mispclient/out/META-INF/MANIFEST.MF
similarity index 100%
rename from mispclient/mispclient/META-INF/MANIFEST.MF
rename to mispclient/out/META-INF/MANIFEST.MF
diff --git a/mispclient/mispclient/META-INF/war-tracker b/mispclient/out/META-INF/war-tracker
similarity index 100%
rename from mispclient/mispclient/META-INF/war-tracker
rename to mispclient/out/META-INF/war-tracker
diff --git a/mispclient/out/WEB-INF/classes/META-INF/mispclient.kotlin_module b/mispclient/out/WEB-INF/classes/META-INF/mispclient.kotlin_module
new file mode 100644
index 0000000..a49347a
Binary files /dev/null and b/mispclient/out/WEB-INF/classes/META-INF/mispclient.kotlin_module differ
diff --git a/mispclient/out/WEB-INF/classes/core/ClientServlet.class b/mispclient/out/WEB-INF/classes/core/ClientServlet.class
new file mode 100644
index 0000000..2a64018
Binary files /dev/null and b/mispclient/out/WEB-INF/classes/core/ClientServlet.class differ
diff --git a/mispclient/out/WEB-INF/classes/core/PostRideRunnable.class b/mispclient/out/WEB-INF/classes/core/PostRideRunnable.class
new file mode 100644
index 0000000..12b0067
Binary files /dev/null and b/mispclient/out/WEB-INF/classes/core/PostRideRunnable.class differ
diff --git a/mispclient/mispclient/WEB-INF/web.xml b/mispclient/out/WEB-INF/web.xml
similarity index 93%
rename from mispclient/mispclient/WEB-INF/web.xml
rename to mispclient/out/WEB-INF/web.xml
index 35dee88..24d8400 100644
--- a/mispclient/mispclient/WEB-INF/web.xml
+++ b/mispclient/out/WEB-INF/web.xml
@@ -12,7 +12,7 @@
 
     <servlet>
         <servlet-name>ClientServlet</servlet-name>
-        <servlet-class>ClientServlet</servlet-class>
+        <servlet-class>core.ClientServlet</servlet-class>
     </servlet>
 
     <servlet-mapping>
diff --git a/mispclient/mispclient/hello.jsp b/mispclient/out/hello.jsp
similarity index 100%
rename from mispclient/mispclient/hello.jsp
rename to mispclient/out/hello.jsp
diff --git a/mispclient/mispclient/images/tomcat.gif b/mispclient/out/images/tomcat.gif
similarity index 100%
rename from mispclient/mispclient/images/tomcat.gif
rename to mispclient/out/images/tomcat.gif
diff --git a/mispclient/mispclient/index.html b/mispclient/out/index.html
similarity index 100%
rename from mispclient/mispclient/index.html
rename to mispclient/out/index.html
diff --git a/mispclient/out/mispclient.war b/mispclient/out/mispclient.war
new file mode 100644
index 0000000..e3c5bf3
Binary files /dev/null and b/mispclient/out/mispclient.war differ
diff --git a/mispclient/src/core/ClientServlet.java b/mispclient/src/core/ClientServlet.java
index de74189..e38bd68 100644
--- a/mispclient/src/core/ClientServlet.java
+++ b/mispclient/src/core/ClientServlet.java
@@ -12,7 +12,7 @@ import java.util.Map;
 public class ClientServlet extends HttpServlet {
 
     protected static final String MISP_BRIDGE_URL = "http://localhost:9090/mispbridge/core";
-    protected static final String APP_URL = "http://localhost:9090";
+    protected static final String APP_URL = "http://www.google.ch";
 
     public static final int AVAILABLE_RIDES_OVERHEAD_TRIGGER = 32;
     public static final int AVAILABLE_RIDES_OVERHEAD = 64;
diff --git a/misphelper/make-war.sh b/misphelper/make-war.sh
new file mode 100755
index 0000000..9b5e77f
--- /dev/null
+++ b/misphelper/make-war.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+cd ../mispbridge/mispbridge
+jar -cvf mispbridge.war *
+cd ../
+cd ../mispclient/mispclient
+jar -cvf mispclient.war *
\ No newline at end of file
diff --git a/mispmock/src/actor/AppMock.java b/mispmock/src/actor/AppMock.java
index c8b6b2e..2a3b843 100644
--- a/mispmock/src/actor/AppMock.java
+++ b/mispmock/src/actor/AppMock.java
@@ -36,7 +36,7 @@ public class AppMock extends ActorRunnable {
 
         synchronized (exchange) {
             String parsedRequest = IOUtils.toString(request.getReader());
-            
+
             String dataString = "DATA-" + parsedRequest.split("-")[1];
 
             exchange.response.setStatus(200);