diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup
index dc2367ddd..58b38510c 100755
--- a/src/etc/rc.php_ini_setup
+++ b/src/etc/rc.php_ini_setup
@@ -130,7 +130,7 @@ post_max_size = 200M
 html_errors = Off
 zlib.output_compression = Off
 zlib.output_compression_level = 1
-include_path = ".:/usr/local/etc/inc:/usr/local/www:/usr/local/captiveportal:/usr/local/pkg:/usr/local/opnsense/mvc:/usr/local/share/pear"
+include_path = ".:/usr/local/etc/inc:/usr/local/www:/usr/local/captiveportal:/usr/local/pkg:/usr/local/opnsense/mvc:/usr/local/share/pear:/usr/local/opnsense/contrib"
 ignore_repeated_errors = on
 error_reporting = E_ALL ^ (E_WARNING | E_NOTICE | E_DEPRECATED | E_STRICT)
 display_errors=on
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Auth/Abstract.php b/src/opnsense/contrib/google-api-php-client/Google/Auth/Abstract.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Auth/Abstract.php
rename to src/opnsense/contrib/google-api-php-client/Google/Auth/Abstract.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Auth/AppIdentity.php b/src/opnsense/contrib/google-api-php-client/Google/Auth/AppIdentity.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Auth/AppIdentity.php
rename to src/opnsense/contrib/google-api-php-client/Google/Auth/AppIdentity.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Auth/AssertionCredentials.php b/src/opnsense/contrib/google-api-php-client/Google/Auth/AssertionCredentials.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Auth/AssertionCredentials.php
rename to src/opnsense/contrib/google-api-php-client/Google/Auth/AssertionCredentials.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Auth/ComputeEngine.php b/src/opnsense/contrib/google-api-php-client/Google/Auth/ComputeEngine.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Auth/ComputeEngine.php
rename to src/opnsense/contrib/google-api-php-client/Google/Auth/ComputeEngine.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Auth/Exception.php b/src/opnsense/contrib/google-api-php-client/Google/Auth/Exception.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Auth/Exception.php
rename to src/opnsense/contrib/google-api-php-client/Google/Auth/Exception.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Auth/LoginTicket.php b/src/opnsense/contrib/google-api-php-client/Google/Auth/LoginTicket.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Auth/LoginTicket.php
rename to src/opnsense/contrib/google-api-php-client/Google/Auth/LoginTicket.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Auth/OAuth2.php b/src/opnsense/contrib/google-api-php-client/Google/Auth/OAuth2.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Auth/OAuth2.php
rename to src/opnsense/contrib/google-api-php-client/Google/Auth/OAuth2.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Auth/Simple.php b/src/opnsense/contrib/google-api-php-client/Google/Auth/Simple.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Auth/Simple.php
rename to src/opnsense/contrib/google-api-php-client/Google/Auth/Simple.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Cache/Abstract.php b/src/opnsense/contrib/google-api-php-client/Google/Cache/Abstract.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Cache/Abstract.php
rename to src/opnsense/contrib/google-api-php-client/Google/Cache/Abstract.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Cache/Apc.php b/src/opnsense/contrib/google-api-php-client/Google/Cache/Apc.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Cache/Apc.php
rename to src/opnsense/contrib/google-api-php-client/Google/Cache/Apc.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Cache/Exception.php b/src/opnsense/contrib/google-api-php-client/Google/Cache/Exception.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Cache/Exception.php
rename to src/opnsense/contrib/google-api-php-client/Google/Cache/Exception.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Cache/File.php b/src/opnsense/contrib/google-api-php-client/Google/Cache/File.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Cache/File.php
rename to src/opnsense/contrib/google-api-php-client/Google/Cache/File.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Cache/Memcache.php b/src/opnsense/contrib/google-api-php-client/Google/Cache/Memcache.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Cache/Memcache.php
rename to src/opnsense/contrib/google-api-php-client/Google/Cache/Memcache.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Cache/Null.php b/src/opnsense/contrib/google-api-php-client/Google/Cache/Null.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Cache/Null.php
rename to src/opnsense/contrib/google-api-php-client/Google/Cache/Null.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Client.php b/src/opnsense/contrib/google-api-php-client/Google/Client.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Client.php
rename to src/opnsense/contrib/google-api-php-client/Google/Client.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Collection.php b/src/opnsense/contrib/google-api-php-client/Google/Collection.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Collection.php
rename to src/opnsense/contrib/google-api-php-client/Google/Collection.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Config.php b/src/opnsense/contrib/google-api-php-client/Google/Config.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Config.php
rename to src/opnsense/contrib/google-api-php-client/Google/Config.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Exception.php b/src/opnsense/contrib/google-api-php-client/Google/Exception.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Exception.php
rename to src/opnsense/contrib/google-api-php-client/Google/Exception.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Http/Batch.php b/src/opnsense/contrib/google-api-php-client/Google/Http/Batch.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Http/Batch.php
rename to src/opnsense/contrib/google-api-php-client/Google/Http/Batch.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Http/CacheParser.php b/src/opnsense/contrib/google-api-php-client/Google/Http/CacheParser.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Http/CacheParser.php
rename to src/opnsense/contrib/google-api-php-client/Google/Http/CacheParser.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Http/MediaFileUpload.php b/src/opnsense/contrib/google-api-php-client/Google/Http/MediaFileUpload.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Http/MediaFileUpload.php
rename to src/opnsense/contrib/google-api-php-client/Google/Http/MediaFileUpload.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Http/REST.php b/src/opnsense/contrib/google-api-php-client/Google/Http/REST.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Http/REST.php
rename to src/opnsense/contrib/google-api-php-client/Google/Http/REST.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Http/Request.php b/src/opnsense/contrib/google-api-php-client/Google/Http/Request.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Http/Request.php
rename to src/opnsense/contrib/google-api-php-client/Google/Http/Request.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/IO/Abstract.php b/src/opnsense/contrib/google-api-php-client/Google/IO/Abstract.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/IO/Abstract.php
rename to src/opnsense/contrib/google-api-php-client/Google/IO/Abstract.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/IO/Curl.php b/src/opnsense/contrib/google-api-php-client/Google/IO/Curl.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/IO/Curl.php
rename to src/opnsense/contrib/google-api-php-client/Google/IO/Curl.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/IO/Exception.php b/src/opnsense/contrib/google-api-php-client/Google/IO/Exception.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/IO/Exception.php
rename to src/opnsense/contrib/google-api-php-client/Google/IO/Exception.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/IO/Stream.php b/src/opnsense/contrib/google-api-php-client/Google/IO/Stream.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/IO/Stream.php
rename to src/opnsense/contrib/google-api-php-client/Google/IO/Stream.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/IO/cacerts.pem b/src/opnsense/contrib/google-api-php-client/Google/IO/cacerts.pem
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/IO/cacerts.pem
rename to src/opnsense/contrib/google-api-php-client/Google/IO/cacerts.pem
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Logger/Abstract.php b/src/opnsense/contrib/google-api-php-client/Google/Logger/Abstract.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Logger/Abstract.php
rename to src/opnsense/contrib/google-api-php-client/Google/Logger/Abstract.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Logger/Exception.php b/src/opnsense/contrib/google-api-php-client/Google/Logger/Exception.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Logger/Exception.php
rename to src/opnsense/contrib/google-api-php-client/Google/Logger/Exception.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Logger/File.php b/src/opnsense/contrib/google-api-php-client/Google/Logger/File.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Logger/File.php
rename to src/opnsense/contrib/google-api-php-client/Google/Logger/File.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Logger/Null.php b/src/opnsense/contrib/google-api-php-client/Google/Logger/Null.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Logger/Null.php
rename to src/opnsense/contrib/google-api-php-client/Google/Logger/Null.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Logger/Psr.php b/src/opnsense/contrib/google-api-php-client/Google/Logger/Psr.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Logger/Psr.php
rename to src/opnsense/contrib/google-api-php-client/Google/Logger/Psr.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Model.php b/src/opnsense/contrib/google-api-php-client/Google/Model.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Model.php
rename to src/opnsense/contrib/google-api-php-client/Google/Model.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service.php b/src/opnsense/contrib/google-api-php-client/Google/Service.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/AdExchangeBuyer.php b/src/opnsense/contrib/google-api-php-client/Google/Service/AdExchangeBuyer.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/AdExchangeBuyer.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/AdExchangeBuyer.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/AdExchangeSeller.php b/src/opnsense/contrib/google-api-php-client/Google/Service/AdExchangeSeller.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/AdExchangeSeller.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/AdExchangeSeller.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/AdSense.php b/src/opnsense/contrib/google-api-php-client/Google/Service/AdSense.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/AdSense.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/AdSense.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/AdSenseHost.php b/src/opnsense/contrib/google-api-php-client/Google/Service/AdSenseHost.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/AdSenseHost.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/AdSenseHost.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Admin.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Admin.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Admin.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Admin.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Analytics.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Analytics.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Analytics.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Analytics.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/AndroidEnterprise.php b/src/opnsense/contrib/google-api-php-client/Google/Service/AndroidEnterprise.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/AndroidEnterprise.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/AndroidEnterprise.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/AndroidPublisher.php b/src/opnsense/contrib/google-api-php-client/Google/Service/AndroidPublisher.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/AndroidPublisher.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/AndroidPublisher.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/AppState.php b/src/opnsense/contrib/google-api-php-client/Google/Service/AppState.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/AppState.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/AppState.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Appsactivity.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Appsactivity.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Appsactivity.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Appsactivity.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Audit.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Audit.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Audit.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Audit.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Autoscaler.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Autoscaler.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Autoscaler.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Autoscaler.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Bigquery.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Bigquery.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Bigquery.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Bigquery.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Blogger.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Blogger.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Blogger.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Blogger.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Books.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Books.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Books.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Books.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Calendar.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Calendar.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Calendar.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Calendar.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/CivicInfo.php b/src/opnsense/contrib/google-api-php-client/Google/Service/CivicInfo.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/CivicInfo.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/CivicInfo.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/CloudMonitoring.php b/src/opnsense/contrib/google-api-php-client/Google/Service/CloudMonitoring.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/CloudMonitoring.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/CloudMonitoring.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Cloudlatencytest.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Cloudlatencytest.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Cloudlatencytest.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Cloudlatencytest.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Compute.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Compute.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Compute.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Compute.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Container.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Container.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Container.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Container.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Coordinate.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Coordinate.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Coordinate.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Coordinate.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Customsearch.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Customsearch.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Customsearch.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Customsearch.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Dataflow.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Dataflow.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Dataflow.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Dataflow.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Datastore.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Datastore.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Datastore.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Datastore.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Deploymentmanager.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Deploymentmanager.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Deploymentmanager.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Deploymentmanager.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Dfareporting.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Dfareporting.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Dfareporting.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Dfareporting.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Directory.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Directory.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Directory.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Directory.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Dns.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Dns.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Dns.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Dns.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/DoubleClickBidManager.php b/src/opnsense/contrib/google-api-php-client/Google/Service/DoubleClickBidManager.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/DoubleClickBidManager.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/DoubleClickBidManager.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Doubleclicksearch.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Doubleclicksearch.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Doubleclicksearch.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Doubleclicksearch.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Drive.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Drive.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Drive.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Drive.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Exception.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Exception.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Exception.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Exception.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Fitness.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Fitness.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Fitness.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Fitness.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Freebase.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Freebase.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Freebase.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Freebase.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Fusiontables.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Fusiontables.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Fusiontables.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Fusiontables.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Games.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Games.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Games.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Games.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/GamesConfiguration.php b/src/opnsense/contrib/google-api-php-client/Google/Service/GamesConfiguration.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/GamesConfiguration.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/GamesConfiguration.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/GamesManagement.php b/src/opnsense/contrib/google-api-php-client/Google/Service/GamesManagement.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/GamesManagement.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/GamesManagement.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Genomics.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Genomics.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Genomics.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Genomics.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Gmail.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Gmail.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Gmail.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Gmail.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/GroupsMigration.php b/src/opnsense/contrib/google-api-php-client/Google/Service/GroupsMigration.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/GroupsMigration.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/GroupsMigration.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Groupssettings.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Groupssettings.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Groupssettings.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Groupssettings.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/IdentityToolkit.php b/src/opnsense/contrib/google-api-php-client/Google/Service/IdentityToolkit.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/IdentityToolkit.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/IdentityToolkit.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Licensing.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Licensing.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Licensing.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Licensing.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Manager.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Manager.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Manager.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Manager.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/MapsEngine.php b/src/opnsense/contrib/google-api-php-client/Google/Service/MapsEngine.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/MapsEngine.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/MapsEngine.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Mirror.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Mirror.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Mirror.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Mirror.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Oauth2.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Oauth2.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Oauth2.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Oauth2.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Pagespeedonline.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Pagespeedonline.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Pagespeedonline.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Pagespeedonline.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Plus.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Plus.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Plus.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Plus.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/PlusDomains.php b/src/opnsense/contrib/google-api-php-client/Google/Service/PlusDomains.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/PlusDomains.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/PlusDomains.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Prediction.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Prediction.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Prediction.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Prediction.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Pubsub.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Pubsub.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Pubsub.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Pubsub.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/QPXExpress.php b/src/opnsense/contrib/google-api-php-client/Google/Service/QPXExpress.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/QPXExpress.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/QPXExpress.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Replicapool.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Replicapool.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Replicapool.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Replicapool.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Replicapoolupdater.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Replicapoolupdater.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Replicapoolupdater.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Replicapoolupdater.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Reports.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Reports.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Reports.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Reports.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Reseller.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Reseller.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Reseller.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Reseller.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Resource.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Resource.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Resource.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Resource.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Resourceviews.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Resourceviews.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Resourceviews.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Resourceviews.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/SQLAdmin.php b/src/opnsense/contrib/google-api-php-client/Google/Service/SQLAdmin.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/SQLAdmin.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/SQLAdmin.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/ShoppingContent.php b/src/opnsense/contrib/google-api-php-client/Google/Service/ShoppingContent.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/ShoppingContent.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/ShoppingContent.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/SiteVerification.php b/src/opnsense/contrib/google-api-php-client/Google/Service/SiteVerification.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/SiteVerification.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/SiteVerification.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Spectrum.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Spectrum.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Spectrum.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Spectrum.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Storage.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Storage.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Storage.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Storage.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/TagManager.php b/src/opnsense/contrib/google-api-php-client/Google/Service/TagManager.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/TagManager.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/TagManager.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Taskqueue.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Taskqueue.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Taskqueue.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Taskqueue.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Tasks.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Tasks.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Tasks.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Tasks.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Translate.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Translate.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Translate.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Translate.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Urlshortener.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Urlshortener.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Urlshortener.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Urlshortener.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Webfonts.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Webfonts.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Webfonts.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Webfonts.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/Webmasters.php b/src/opnsense/contrib/google-api-php-client/Google/Service/Webmasters.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/Webmasters.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/Webmasters.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/YouTube.php b/src/opnsense/contrib/google-api-php-client/Google/Service/YouTube.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/YouTube.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/YouTube.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Service/YouTubeAnalytics.php b/src/opnsense/contrib/google-api-php-client/Google/Service/YouTubeAnalytics.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Service/YouTubeAnalytics.php
rename to src/opnsense/contrib/google-api-php-client/Google/Service/YouTubeAnalytics.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Signer/Abstract.php b/src/opnsense/contrib/google-api-php-client/Google/Signer/Abstract.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Signer/Abstract.php
rename to src/opnsense/contrib/google-api-php-client/Google/Signer/Abstract.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Signer/P12.php b/src/opnsense/contrib/google-api-php-client/Google/Signer/P12.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Signer/P12.php
rename to src/opnsense/contrib/google-api-php-client/Google/Signer/P12.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Task/Exception.php b/src/opnsense/contrib/google-api-php-client/Google/Task/Exception.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Task/Exception.php
rename to src/opnsense/contrib/google-api-php-client/Google/Task/Exception.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Task/Retryable.php b/src/opnsense/contrib/google-api-php-client/Google/Task/Retryable.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Task/Retryable.php
rename to src/opnsense/contrib/google-api-php-client/Google/Task/Retryable.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Task/Runner.php b/src/opnsense/contrib/google-api-php-client/Google/Task/Runner.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Task/Runner.php
rename to src/opnsense/contrib/google-api-php-client/Google/Task/Runner.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Utils.php b/src/opnsense/contrib/google-api-php-client/Google/Utils.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Utils.php
rename to src/opnsense/contrib/google-api-php-client/Google/Utils.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Utils/URITemplate.php b/src/opnsense/contrib/google-api-php-client/Google/Utils/URITemplate.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Utils/URITemplate.php
rename to src/opnsense/contrib/google-api-php-client/Google/Utils/URITemplate.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Verifier/Abstract.php b/src/opnsense/contrib/google-api-php-client/Google/Verifier/Abstract.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Verifier/Abstract.php
rename to src/opnsense/contrib/google-api-php-client/Google/Verifier/Abstract.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/Verifier/Pem.php b/src/opnsense/contrib/google-api-php-client/Google/Verifier/Pem.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/Verifier/Pem.php
rename to src/opnsense/contrib/google-api-php-client/Google/Verifier/Pem.php
diff --git a/src/opnsense/mvc/app/library/Google/API/src/Google/autoload.php b/src/opnsense/contrib/google-api-php-client/Google/autoload.php
similarity index 100%
rename from src/opnsense/mvc/app/library/Google/API/src/Google/autoload.php
rename to src/opnsense/contrib/google-api-php-client/Google/autoload.php
diff --git a/src/opnsense/mvc/app/library/Google/API/Drive.php b/src/opnsense/mvc/app/library/Google/API/Drive.php
index e353dc552..52120cf1a 100644
--- a/src/opnsense/mvc/app/library/Google/API/Drive.php
+++ b/src/opnsense/mvc/app/library/Google/API/Drive.php
@@ -52,7 +52,7 @@ class Drive
     public function __construct()
     {
         // hook in Google's autoloader
-        require_once(__DIR__."/src/Google/autoload.php");
+        require_once("google-api-php-client/Google/autoload.php");
     }
 
     /**