diff --git a/civicrm/.gitignore b/civicrm/.gitignore.core
similarity index 100%
rename from civicrm/.gitignore
rename to civicrm/.gitignore.core
diff --git a/civicrm/ext/api4/.gitignore b/civicrm/ext/api4/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..0d74f04789166dd6cb2fd3f914b95fd3a3278937
--- /dev/null
+++ b/civicrm/ext/api4/.gitignore
@@ -0,0 +1,74 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen### Linux template
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+### macOS template
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+### Windows template
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
diff --git a/civicrm/packages/HTML/QuickForm/utils.php b/civicrm/packages/HTML/QuickForm/utils.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b606796b716992ab281e71c1a5fb1abb2e3f8cd
--- /dev/null
+++ b/civicrm/packages/HTML/QuickForm/utils.php
@@ -0,0 +1,159 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * utility functions
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.01 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_01.txt If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category HTML
+ * @package HTML_QuickForm
+ * @author Chuck Burgess <ashnazg@php.net>
+ * @copyright 2001-2018 The PHP Group
+ * @license http://www.php.net/license/3_01.txt PHP License 3.01
+ * @version CVS: $Id$
+ * @link http://pear.php.net/package/HTML_QuickForm
+ */
+
+/**
+ * Provides a collection of static methods for array manipulation.
+ *
+ * (courtesy of CiviCRM project (https://civicrm.org/)
+ *
+ * @category HTML
+ * @package HTML_QuickForm
+ * @author Chuck Burgess <ashnazg@php.net>
+ * @version Release: 3.2.16
+ * @since 3.2
+ */
+class HTML_QuickForm_utils
+{
+ /**
+ * Get a single value from an array-tree.
+ *
+ * @param array $values Ex: ['foo' => ['bar' => 123]].
+ * @param array $path Ex: ['foo', 'bar'].
+ * @param mixed $default
+ * @return mixed Ex 123.
+ *
+ * @access public
+ * @static
+ */
+ function pathGet($values, $path, $default = NULL) {
+ foreach ($path as $key) {
+ if (!is_array($values) || !isset($values[$key])) {
+ return $default;
+ }
+ $values = $values[$key];
+ }
+ return $values;
+ }
+
+ /**
+ * Check if a key isset which may be several layers deep.
+ *
+ * This is a helper for when the calling function does not know how many layers deep
+ * the path array is so cannot easily check.
+ *
+ * @param array $values
+ * @param array $path
+ * @return bool
+ *
+ * @access public
+ * @static
+ */
+ function pathIsset($values, $path) {
+ foreach ($path as $key) {
+ if (!is_array($values) || !isset($values[$key])) {
+ return FALSE;
+ }
+ $values = $values[$key];
+ }
+ return TRUE;
+ }
+
+ /**
+ * Set a single value in an array tree.
+ *
+ * @param array $values Ex: ['foo' => ['bar' => 123]].
+ * @param array $pathParts Ex: ['foo', 'bar'].
+ * @param mixed $value Ex: 456.
+ * @return void
+ *
+ * @access public
+ * @static
+ */
+ function pathSet(&$values, $pathParts, $value) {
+ $r = &$values;
+ $last = array_pop($pathParts);
+ foreach ($pathParts as $part) {
+ if (!isset($r[$part])) {
+ $r[$part] = array();
+ }
+ $r = &$r[$part];
+ }
+ $r[$last] = $value;
+ }
+
+ /**
+ * Check if a key isset which may be several layers deep.
+ *
+ * This is a helper for when the calling function does not know how many layers deep the
+ * path array is so cannot easily check.
+ *
+ * @param array $array
+ * @param array $path
+ * @return bool
+ *
+ * @access public
+ * @static
+ */
+ function recursiveIsset($array, $path) {
+ return self::pathIsset($array, $path);
+ }
+
+ /**
+ * Check if a key isset which may be several layers deep.
+ *
+ * This is a helper for when the calling function does not know how many layers deep the
+ * path array is so cannot easily check.
+ *
+ * @param array $array
+ * @param array $path An array of keys,
+ * e.g [0, 'bob', 8] where we want to check if $array[0]['bob'][8]
+ * @param mixed $default Value to return if not found.
+ * @return bool
+ *
+ * @access public
+ * @static
+ */
+ function recursiveValue($array, $path, $default = NULL) {
+ return self::pathGet($array, $path, $default);
+ }
+
+ /**
+ * Append the value to the array using the key provided.
+ *
+ * e.g if value is 'llama' & path is [0, 'email', 'location'] result will be
+ * [0 => ['email' => ['location' => 'llama']]
+ *
+ * @param $path
+ * @param $value
+ * @param array $source
+ * @return array
+ *
+ * @access public
+ * @static
+ */
+ function recursiveBuild($path, $value, $source = array()) {
+ self::pathSet($source, $path, $value);
+ return $source;
+ }
+}
+?>
\ No newline at end of file
diff --git a/civicrm/vendor/symfony/config/.gitignore b/civicrm/vendor/symfony/config/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c49a5d8df5c6548379f00c77fe572a7217bce218
--- /dev/null
+++ b/civicrm/vendor/symfony/config/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/civicrm/vendor/symfony/dependency-injection/.gitignore b/civicrm/vendor/symfony/dependency-injection/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c49a5d8df5c6548379f00c77fe572a7217bce218
--- /dev/null
+++ b/civicrm/vendor/symfony/dependency-injection/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/civicrm/vendor/symfony/event-dispatcher/.gitignore b/civicrm/vendor/symfony/event-dispatcher/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c49a5d8df5c6548379f00c77fe572a7217bce218
--- /dev/null
+++ b/civicrm/vendor/symfony/event-dispatcher/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/civicrm/vendor/symfony/filesystem/.gitignore b/civicrm/vendor/symfony/filesystem/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c49a5d8df5c6548379f00c77fe572a7217bce218
--- /dev/null
+++ b/civicrm/vendor/symfony/filesystem/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/civicrm/vendor/symfony/finder/.gitignore b/civicrm/vendor/symfony/finder/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c49a5d8df5c6548379f00c77fe572a7217bce218
--- /dev/null
+++ b/civicrm/vendor/symfony/finder/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/civicrm/vendor/symfony/process/.gitignore b/civicrm/vendor/symfony/process/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c49a5d8df5c6548379f00c77fe572a7217bce218
--- /dev/null
+++ b/civicrm/vendor/symfony/process/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml