diff --git a/.gitignore b/.gitignore
index 8c4e3845..4ae1fa91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,5 @@ gwt-2.9.0/
 # TODO remove the others, some of these have been committed
 .project
 .settings
-.classpath
\ No newline at end of file
+.classpath
+.metadata/
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/.classpath b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/.classpath
index beecf8f7..c0d7e547 100644
--- a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/.classpath
+++ b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/.classpath
@@ -7,32 +7,32 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-api-client-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-api-client-gson-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-api-client-jackson2-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-api-client-java6-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-http-client-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-http-client-gson-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-http-client-jackson-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-http-client-jackson2-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-oauth-client-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-oauth-client-java6-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-oauth-client-java7-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-oauth-client-jetty-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-oauth-client-servlet-1.16.0-rc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/gson-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/guava-jdk5-13.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.9.11.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jdo2-api-2.3-eb.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jetty-6.1.26.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jetty-util-6.1.26.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jsr305-1.3.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/protobuf-java-2.4.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/transaction-api-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/commons-logging-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-api-client-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-api-client-gson-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-api-client-jackson2-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-api-client-java6-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-http-client-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-http-client-gson-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-http-client-jackson-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-http-client-jackson2-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-oauth-client-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-oauth-client-java6-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-oauth-client-java7-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-oauth-client-jetty-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-oauth-client-servlet-1.16.0-rc.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/gson-2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/guava-jdk5-13.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/httpclient-4.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/httpcore-4.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/jackson-core-2.1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/jackson-core-asl-1.9.11.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/jdo2-api-2.3-eb.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/jetty-6.1.26.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/jetty-util-6.1.26.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/jsr305-1.3.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/protobuf-java-2.4.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/transaction-api-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/xpp3-1.1.4c.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/META-INF/MANIFEST.MF b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/META-INF/MANIFEST.MF
index 7d8f4c82..bdc98216 100644
--- a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/META-INF/MANIFEST.MF
+++ b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/META-INF/MANIFEST.MF
@@ -1,33 +1,33 @@
 Manifest-Version: 1.0
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- lib/commons-logging-1.1.1.jar,
- lib/google-api-client-1.16.0-rc.jar,
- lib/google-api-client-gson-1.16.0-rc.jar,
- lib/google-api-client-jackson2-1.16.0-rc.jar,
- lib/google-api-client-java6-1.16.0-rc.jar,
- lib/google-http-client-1.16.0-rc.jar,
- lib/google-http-client-gson-1.16.0-rc.jar,
- lib/google-http-client-jackson-1.16.0-rc.jar,
- lib/google-http-client-jackson2-1.16.0-rc.jar,
- lib/google-oauth-client-1.16.0-rc.jar,
- lib/google-oauth-client-java6-1.16.0-rc.jar,
- lib/google-oauth-client-java7-1.16.0-rc.jar,
- lib/google-oauth-client-jetty-1.16.0-rc.jar,
- lib/google-oauth-client-servlet-1.16.0-rc.jar,
- lib/gson-2.1.jar,
- lib/guava-jdk5-13.0.jar,
- lib/httpclient-4.0.1.jar,
- lib/httpcore-4.0.1.jar,
- lib/jackson-core-2.1.3.jar,
- lib/jackson-core-asl-1.9.11.jar,
- lib/jdo2-api-2.3-eb.jar,
- lib/jetty-6.1.26.jar,
- lib/jetty-util-6.1.26.jar,
- lib/jsr305-1.3.9.jar,
- lib/protobuf-java-2.4.1.jar,
- lib/transaction-api-1.1.jar,
- lib/xpp3-1.1.4c.jar
+ libs/commons-logging-1.1.1.jar,
+ libs/google-api-client-1.16.0-rc.jar,
+ libs/google-api-client-gson-1.16.0-rc.jar,
+ libs/google-api-client-jackson2-1.16.0-rc.jar,
+ libs/google-api-client-java6-1.16.0-rc.jar,
+ libs/google-http-client-1.16.0-rc.jar,
+ libs/google-http-client-gson-1.16.0-rc.jar,
+ libs/google-http-client-jackson-1.16.0-rc.jar,
+ libs/google-http-client-jackson2-1.16.0-rc.jar,
+ libs/google-oauth-client-1.16.0-rc.jar,
+ libs/google-oauth-client-java6-1.16.0-rc.jar,
+ libs/google-oauth-client-java7-1.16.0-rc.jar,
+ libs/google-oauth-client-jetty-1.16.0-rc.jar,
+ libs/google-oauth-client-servlet-1.16.0-rc.jar,
+ libs/gson-2.1.jar,
+ libs/guava-jdk5-13.0.jar,
+ libs/httpclient-4.0.1.jar,
+ libs/httpcore-4.0.1.jar,
+ libs/jackson-core-2.1.3.jar,
+ libs/jackson-core-asl-1.9.11.jar,
+ libs/jdo2-api-2.3-eb.jar,
+ libs/jetty-6.1.26.jar,
+ libs/jetty-util-6.1.26.jar,
+ libs/jsr305-1.3.9.jar,
+ libs/protobuf-java-2.4.1.jar,
+ libs/transaction-api-1.1.jar,
+ libs/xpp3-1.1.4c.jar
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/build.properties b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/build.properties
index d931d68d..037a545b 100644
--- a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/build.properties
+++ b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/build.properties
@@ -2,33 +2,33 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               lib/commons-logging-1.1.1.jar,\
-               lib/google-api-client-1.16.0-rc.jar,\
-               lib/google-api-client-gson-1.16.0-rc.jar,\
-               lib/google-api-client-jackson2-1.16.0-rc.jar,\
-               lib/google-api-client-java6-1.16.0-rc.jar,\
-               lib/google-http-client-1.16.0-rc.jar,\
-               lib/google-http-client-gson-1.16.0-rc.jar,\
-               lib/google-http-client-jackson-1.16.0-rc.jar,\
-               lib/google-http-client-jackson2-1.16.0-rc.jar,\
-               lib/google-oauth-client-1.16.0-rc.jar,\
-               lib/google-oauth-client-java6-1.16.0-rc.jar,\
-               lib/google-oauth-client-java7-1.16.0-rc.jar,\
-               lib/google-oauth-client-jetty-1.16.0-rc.jar,\
-               lib/google-oauth-client-servlet-1.16.0-rc.jar,\
-               lib/gson-2.1.jar,\
-               lib/guava-jdk5-13.0.jar,\
-               lib/httpclient-4.0.1.jar,\
-               lib/httpcore-4.0.1.jar,\
-               lib/jackson-core-2.1.3.jar,\
-               lib/jackson-core-asl-1.9.11.jar,\
-               lib/jdo2-api-2.3-eb.jar,\
-               lib/jetty-6.1.26.jar,\
-               lib/jetty-util-6.1.26.jar,\
-               lib/jsr305-1.3.9.jar,\
-               lib/protobuf-java-2.4.1.jar,\
-               lib/transaction-api-1.1.jar,\
-               lib/xpp3-1.1.4c.jar,\
+               libs/commons-logging-1.1.1.jar,\
+               libs/google-api-client-1.16.0-rc.jar,\
+               libs/google-api-client-gson-1.16.0-rc.jar,\
+               libs/google-api-client-jackson2-1.16.0-rc.jar,\
+               libs/google-api-client-java6-1.16.0-rc.jar,\
+               libs/google-http-client-1.16.0-rc.jar,\
+               libs/google-http-client-gson-1.16.0-rc.jar,\
+               libs/google-http-client-jackson-1.16.0-rc.jar,\
+               libs/google-http-client-jackson2-1.16.0-rc.jar,\
+               libs/google-oauth-client-1.16.0-rc.jar,\
+               libs/google-oauth-client-java6-1.16.0-rc.jar,\
+               libs/google-oauth-client-java7-1.16.0-rc.jar,\
+               libs/google-oauth-client-jetty-1.16.0-rc.jar,\
+               libs/google-oauth-client-servlet-1.16.0-rc.jar,\
+               libs/gson-2.1.jar,\
+               libs/guava-jdk5-13.0.jar,\
+               libs/httpclient-4.0.1.jar,\
+               libs/httpcore-4.0.1.jar,\
+               libs/jackson-core-2.1.3.jar,\
+               libs/jackson-core-asl-1.9.11.jar,\
+               libs/jdo2-api-2.3-eb.jar,\
+               libs/jetty-6.1.26.jar,\
+               libs/jetty-util-6.1.26.jar,\
+               libs/jsr305-1.3.9.jar,\
+               libs/protobuf-java-2.4.1.jar,\
+               libs/transaction-api-1.1.jar,\
+               libs/xpp3-1.1.4c.jar,\
                plugin.properties
 javacSource=11
 javacTarget=11
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/APACHE-LICENSE.txt b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/APACHE-LICENSE.txt
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/APACHE-LICENSE.txt
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/APACHE-LICENSE.txt
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/BSD-LICENSE.txt b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/BSD-LICENSE.txt
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/BSD-LICENSE.txt
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/BSD-LICENSE.txt
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/CDDL-LICENSE.txt b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/CDDL-LICENSE.txt
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/CDDL-LICENSE.txt
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/CDDL-LICENSE.txt
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/LICENSE.txt b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/LICENSE.txt
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/LICENSE.txt
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/LICENSE.txt
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/commons-logging-1.1.1.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/commons-logging-1.1.1.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/commons-logging-1.1.1.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/commons-logging-1.1.1.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-api-client-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-api-client-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-api-client-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-api-client-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-api-client-gson-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-api-client-gson-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-api-client-gson-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-api-client-gson-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-api-client-jackson2-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-api-client-jackson2-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-api-client-jackson2-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-api-client-jackson2-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-api-client-java6-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-api-client-java6-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-api-client-java6-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-api-client-java6-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-http-client-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-http-client-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-http-client-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-http-client-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-http-client-gson-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-http-client-gson-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-http-client-gson-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-http-client-gson-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-http-client-jackson-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-http-client-jackson-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-http-client-jackson-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-http-client-jackson-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-http-client-jackson2-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-http-client-jackson2-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-http-client-jackson2-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-http-client-jackson2-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-oauth-client-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-oauth-client-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-oauth-client-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-oauth-client-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-oauth-client-java6-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-oauth-client-java6-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-oauth-client-java6-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-oauth-client-java6-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-oauth-client-java7-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-oauth-client-java7-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-oauth-client-java7-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-oauth-client-java7-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-oauth-client-jetty-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-oauth-client-jetty-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-oauth-client-jetty-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-oauth-client-jetty-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-oauth-client-servlet-1.16.0-rc.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-oauth-client-servlet-1.16.0-rc.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/google-oauth-client-servlet-1.16.0-rc.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/google-oauth-client-servlet-1.16.0-rc.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/gson-2.1.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/gson-2.1.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/gson-2.1.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/gson-2.1.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/guava-jdk5-13.0.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/guava-jdk5-13.0.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/guava-jdk5-13.0.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/guava-jdk5-13.0.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/httpclient-4.0.1.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/httpclient-4.0.1.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/httpclient-4.0.1.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/httpclient-4.0.1.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/httpcore-4.0.1.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/httpcore-4.0.1.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/httpcore-4.0.1.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/httpcore-4.0.1.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jackson-core-2.1.3.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jackson-core-2.1.3.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jackson-core-2.1.3.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jackson-core-2.1.3.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jackson-core-asl-1.9.11.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jackson-core-asl-1.9.11.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jackson-core-asl-1.9.11.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jackson-core-asl-1.9.11.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jdo2-api-2.3-eb.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jdo2-api-2.3-eb.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jdo2-api-2.3-eb.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jdo2-api-2.3-eb.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jetty-6.1.26.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jetty-6.1.26.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jetty-6.1.26.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jetty-6.1.26.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jetty-util-6.1.26.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jetty-util-6.1.26.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jetty-util-6.1.26.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jetty-util-6.1.26.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jsr305-1.3.9.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jsr305-1.3.9.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/jsr305-1.3.9.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/jsr305-1.3.9.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/protobuf-java-2.4.1.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/protobuf-java-2.4.1.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/protobuf-java-2.4.1.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/protobuf-java-2.4.1.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/transaction-api-1.1.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/transaction-api-1.1.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/transaction-api-1.1.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/transaction-api-1.1.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/xpp3-1.1.4c.jar b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/xpp3-1.1.4c.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/xpp3-1.1.4c.jar
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/xpp3-1.1.4c.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/xpp3_LICENSE.txt b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/xpp3_LICENSE.txt
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.apiclientlib/lib/xpp3_LICENSE.txt
rename to plugins/com.gwtplugins.gdt.eclipse.apiclientlib/libs/xpp3_LICENSE.txt
diff --git a/plugins/com.gwtplugins.gdt.eclipse.core/.classpath b/plugins/com.gwtplugins.gdt.eclipse.core/.classpath
index 1b4f0023..dcf99b28 100644
--- a/plugins/com.gwtplugins.gdt.eclipse.core/.classpath
+++ b/plugins/com.gwtplugins.gdt.eclipse.core/.classpath
@@ -3,8 +3,8 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
-	<classpathentry exported="true" kind="lib" path="lib/jsr305-1.3.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/guava-11.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/gson-2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/jsr305-1.3.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/guava-11.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/gson-2.1.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/com.gwtplugins.gdt.eclipse.core/META-INF/MANIFEST.MF b/plugins/com.gwtplugins.gdt.eclipse.core/META-INF/MANIFEST.MF
index 7b9c896a..c337d6c5 100644
--- a/plugins/com.gwtplugins.gdt.eclipse.core/META-INF/MANIFEST.MF
+++ b/plugins/com.gwtplugins.gdt.eclipse.core/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.google.gdt.eclipse.core.CorePlugin
 Bundle-ClassPath: .,
- lib/jsr305-1.3.9.jar,
- lib/guava-11.0.1.jar,
- lib/gson-2.1.jar
+ libs/jsr305-1.3.9.jar,
+ libs/guava-11.0.1.jar,
+ libs/gson-2.1.jar
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
diff --git a/plugins/com.gwtplugins.gdt.eclipse.core/build.properties b/plugins/com.gwtplugins.gdt.eclipse.core/build.properties
index fb87d37a..f84f5010 100644
--- a/plugins/com.gwtplugins.gdt.eclipse.core/build.properties
+++ b/plugins/com.gwtplugins.gdt.eclipse.core/build.properties
@@ -3,7 +3,7 @@ bin.includes = META-INF/,\
                icons/,\
                plugin.xml,\
                .,\
-               lib/,\
+               libs/,\
                plugin.properties
 javacSource=11
 javacTarget=11
diff --git a/plugins/com.gwtplugins.gdt.eclipse.core/lib/gson-2.1.jar b/plugins/com.gwtplugins.gdt.eclipse.core/libs/gson-2.1.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.core/lib/gson-2.1.jar
rename to plugins/com.gwtplugins.gdt.eclipse.core/libs/gson-2.1.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.core/lib/guava-11.0.1.jar b/plugins/com.gwtplugins.gdt.eclipse.core/libs/guava-11.0.1.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.core/lib/guava-11.0.1.jar
rename to plugins/com.gwtplugins.gdt.eclipse.core/libs/guava-11.0.1.jar
diff --git a/plugins/com.gwtplugins.gdt.eclipse.core/lib/jsr305-1.3.9.jar b/plugins/com.gwtplugins.gdt.eclipse.core/libs/jsr305-1.3.9.jar
similarity index 100%
rename from plugins/com.gwtplugins.gdt.eclipse.core/lib/jsr305-1.3.9.jar
rename to plugins/com.gwtplugins.gdt.eclipse.core/libs/jsr305-1.3.9.jar
diff --git a/plugins/com.gwtplugins.gwt.eclipse.oophm/.classpath b/plugins/com.gwtplugins.gwt.eclipse.oophm/.classpath
index abf53148..ecab74b0 100644
--- a/plugins/com.gwtplugins.gwt.eclipse.oophm/.classpath
+++ b/plugins/com.gwtplugins.gwt.eclipse.oophm/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
-	<classpathentry exported="true" kind="lib" path="lib/gwt-dev-transport.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/gwt-dev-transport.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/com.gwtplugins.gwt.eclipse.oophm/META-INF/MANIFEST.MF b/plugins/com.gwtplugins.gwt.eclipse.oophm/META-INF/MANIFEST.MF
index b43a2adb..63d1f0c3 100644
--- a/plugins/com.gwtplugins.gwt.eclipse.oophm/META-INF/MANIFEST.MF
+++ b/plugins/com.gwtplugins.gwt.eclipse.oophm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.google.gwt.eclipse.oophm.Activator
 Bundle-ClassPath: .,
- lib/gwt-dev-transport.jar
+ libs/gwt-dev-transport.jar
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
diff --git a/plugins/com.gwtplugins.gwt.eclipse.oophm/build.properties b/plugins/com.gwtplugins.gwt.eclipse.oophm/build.properties
index f6d22f51..f808791c 100644
--- a/plugins/com.gwtplugins.gwt.eclipse.oophm/build.properties
+++ b/plugins/com.gwtplugins.gwt.eclipse.oophm/build.properties
@@ -4,7 +4,7 @@ bin.includes = plugin.xml,\
                META-INF/,\
                .,\
                icons/,\
-               lib/gwt-dev-transport.jar,\
+               libs/gwt-dev-transport.jar,\
                plugin.properties
 javacSource=11
 javacTarget=11
diff --git a/plugins/com.gwtplugins.gwt.eclipse.oophm/lib/gwt-dev-transport.jar b/plugins/com.gwtplugins.gwt.eclipse.oophm/libs/gwt-dev-transport.jar
similarity index 100%
rename from plugins/com.gwtplugins.gwt.eclipse.oophm/lib/gwt-dev-transport.jar
rename to plugins/com.gwtplugins.gwt.eclipse.oophm/libs/gwt-dev-transport.jar