diff --git a/.classpath b/.classpath
index cf12b2f..ea0749f 100644
--- a/.classpath
+++ b/.classpath
@@ -3,19 +3,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -25,5 +12,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/.gitignore b/bin/.gitignore
deleted file mode 100644
index c23bbb3..0000000
--- a/bin/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/application/
-/cloudControllerInstances/
diff --git a/bin/application/Main$1$1.class b/bin/application/Main$1$1.class
new file mode 100644
index 0000000..072117f
Binary files /dev/null and b/bin/application/Main$1$1.class differ
diff --git a/bin/application/Main$1.class b/bin/application/Main$1.class
new file mode 100644
index 0000000..915e77e
Binary files /dev/null and b/bin/application/Main$1.class differ
diff --git a/bin/application/Main$2$1.class b/bin/application/Main$2$1.class
new file mode 100644
index 0000000..f1a0f2e
Binary files /dev/null and b/bin/application/Main$2$1.class differ
diff --git a/bin/application/Main$2.class b/bin/application/Main$2.class
new file mode 100644
index 0000000..20139a2
Binary files /dev/null and b/bin/application/Main$2.class differ
diff --git a/bin/application/Main$3.class b/bin/application/Main$3.class
new file mode 100644
index 0000000..42ac9bc
Binary files /dev/null and b/bin/application/Main$3.class differ
diff --git a/bin/libraries/commons-codec-1.10.jar b/bin/libraries/commons-codec-1.10.jar
deleted file mode 100644
index 1d7417c..0000000
Binary files a/bin/libraries/commons-codec-1.10.jar and /dev/null differ
diff --git a/bin/libraries/commons-codec-1.11.jar b/bin/libraries/commons-codec-1.11.jar
new file mode 100644
index 0000000..2245120
Binary files /dev/null and b/bin/libraries/commons-codec-1.11.jar differ
diff --git a/bin/libraries/commons-io-2.5.jar b/bin/libraries/commons-io-2.5.jar
deleted file mode 100644
index 107b061..0000000
Binary files a/bin/libraries/commons-io-2.5.jar and /dev/null differ
diff --git a/bin/libraries/commons-io-2.6.jar b/bin/libraries/commons-io-2.6.jar
new file mode 100644
index 0000000..00556b1
Binary files /dev/null and b/bin/libraries/commons-io-2.6.jar differ
diff --git a/src/libraries/commons-codec-1.10.jar b/src/libraries/commons-codec-1.10.jar
deleted file mode 100644
index 1d7417c..0000000
Binary files a/src/libraries/commons-codec-1.10.jar and /dev/null differ
diff --git a/src/libraries/commons-codec-1.11.jar b/src/libraries/commons-codec-1.11.jar
new file mode 100644
index 0000000..2245120
Binary files /dev/null and b/src/libraries/commons-codec-1.11.jar differ
diff --git a/src/libraries/commons-io-2.5.jar b/src/libraries/commons-io-2.5.jar
deleted file mode 100644
index 107b061..0000000
Binary files a/src/libraries/commons-io-2.5.jar and /dev/null differ
diff --git a/src/libraries/commons-io-2.6.jar b/src/libraries/commons-io-2.6.jar
new file mode 100644
index 0000000..00556b1
Binary files /dev/null and b/src/libraries/commons-io-2.6.jar differ
diff --git a/src/libraries/google_api_libraries/google-api-client-1.23.0.jar b/src/libraries/google_api_libraries/google-api-client-1.23.0.jar
new file mode 100644
index 0000000..3df306b
Binary files /dev/null and b/src/libraries/google_api_libraries/google-api-client-1.23.0.jar differ
diff --git a/src/libraries/google_api_libraries/google-api-services-drive-v3-rev87-1.23.0.jar b/src/libraries/google_api_libraries/google-api-services-drive-v3-rev87-1.23.0.jar
new file mode 100644
index 0000000..22dc43b
Binary files /dev/null and b/src/libraries/google_api_libraries/google-api-services-drive-v3-rev87-1.23.0.jar differ
diff --git a/src/libraries/google_apis/google-http-client-1.22.0.jar b/src/libraries/google_api_libraries/google-http-client-1.23.0.jar
similarity index 62%
rename from src/libraries/google_apis/google-http-client-1.22.0.jar
rename to src/libraries/google_api_libraries/google-http-client-1.23.0.jar
index a31a9b1..3e6667d 100644
Binary files a/src/libraries/google_apis/google-http-client-1.22.0.jar and b/src/libraries/google_api_libraries/google-http-client-1.23.0.jar differ
diff --git a/src/libraries/google_apis/google-http-client-jackson2-1.22.0.jar b/src/libraries/google_api_libraries/google-http-client-jackson2-1.23.0.jar
similarity index 61%
rename from src/libraries/google_apis/google-http-client-jackson2-1.22.0.jar
rename to src/libraries/google_api_libraries/google-http-client-jackson2-1.23.0.jar
index 64f0c15..d898662 100644
Binary files a/src/libraries/google_apis/google-http-client-jackson2-1.22.0.jar and b/src/libraries/google_api_libraries/google-http-client-jackson2-1.23.0.jar differ
diff --git a/src/libraries/google_api_libraries/google-oauth-client-1.23.0.jar b/src/libraries/google_api_libraries/google-oauth-client-1.23.0.jar
new file mode 100644
index 0000000..be88de2
Binary files /dev/null and b/src/libraries/google_api_libraries/google-oauth-client-1.23.0.jar differ
diff --git a/src/libraries/google_api_libraries/google-oauth-client-java6-1.23.0.jar b/src/libraries/google_api_libraries/google-oauth-client-java6-1.23.0.jar
new file mode 100644
index 0000000..cd35b55
Binary files /dev/null and b/src/libraries/google_api_libraries/google-oauth-client-java6-1.23.0.jar differ
diff --git a/src/libraries/google_api_libraries/google-oauth-client-jetty-1.23.0.jar b/src/libraries/google_api_libraries/google-oauth-client-jetty-1.23.0.jar
new file mode 100644
index 0000000..f0d2ee3
Binary files /dev/null and b/src/libraries/google_api_libraries/google-oauth-client-jetty-1.23.0.jar differ
diff --git a/src/libraries/google_api_libraries/jackson-core-2.9.2.jar b/src/libraries/google_api_libraries/jackson-core-2.9.2.jar
new file mode 100644
index 0000000..ff26a3f
Binary files /dev/null and b/src/libraries/google_api_libraries/jackson-core-2.9.2.jar differ
diff --git a/src/libraries/google_api_libraries/javax.servlet-api-4.0.0.jar b/src/libraries/google_api_libraries/javax.servlet-api-4.0.0.jar
new file mode 100644
index 0000000..9c9f4b7
Binary files /dev/null and b/src/libraries/google_api_libraries/javax.servlet-api-4.0.0.jar differ
diff --git a/src/libraries/google_apis/jetty-6.1.25.jar b/src/libraries/google_api_libraries/jetty-6.1.26.jar
similarity index 65%
rename from src/libraries/google_apis/jetty-6.1.25.jar
rename to src/libraries/google_api_libraries/jetty-6.1.26.jar
index 50fd700..2cbe07a 100644
Binary files a/src/libraries/google_apis/jetty-6.1.25.jar and b/src/libraries/google_api_libraries/jetty-6.1.26.jar differ
diff --git a/src/libraries/google_apis/jetty-util-6.1.25.jar b/src/libraries/google_api_libraries/jetty-util-6.1.26.jar
similarity index 69%
rename from src/libraries/google_apis/jetty-util-6.1.25.jar
rename to src/libraries/google_api_libraries/jetty-util-6.1.26.jar
index 70018d3..cd23752 100644
Binary files a/src/libraries/google_apis/jetty-util-6.1.25.jar and b/src/libraries/google_api_libraries/jetty-util-6.1.26.jar differ
diff --git a/src/libraries/google_apis/google-api-client-1.22.0.jar b/src/libraries/google_apis/google-api-client-1.22.0.jar
deleted file mode 100644
index b9c2b2d..0000000
Binary files a/src/libraries/google_apis/google-api-client-1.22.0.jar and /dev/null differ
diff --git a/src/libraries/google_apis/google-api-services-drive-v2-rev263-1.22.0.jar b/src/libraries/google_apis/google-api-services-drive-v2-rev263-1.22.0.jar
deleted file mode 100644
index 971a232..0000000
Binary files a/src/libraries/google_apis/google-api-services-drive-v2-rev263-1.22.0.jar and /dev/null differ
diff --git a/src/libraries/google_apis/google-api-services-drive-v3-rev68-1.22.0.jar b/src/libraries/google_apis/google-api-services-drive-v3-rev68-1.22.0.jar
deleted file mode 100644
index 2949409..0000000
Binary files a/src/libraries/google_apis/google-api-services-drive-v3-rev68-1.22.0.jar and /dev/null differ
diff --git a/src/libraries/google_apis/google-oauth-client-1.22.0.jar b/src/libraries/google_apis/google-oauth-client-1.22.0.jar
deleted file mode 100644
index 93d284d..0000000
Binary files a/src/libraries/google_apis/google-oauth-client-1.22.0.jar and /dev/null differ
diff --git a/src/libraries/google_apis/google-oauth-client-java6-1.22.0.jar b/src/libraries/google_apis/google-oauth-client-java6-1.22.0.jar
deleted file mode 100644
index 956f263..0000000
Binary files a/src/libraries/google_apis/google-oauth-client-java6-1.22.0.jar and /dev/null differ
diff --git a/src/libraries/google_apis/google-oauth-client-jetty-1.22.0.jar b/src/libraries/google_apis/google-oauth-client-jetty-1.22.0.jar
deleted file mode 100644
index 25b5ac5..0000000
Binary files a/src/libraries/google_apis/google-oauth-client-jetty-1.22.0.jar and /dev/null differ
diff --git a/src/libraries/google_apis/jackson-core-2.8.8.jar b/src/libraries/google_apis/jackson-core-2.8.8.jar
deleted file mode 100644
index 2a66a6f..0000000
Binary files a/src/libraries/google_apis/jackson-core-2.8.8.jar and /dev/null differ
diff --git a/src/libraries/google_apis/javax.servlet-api-3.1.0.jar b/src/libraries/google_apis/javax.servlet-api-3.1.0.jar
deleted file mode 100644
index 6b14c3d..0000000
Binary files a/src/libraries/google_apis/javax.servlet-api-3.1.0.jar and /dev/null differ
diff --git a/bin/libraries/google_apis/google-api-client-1.22.0.jar b/src/libraries/google_apis_old/google-api-client-1.22.0.jar
similarity index 100%
rename from bin/libraries/google_apis/google-api-client-1.22.0.jar
rename to src/libraries/google_apis_old/google-api-client-1.22.0.jar
diff --git a/bin/libraries/google_apis/google-api-services-drive-v2-rev263-1.22.0.jar b/src/libraries/google_apis_old/google-api-services-drive-v2-rev263-1.22.0.jar
similarity index 100%
rename from bin/libraries/google_apis/google-api-services-drive-v2-rev263-1.22.0.jar
rename to src/libraries/google_apis_old/google-api-services-drive-v2-rev263-1.22.0.jar
diff --git a/bin/libraries/google_apis/google-api-services-drive-v3-rev68-1.22.0.jar b/src/libraries/google_apis_old/google-api-services-drive-v3-rev68-1.22.0.jar
similarity index 100%
rename from bin/libraries/google_apis/google-api-services-drive-v3-rev68-1.22.0.jar
rename to src/libraries/google_apis_old/google-api-services-drive-v3-rev68-1.22.0.jar
diff --git a/bin/libraries/google_apis/google-http-client-1.22.0.jar b/src/libraries/google_apis_old/google-http-client-1.22.0.jar
similarity index 100%
rename from bin/libraries/google_apis/google-http-client-1.22.0.jar
rename to src/libraries/google_apis_old/google-http-client-1.22.0.jar
diff --git a/bin/libraries/google_apis/google-http-client-jackson2-1.22.0.jar b/src/libraries/google_apis_old/google-http-client-jackson2-1.22.0.jar
similarity index 100%
rename from bin/libraries/google_apis/google-http-client-jackson2-1.22.0.jar
rename to src/libraries/google_apis_old/google-http-client-jackson2-1.22.0.jar
diff --git a/bin/libraries/google_apis/google-oauth-client-1.22.0.jar b/src/libraries/google_apis_old/google-oauth-client-1.22.0.jar
similarity index 100%
rename from bin/libraries/google_apis/google-oauth-client-1.22.0.jar
rename to src/libraries/google_apis_old/google-oauth-client-1.22.0.jar
diff --git a/bin/libraries/google_apis/google-oauth-client-java6-1.22.0.jar b/src/libraries/google_apis_old/google-oauth-client-java6-1.22.0.jar
similarity index 100%
rename from bin/libraries/google_apis/google-oauth-client-java6-1.22.0.jar
rename to src/libraries/google_apis_old/google-oauth-client-java6-1.22.0.jar
diff --git a/bin/libraries/google_apis/google-oauth-client-jetty-1.22.0.jar b/src/libraries/google_apis_old/google-oauth-client-jetty-1.22.0.jar
similarity index 100%
rename from bin/libraries/google_apis/google-oauth-client-jetty-1.22.0.jar
rename to src/libraries/google_apis_old/google-oauth-client-jetty-1.22.0.jar
diff --git a/bin/libraries/google_apis/jackson-core-2.8.8.jar b/src/libraries/google_apis_old/jackson-core-2.8.8.jar
similarity index 100%
rename from bin/libraries/google_apis/jackson-core-2.8.8.jar
rename to src/libraries/google_apis_old/jackson-core-2.8.8.jar
diff --git a/bin/libraries/google_apis/javax.servlet-api-3.1.0.jar b/src/libraries/google_apis_old/javax.servlet-api-3.1.0.jar
similarity index 100%
rename from bin/libraries/google_apis/javax.servlet-api-3.1.0.jar
rename to src/libraries/google_apis_old/javax.servlet-api-3.1.0.jar
diff --git a/bin/libraries/google_apis/jetty-6.1.25.jar b/src/libraries/google_apis_old/jetty-6.1.25.jar
similarity index 100%
rename from bin/libraries/google_apis/jetty-6.1.25.jar
rename to src/libraries/google_apis_old/jetty-6.1.25.jar
diff --git a/bin/libraries/google_apis/jetty-util-6.1.25.jar b/src/libraries/google_apis_old/jetty-util-6.1.25.jar
similarity index 100%
rename from bin/libraries/google_apis/jetty-util-6.1.25.jar
rename to src/libraries/google_apis_old/jetty-util-6.1.25.jar