diff --git a/ElephantSQL-Uploader.war b/ElephantSQL-Uploader.war
index fa0cce3..2ac3d78 100644
Binary files a/ElephantSQL-Uploader.war and b/ElephantSQL-Uploader.war differ
diff --git a/app/.classpath b/app/.classpath
index 2112ebd..f478228 100755
--- a/app/.classpath
+++ b/app/.classpath
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/json-simple-1.1.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.3.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-io-2.4.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/postgresql-9.1-901.jdbc4.jar"/>
+	<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="WebContent/WEB-INF/lib/servlet-api-2.5.jar"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/app/.project b/app/.project
index 5f07fba..d0cb052 100755
--- a/app/.project
+++ b/app/.project
@@ -10,33 +10,27 @@
 			<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>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<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.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>
diff --git a/app/.settings/.jsdtscope b/app/.settings/.jsdtscope
index 887f573..8cb54d2 100755
--- a/app/.settings/.jsdtscope
+++ b/app/.settings/.jsdtscope
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry excluding="js/" kind="src" path="WebContent"/>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
 		<attributes>
diff --git a/app/.settings/org.eclipse.jdt.core.prefs b/app/.settings/org.eclipse.jdt.core.prefs
index c788ee3..44217f8 100755
--- a/app/.settings/org.eclipse.jdt.core.prefs
+++ b/app/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/app/.settings/org.eclipse.m2e.core.prefs b/app/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/app/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/app/.settings/org.eclipse.wst.common.component b/app/.settings/org.eclipse.wst.common.component
index fefd51e..de1c7db 100755
--- a/app/.settings/org.eclipse.wst.common.component
+++ b/app/.settings/org.eclipse.wst.common.component
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="PostgreSQLUpload">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+    <wb-module deploy-name="TwitterSearch0">
         <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <property name="context-root" value="PostgreSQLUpload"/>
-        <property name="java-output-path" value="/PostgreSQLUpload/build/classes"/>
+        <property name="java-output-path" value="/TwitterSearch0/bin"/>
+        <property name="context-root" value="elephantsql"/>
     </wb-module>
 </project-modules>
diff --git a/app/.settings/org.eclipse.wst.common.project.facet.core.xml b/app/.settings/org.eclipse.wst.common.project.facet.core.xml
index 603ee8e..5ebd3e4 100755
--- a/app/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/app/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="IBM Bluemix Runtime"/>
   <fixed facet="wst.jsdt.web"/>
-  <fixed facet="jst.web"/>
-  <fixed facet="java"/>
-  <installed facet="java" version="1.7"/>
+  <installed facet="java" version="1.5"/>
   <installed facet="jst.web" version="2.5"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
 </faceted-project>
diff --git a/app/.settings/org.eclipse.wst.validation.prefs b/app/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8c..0000000
--- a/app/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/app/WebContent/WEB-INF/lib/commons-codec-1.6.jar b/app/WebContent/WEB-INF/lib/commons-codec-1.6.jar
new file mode 100755
index 0000000..ee1bc49
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/commons-codec-1.6.jar differ
diff --git a/app/WebContent/WEB-INF/lib/commons-fileupload-1.3.jar b/app/WebContent/WEB-INF/lib/commons-fileupload-1.3.jar
new file mode 100755
index 0000000..32f2360
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/commons-fileupload-1.3.jar differ
diff --git a/app/WebContent/WEB-INF/lib/commons-io-2.4.jar b/app/WebContent/WEB-INF/lib/commons-io-2.4.jar
new file mode 100755
index 0000000..90035a4
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/commons-io-2.4.jar differ
diff --git a/app/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar b/app/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
new file mode 100755
index 0000000..1deef14
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar differ
diff --git a/app/WebContent/WEB-INF/lib/fluent-hc-4.2.5.jar b/app/WebContent/WEB-INF/lib/fluent-hc-4.2.5.jar
new file mode 100755
index 0000000..2f16541
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/fluent-hc-4.2.5.jar differ
diff --git a/app/WebContent/WEB-INF/lib/httpclient-4.2.5.jar b/app/WebContent/WEB-INF/lib/httpclient-4.2.5.jar
new file mode 100755
index 0000000..5310588
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/httpclient-4.2.5.jar differ
diff --git a/app/WebContent/WEB-INF/lib/httpclient-cache-4.2.5.jar b/app/WebContent/WEB-INF/lib/httpclient-cache-4.2.5.jar
new file mode 100755
index 0000000..290fab9
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/httpclient-cache-4.2.5.jar differ
diff --git a/app/WebContent/WEB-INF/lib/httpcore-4.2.4.jar b/app/WebContent/WEB-INF/lib/httpcore-4.2.4.jar
new file mode 100755
index 0000000..9f45bd9
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/httpcore-4.2.4.jar differ
diff --git a/app/WebContent/WEB-INF/lib/httpmime-4.2.5.jar b/app/WebContent/WEB-INF/lib/httpmime-4.2.5.jar
new file mode 100755
index 0000000..e63b24d
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/httpmime-4.2.5.jar differ
diff --git a/app/WebContent/WEB-INF/lib/json-simple-1.1.jar b/app/WebContent/WEB-INF/lib/json-simple-1.1.jar
new file mode 100755
index 0000000..f395f41
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/json-simple-1.1.jar differ
diff --git a/app/WebContent/WEB-INF/lib/postgresql-9.1-901.jdbc4.jar b/app/WebContent/WEB-INF/lib/postgresql-9.1-901.jdbc4.jar
new file mode 100755
index 0000000..63e5416
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/postgresql-9.1-901.jdbc4.jar differ
diff --git a/app/WebContent/WEB-INF/lib/servlet-api-2.5.jar b/app/WebContent/WEB-INF/lib/servlet-api-2.5.jar
new file mode 100755
index 0000000..07727f4
Binary files /dev/null and b/app/WebContent/WEB-INF/lib/servlet-api-2.5.jar differ
diff --git a/app/pom.xml b/app/pom.xml
deleted file mode 100644
index f2decf6..0000000
--- a/app/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<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>
-  <groupId>PostgreSQLUpload</groupId>
-  <artifactId>PostgreSQLUpload</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <packaging>war</packaging>
-  <name>myMavenTest</name>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>src</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <warSourceDirectory>WebContent</warSourceDirectory>
-          <failOnMissingWebXml>false</failOnMissingWebXml>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-  	<dependency>
-  		<groupId>org.eclipse.jetty.orbit</groupId>
-  		<artifactId>javax.servlet</artifactId>
-  		<version>3.0.0.v201112011016</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.eclipse.jetty.orbit</groupId>
-  		<artifactId>javax.servlet.jsp</artifactId>
-  		<version>2.2.0.v201112011158</version>
-  	</dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/manifest.yml b/manifest.yml
index f7b9487..37593a9 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,9 +1,4 @@
 ---
-declared-services:
-  myService:
-    type: elephantsql
-    plan: turtle
-
 applications:
 - name: JavaUpload
   memory: 256M #The maximum memory to allocate to each application instance
@@ -11,5 +6,5 @@ applications:
   host: JavaUpload-${random-word} #Hostname for app routing. Unique to domain
   path: ElephantSQL-Uploader.war
   services:
-    - myService    #Identifier for ElephantSQL service, must be provisioned before push
+    - java-pg    #Identifier for ElephantSQL service, must be provisioned before push
 
diff --git a/project.json b/project.json
deleted file mode 100644
index a464b21..0000000
--- a/project.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Name": "jeden | SomeJavaTest"}
\ No newline at end of file