diff --git a/lib/checker-qual-3.12.0.jar b/lib/googleAPIclient/checker-qual-3.12.0.jar
similarity index 100%
rename from lib/checker-qual-3.12.0.jar
rename to lib/googleAPIclient/checker-qual-3.12.0.jar
diff --git a/lib/commons-logging-1.2.jar b/lib/googleAPIclient/commons-logging-1.2.jar
similarity index 100%
rename from lib/commons-logging-1.2.jar
rename to lib/googleAPIclient/commons-logging-1.2.jar
diff --git a/lib/error_prone_annotations-2.11.0.jar b/lib/googleAPIclient/error_prone_annotations-2.11.0.jar
similarity index 100%
rename from lib/error_prone_annotations-2.11.0.jar
rename to lib/googleAPIclient/error_prone_annotations-2.11.0.jar
diff --git a/lib/failureaccess-1.0.1.jar b/lib/googleAPIclient/failureaccess-1.0.1.jar
similarity index 100%
rename from lib/failureaccess-1.0.1.jar
rename to lib/googleAPIclient/failureaccess-1.0.1.jar
diff --git a/lib/google-api-client-2.0.0.jar b/lib/googleAPIclient/google-api-client-2.0.0.jar
similarity index 100%
rename from lib/google-api-client-2.0.0.jar
rename to lib/googleAPIclient/google-api-client-2.0.0.jar
diff --git a/lib/google-api-client-2.0.0.jar.properties b/lib/googleAPIclient/google-api-client-2.0.0.jar.properties
similarity index 100%
rename from lib/google-api-client-2.0.0.jar.properties
rename to lib/googleAPIclient/google-api-client-2.0.0.jar.properties
diff --git a/lib/google-api-client-appengine-2.0.0.jar b/lib/googleAPIclient/google-api-client-appengine-2.0.0.jar
similarity index 100%
rename from lib/google-api-client-appengine-2.0.0.jar
rename to lib/googleAPIclient/google-api-client-appengine-2.0.0.jar
diff --git a/lib/google-api-client-gson-2.0.0.jar b/lib/googleAPIclient/google-api-client-gson-2.0.0.jar
similarity index 100%
rename from lib/google-api-client-gson-2.0.0.jar
rename to lib/googleAPIclient/google-api-client-gson-2.0.0.jar
diff --git a/lib/google-api-client-gson-2.0.0.jar.properties b/lib/googleAPIclient/google-api-client-gson-2.0.0.jar.properties
similarity index 100%
rename from lib/google-api-client-gson-2.0.0.jar.properties
rename to lib/googleAPIclient/google-api-client-gson-2.0.0.jar.properties
diff --git a/lib/google-api-client-jackson2-2.0.0.jar b/lib/googleAPIclient/google-api-client-jackson2-2.0.0.jar
similarity index 100%
rename from lib/google-api-client-jackson2-2.0.0.jar
rename to lib/googleAPIclient/google-api-client-jackson2-2.0.0.jar
diff --git a/lib/google-api-client-jackson2-2.0.0.jar.properties b/lib/googleAPIclient/google-api-client-jackson2-2.0.0.jar.properties
similarity index 100%
rename from lib/google-api-client-jackson2-2.0.0.jar.properties
rename to lib/googleAPIclient/google-api-client-jackson2-2.0.0.jar.properties
diff --git a/lib/google-api-client-java6-2.0.0.jar b/lib/googleAPIclient/google-api-client-java6-2.0.0.jar
similarity index 100%
rename from lib/google-api-client-java6-2.0.0.jar
rename to lib/googleAPIclient/google-api-client-java6-2.0.0.jar
diff --git a/lib/google-api-client-protobuf-2.0.0.jar b/lib/googleAPIclient/google-api-client-protobuf-2.0.0.jar
similarity index 100%
rename from lib/google-api-client-protobuf-2.0.0.jar
rename to lib/googleAPIclient/google-api-client-protobuf-2.0.0.jar
diff --git a/lib/google-api-client-protobuf-2.0.0.jar.properties b/lib/googleAPIclient/google-api-client-protobuf-2.0.0.jar.properties
similarity index 100%
rename from lib/google-api-client-protobuf-2.0.0.jar.properties
rename to lib/googleAPIclient/google-api-client-protobuf-2.0.0.jar.properties
diff --git a/lib/google-api-client-servlet-2.0.0.jar b/lib/googleAPIclient/google-api-client-servlet-2.0.0.jar
similarity index 100%
rename from lib/google-api-client-servlet-2.0.0.jar
rename to lib/googleAPIclient/google-api-client-servlet-2.0.0.jar
diff --git a/lib/google-api-client-xml-2.0.0.jar b/lib/googleAPIclient/google-api-client-xml-2.0.0.jar
similarity index 100%
rename from lib/google-api-client-xml-2.0.0.jar
rename to lib/googleAPIclient/google-api-client-xml-2.0.0.jar
diff --git a/lib/google-api-client-xml-2.0.0.jar.properties b/lib/googleAPIclient/google-api-client-xml-2.0.0.jar.properties
similarity index 100%
rename from lib/google-api-client-xml-2.0.0.jar.properties
rename to lib/googleAPIclient/google-api-client-xml-2.0.0.jar.properties
diff --git a/lib/google-http-client-1.42.1.jar b/lib/googleAPIclient/google-http-client-1.42.1.jar
similarity index 100%
rename from lib/google-http-client-1.42.1.jar
rename to lib/googleAPIclient/google-http-client-1.42.1.jar
diff --git a/lib/google-http-client-1.42.1.jar.properties b/lib/googleAPIclient/google-http-client-1.42.1.jar.properties
similarity index 100%
rename from lib/google-http-client-1.42.1.jar.properties
rename to lib/googleAPIclient/google-http-client-1.42.1.jar.properties
diff --git a/lib/google-http-client-apache-v2-1.42.1.jar b/lib/googleAPIclient/google-http-client-apache-v2-1.42.1.jar
similarity index 100%
rename from lib/google-http-client-apache-v2-1.42.1.jar
rename to lib/googleAPIclient/google-http-client-apache-v2-1.42.1.jar
diff --git a/lib/google-http-client-appengine-1.42.1.jar b/lib/googleAPIclient/google-http-client-appengine-1.42.1.jar
similarity index 100%
rename from lib/google-http-client-appengine-1.42.1.jar
rename to lib/googleAPIclient/google-http-client-appengine-1.42.1.jar
diff --git a/lib/google-http-client-gson-1.42.1.jar b/lib/googleAPIclient/google-http-client-gson-1.42.1.jar
similarity index 100%
rename from lib/google-http-client-gson-1.42.1.jar
rename to lib/googleAPIclient/google-http-client-gson-1.42.1.jar
diff --git a/lib/google-http-client-gson-1.42.1.jar.properties b/lib/googleAPIclient/google-http-client-gson-1.42.1.jar.properties
similarity index 100%
rename from lib/google-http-client-gson-1.42.1.jar.properties
rename to lib/googleAPIclient/google-http-client-gson-1.42.1.jar.properties
diff --git a/lib/google-http-client-jackson-1.42.1.jar.properties b/lib/googleAPIclient/google-http-client-jackson-1.42.1.jar.properties
similarity index 100%
rename from lib/google-http-client-jackson-1.42.1.jar.properties
rename to lib/googleAPIclient/google-http-client-jackson-1.42.1.jar.properties
diff --git a/lib/google-http-client-jackson2-1.42.1.jar.properties b/lib/googleAPIclient/google-http-client-jackson2-1.42.1.jar.properties
similarity index 100%
rename from lib/google-http-client-jackson2-1.42.1.jar.properties
rename to lib/googleAPIclient/google-http-client-jackson2-1.42.1.jar.properties
diff --git a/lib/google-http-client-jdo-1.42.1.jar.properties b/lib/googleAPIclient/google-http-client-jdo-1.42.1.jar.properties
similarity index 100%
rename from lib/google-http-client-jdo-1.42.1.jar.properties
rename to lib/googleAPIclient/google-http-client-jdo-1.42.1.jar.properties
diff --git a/lib/google-http-client-protobuf-1.42.1.jar b/lib/googleAPIclient/google-http-client-protobuf-1.42.1.jar
similarity index 100%
rename from lib/google-http-client-protobuf-1.42.1.jar
rename to lib/googleAPIclient/google-http-client-protobuf-1.42.1.jar
diff --git a/lib/google-http-client-protobuf-1.42.1.jar.properties b/lib/googleAPIclient/google-http-client-protobuf-1.42.1.jar.properties
similarity index 100%
rename from lib/google-http-client-protobuf-1.42.1.jar.properties
rename to lib/googleAPIclient/google-http-client-protobuf-1.42.1.jar.properties
diff --git a/lib/google-http-client-xml-1.42.1.jar b/lib/googleAPIclient/google-http-client-xml-1.42.1.jar
similarity index 100%
rename from lib/google-http-client-xml-1.42.1.jar
rename to lib/googleAPIclient/google-http-client-xml-1.42.1.jar
diff --git a/lib/google-http-client-xml-1.42.1.jar.properties b/lib/googleAPIclient/google-http-client-xml-1.42.1.jar.properties
similarity index 100%
rename from lib/google-http-client-xml-1.42.1.jar.properties
rename to lib/googleAPIclient/google-http-client-xml-1.42.1.jar.properties
diff --git a/lib/google-oauth-client-1.34.1.jar b/lib/googleAPIclient/google-oauth-client-1.34.1.jar
similarity index 100%
rename from lib/google-oauth-client-1.34.1.jar
rename to lib/googleAPIclient/google-oauth-client-1.34.1.jar
diff --git a/lib/google-oauth-client-1.34.1.jar.properties b/lib/googleAPIclient/google-oauth-client-1.34.1.jar.properties
similarity index 100%
rename from lib/google-oauth-client-1.34.1.jar.properties
rename to lib/googleAPIclient/google-oauth-client-1.34.1.jar.properties
diff --git a/lib/grpc-context-1.27.2.jar b/lib/googleAPIclient/grpc-context-1.27.2.jar
similarity index 100%
rename from lib/grpc-context-1.27.2.jar
rename to lib/googleAPIclient/grpc-context-1.27.2.jar
diff --git a/lib/gson-2.1.jar.properties b/lib/googleAPIclient/gson-2.1.jar.properties
similarity index 100%
rename from lib/gson-2.1.jar.properties
rename to lib/googleAPIclient/gson-2.1.jar.properties
diff --git a/lib/gson-2.9.0.jar b/lib/googleAPIclient/gson-2.9.0.jar
similarity index 100%
rename from lib/gson-2.9.0.jar
rename to lib/googleAPIclient/gson-2.9.0.jar
diff --git a/lib/guava-31.1-jre.jar b/lib/googleAPIclient/guava-31.1-jre.jar
similarity index 100%
rename from lib/guava-31.1-jre.jar
rename to lib/googleAPIclient/guava-31.1-jre.jar
diff --git a/lib/httpclient-4.5.13.jar b/lib/googleAPIclient/httpclient-4.5.13.jar
similarity index 100%
rename from lib/httpclient-4.5.13.jar
rename to lib/googleAPIclient/httpclient-4.5.13.jar
diff --git a/lib/httpcore-4.4.15.jar b/lib/googleAPIclient/httpcore-4.4.15.jar
similarity index 100%
rename from lib/httpcore-4.4.15.jar
rename to lib/googleAPIclient/httpcore-4.4.15.jar
diff --git a/lib/j2objc-annotations-1.3.jar b/lib/googleAPIclient/j2objc-annotations-1.3.jar
similarity index 100%
rename from lib/j2objc-annotations-1.3.jar
rename to lib/googleAPIclient/j2objc-annotations-1.3.jar
diff --git a/lib/jackson-core-2.9.2.jar.properties b/lib/googleAPIclient/jackson-core-2.9.2.jar.properties
similarity index 100%
rename from lib/jackson-core-2.9.2.jar.properties
rename to lib/googleAPIclient/jackson-core-2.9.2.jar.properties
diff --git a/lib/jsr305-3.0.2.jar b/lib/googleAPIclient/jsr305-3.0.2.jar
similarity index 100%
rename from lib/jsr305-3.0.2.jar
rename to lib/googleAPIclient/jsr305-3.0.2.jar
diff --git a/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/lib/googleAPIclient/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
similarity index 100%
rename from lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
rename to lib/googleAPIclient/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
diff --git a/lib/opencensus-api-0.31.1.jar b/lib/googleAPIclient/opencensus-api-0.31.1.jar
similarity index 100%
rename from lib/opencensus-api-0.31.1.jar
rename to lib/googleAPIclient/opencensus-api-0.31.1.jar
diff --git a/lib/opencensus-contrib-http-util-0.31.1.jar b/lib/googleAPIclient/opencensus-contrib-http-util-0.31.1.jar
similarity index 100%
rename from lib/opencensus-contrib-http-util-0.31.1.jar
rename to lib/googleAPIclient/opencensus-contrib-http-util-0.31.1.jar
diff --git a/lib/protobuf-java-2.4.1.jar.properties b/lib/googleAPIclient/protobuf-java-2.4.1.jar.properties
similarity index 100%
rename from lib/protobuf-java-2.4.1.jar.properties
rename to lib/googleAPIclient/protobuf-java-2.4.1.jar.properties
diff --git a/lib/protobuf-java-3.21.2.jar b/lib/googleAPIclient/protobuf-java-3.21.2.jar
similarity index 100%
rename from lib/protobuf-java-3.21.2.jar
rename to lib/googleAPIclient/protobuf-java-3.21.2.jar
diff --git a/lib/xpp3-1.1.4c.jar b/lib/googleAPIclient/xpp3-1.1.4c.jar
similarity index 100%
rename from lib/xpp3-1.1.4c.jar
rename to lib/googleAPIclient/xpp3-1.1.4c.jar
diff --git a/lib/libSources/checker-qual-3.12.0-sources.jar b/lib/libSources/checker-qual-3.12.0-sources.jar
deleted file mode 100644
index 65bbe58..0000000
Binary files a/lib/libSources/checker-qual-3.12.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/commons-logging-1.2-sources.jar b/lib/libSources/commons-logging-1.2-sources.jar
deleted file mode 100644
index 10655e5..0000000
Binary files a/lib/libSources/commons-logging-1.2-sources.jar and /dev/null differ
diff --git a/lib/libSources/error_prone_annotations-2.11.0-sources.jar b/lib/libSources/error_prone_annotations-2.11.0-sources.jar
deleted file mode 100644
index 4410202..0000000
Binary files a/lib/libSources/error_prone_annotations-2.11.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/failureaccess-1.0.1-sources.jar b/lib/libSources/failureaccess-1.0.1-sources.jar
deleted file mode 100644
index 0c429f2..0000000
Binary files a/lib/libSources/failureaccess-1.0.1-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-api-client-2.0.0-sources.jar b/lib/libSources/google-api-client-2.0.0-sources.jar
deleted file mode 100644
index 1f4c97b..0000000
Binary files a/lib/libSources/google-api-client-2.0.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-api-client-android-2.0.0-sources.jar b/lib/libSources/google-api-client-android-2.0.0-sources.jar
deleted file mode 100644
index 82fe0ca..0000000
Binary files a/lib/libSources/google-api-client-android-2.0.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-api-client-appengine-2.0.0-sources.jar b/lib/libSources/google-api-client-appengine-2.0.0-sources.jar
deleted file mode 100644
index 180ffcf..0000000
Binary files a/lib/libSources/google-api-client-appengine-2.0.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-api-client-gson-2.0.0-sources.jar b/lib/libSources/google-api-client-gson-2.0.0-sources.jar
deleted file mode 100644
index 54b52d9..0000000
Binary files a/lib/libSources/google-api-client-gson-2.0.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-api-client-jackson2-2.0.0-sources.jar b/lib/libSources/google-api-client-jackson2-2.0.0-sources.jar
deleted file mode 100644
index cd7d45c..0000000
Binary files a/lib/libSources/google-api-client-jackson2-2.0.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-api-client-java6-2.0.0-sources.jar b/lib/libSources/google-api-client-java6-2.0.0-sources.jar
deleted file mode 100644
index 4d4cb95..0000000
Binary files a/lib/libSources/google-api-client-java6-2.0.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-api-client-protobuf-2.0.0-sources.jar b/lib/libSources/google-api-client-protobuf-2.0.0-sources.jar
deleted file mode 100644
index b7ac99f..0000000
Binary files a/lib/libSources/google-api-client-protobuf-2.0.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-api-client-servlet-2.0.0-sources.jar b/lib/libSources/google-api-client-servlet-2.0.0-sources.jar
deleted file mode 100644
index 3db2e90..0000000
Binary files a/lib/libSources/google-api-client-servlet-2.0.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-api-client-xml-2.0.0-sources.jar b/lib/libSources/google-api-client-xml-2.0.0-sources.jar
deleted file mode 100644
index 8af38e1..0000000
Binary files a/lib/libSources/google-api-client-xml-2.0.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-http-client-1.42.1-sources.jar b/lib/libSources/google-http-client-1.42.1-sources.jar
deleted file mode 100644
index b92e10d..0000000
Binary files a/lib/libSources/google-http-client-1.42.1-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-http-client-apache-v2-1.42.1-sources.jar b/lib/libSources/google-http-client-apache-v2-1.42.1-sources.jar
deleted file mode 100644
index fe879b5..0000000
Binary files a/lib/libSources/google-http-client-apache-v2-1.42.1-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-http-client-appengine-1.42.1-sources.jar b/lib/libSources/google-http-client-appengine-1.42.1-sources.jar
deleted file mode 100644
index 4b9c765..0000000
Binary files a/lib/libSources/google-http-client-appengine-1.42.1-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-http-client-gson-1.42.1-sources.jar b/lib/libSources/google-http-client-gson-1.42.1-sources.jar
deleted file mode 100644
index 687631e..0000000
Binary files a/lib/libSources/google-http-client-gson-1.42.1-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-http-client-protobuf-1.42.1-sources.jar b/lib/libSources/google-http-client-protobuf-1.42.1-sources.jar
deleted file mode 100644
index ad878ae..0000000
Binary files a/lib/libSources/google-http-client-protobuf-1.42.1-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-http-client-xml-1.42.1-sources.jar b/lib/libSources/google-http-client-xml-1.42.1-sources.jar
deleted file mode 100644
index 18244f8..0000000
Binary files a/lib/libSources/google-http-client-xml-1.42.1-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-oauth-client-1.34.1-sources.jar b/lib/libSources/google-oauth-client-1.34.1-sources.jar
deleted file mode 100644
index d787d39..0000000
Binary files a/lib/libSources/google-oauth-client-1.34.1-sources.jar and /dev/null differ
diff --git a/lib/libSources/google-oauth-client-java6-1.34.1-sources.jar b/lib/libSources/google-oauth-client-java6-1.34.1-sources.jar
deleted file mode 100644
index d524513..0000000
Binary files a/lib/libSources/google-oauth-client-java6-1.34.1-sources.jar and /dev/null differ
diff --git a/lib/libSources/grpc-context-1.27.2-sources.jar b/lib/libSources/grpc-context-1.27.2-sources.jar
deleted file mode 100644
index c175671..0000000
Binary files a/lib/libSources/grpc-context-1.27.2-sources.jar and /dev/null differ
diff --git a/lib/libSources/gson-2.9.0-sources.jar b/lib/libSources/gson-2.9.0-sources.jar
deleted file mode 100644
index d138752..0000000
Binary files a/lib/libSources/gson-2.9.0-sources.jar and /dev/null differ
diff --git a/lib/libSources/guava-31.1-jre-sources.jar b/lib/libSources/guava-31.1-jre-sources.jar
deleted file mode 100644
index cdbcaa4..0000000
Binary files a/lib/libSources/guava-31.1-jre-sources.jar and /dev/null differ
diff --git a/lib/libSources/httpclient-4.5.13-sources.jar b/lib/libSources/httpclient-4.5.13-sources.jar
deleted file mode 100644
index 76a50b5..0000000
Binary files a/lib/libSources/httpclient-4.5.13-sources.jar and /dev/null differ
diff --git a/lib/libSources/httpcore-4.4.15-sources.jar b/lib/libSources/httpcore-4.4.15-sources.jar
deleted file mode 100644
index 9ba64dc..0000000
Binary files a/lib/libSources/httpcore-4.4.15-sources.jar and /dev/null differ
diff --git a/lib/libSources/j2objc-annotations-1.3-sources.jar b/lib/libSources/j2objc-annotations-1.3-sources.jar
deleted file mode 100644
index 282ab73..0000000
Binary files a/lib/libSources/j2objc-annotations-1.3-sources.jar and /dev/null differ
diff --git a/lib/libSources/jsr305-3.0.2-sources.jar b/lib/libSources/jsr305-3.0.2-sources.jar
deleted file mode 100644
index 65c518c..0000000
Binary files a/lib/libSources/jsr305-3.0.2-sources.jar and /dev/null differ
diff --git a/lib/libSources/opencensus-api-0.31.1-sources.jar b/lib/libSources/opencensus-api-0.31.1-sources.jar
deleted file mode 100644
index 2f0dbbd..0000000
Binary files a/lib/libSources/opencensus-api-0.31.1-sources.jar and /dev/null differ
diff --git a/lib/libSources/opencensus-contrib-http-util-0.31.1-sources.jar b/lib/libSources/opencensus-contrib-http-util-0.31.1-sources.jar
deleted file mode 100644
index 69f75c8..0000000
Binary files a/lib/libSources/opencensus-contrib-http-util-0.31.1-sources.jar and /dev/null differ
diff --git a/lib/libSources/protobuf-java-3.21.2-sources.jar b/lib/libSources/protobuf-java-3.21.2-sources.jar
deleted file mode 100644
index 3b18856..0000000
Binary files a/lib/libSources/protobuf-java-3.21.2-sources.jar and /dev/null differ
diff --git a/lib/libSources/xpp3-1.1.4c-sources.jar b/lib/libSources/xpp3-1.1.4c-sources.jar
deleted file mode 100644
index 036c7b7..0000000
Binary files a/lib/libSources/xpp3-1.1.4c-sources.jar and /dev/null differ
diff --git a/lib/spigot-api-1.20.4-R0.1-SNAPSHOT.jar b/lib/spigotLib/spigot-api-1.20.4-R0.1-SNAPSHOT.jar
similarity index 100%
rename from lib/spigot-api-1.20.4-R0.1-SNAPSHOT.jar
rename to lib/spigotLib/spigot-api-1.20.4-R0.1-SNAPSHOT.jar