diff --git a/bin/drush-install.sh b/bin/drush-install.sh
index 356173273cb..e1079a09a7b 100755
--- a/bin/drush-install.sh
+++ b/bin/drush-install.sh
@@ -11,6 +11,7 @@ uk.co.compucorp.civicrm.hremails
 ## List of extensions defining basic entity types
 ENTITY_EXTS=\
 org.civicrm.hrbank,\
+org.civicrm.hrdemog,\
 org.civicrm.hrjobcontract,\
 com.civicrm.hrjobroles,\
 org.civicrm.hrmed,\
diff --git a/bin/git-release.sh b/bin/git-release.sh
index 4cd9dfd2411..8e774a84937 100755
--- a/bin/git-release.sh
+++ b/bin/git-release.sh
@@ -5,6 +5,7 @@ fileName=""
 ENTITY_EXTS=( hrbank \
 hrcareer \
 hrcase \
+hrdemog \
 hrim \
 hrmed \
 hrprofile \
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index ee4b8e25247..f58606fcc40 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -16,32 +16,4 @@ The [civihr-installer](https://github.com/compucorp/civihr-installer) script has
 $ civibuild create hr17
 ```
 
-Read the drush-install.sh for details.
-
-## Install (Option B: Manual)
-
-CiviHR includes over a dozen extensions. These can be activated piecemeal.
-The following extensions provide the major features and may be activated
-individually:
-
- * org.civicrm.hrbank: Bank Details
- * org.civicrm.hrcareer: Career History
- * org.civicrm.hremerg: Emergency Contacts
- * org.civicrm.hrabsence: Absences
- * org.civicrm.hrjobcontract: Job Contracts
- * org.civicrm.hrmed: Medical and Disability
- * org.civicrm.hrqual: Qualifications
- * org.civicrm.hrreport: Reporting
- * org.civicrm.hrstaffdir: Staff Directory
-  * org.civicrm.hrcase: Case
- * org.civicrm.hrcaseutils: Case Utils
- * org.civicrm.hrim: Instant messanger link
- * org.civicrm.hrrecruitment: Recruitment
- * org.civicrm.hrprofile: Profile
-
-Finally, these two extensions build on top of the others:
-
- * uk.co.compucorp.civicrm.hrsampledata: Generate random example data
- * org.civicrm.hrui: Trim/revise CiviCRM UI for CiviHR users
-
 Please check the [civibuild documentation](https://docs.civicrm.org/dev/en/latest/tools/civibuild/) for more information on all the available params. 
diff --git a/hrdemog/CRM/HRDemog/Upgrader.php b/hrdemog/CRM/HRDemog/Upgrader.php
new file mode 100644
index 00000000000..e32e54c4e78
--- /dev/null
+++ b/hrdemog/CRM/HRDemog/Upgrader.php
@@ -0,0 +1,185 @@
+<?php
+/*
++--------------------------------------------------------------------+
+| CiviHR version 1.4                                                 |
++--------------------------------------------------------------------+
+| Copyright CiviCRM LLC (c) 2004-2014                                |
++--------------------------------------------------------------------+
+| This file is a part of CiviCRM.                                    |
+|                                                                    |
+| CiviCRM is free software; you can copy, modify, and distribute it  |
+| under the terms of the GNU Affero General Public License           |
+| Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+|                                                                    |
+| CiviCRM is distributed in the hope that it will be useful, but     |
+| WITHOUT ANY WARRANTY; without even the implied warranty of         |
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+| See the GNU Affero General Public License for more details.        |
+|                                                                    |
+| You should have received a copy of the GNU Affero General Public   |
+| License and the CiviCRM Licensing Exception along                  |
+| with this program; if not, contact CiviCRM LLC                     |
+| at info[AT]civicrm[DOT]org. If you have questions about the        |
+| GNU Affero General Public License or the licensing of CiviCRM,     |
+| see the CiviCRM license FAQ at http://civicrm.org/licensing        |
++--------------------------------------------------------------------+
+*/
+
+/**
+ * Collection of upgrade steps
+ */
+class CRM_HRDemog_Upgrader extends CRM_HRDemog_Upgrader_Base {
+
+  // By convention, functions that look like "function upgrade_NNNN()" are
+  // upgrade tasks. They are executed in order (like Drupal's hook_update_N).
+
+  /**
+   * Example: Run an external SQL script when the module is installed
+   *
+  public function install() {
+    $this->executeSqlFile('sql/myinstall.sql');
+  }
+
+  /**
+   * Example: Run an external SQL script when the module is uninstalled
+   *
+  public function uninstall() {
+   $this->executeSqlFile('sql/myuninstall.sql');
+  }
+
+  /**
+   * Example: Run a simple query when a module is enabled
+   *
+  public function enable() {
+    CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 1 WHERE bar = "whiz"');
+  }
+
+  /**
+   * Example: Run a simple query when a module is disabled
+   *
+  public function disable() {
+    CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 0 WHERE bar = "whiz"');
+  }
+
+  /**
+   * Example: Run a couple simple queries
+   *
+   * @return TRUE on success
+   * @throws Exception
+   *
+  public function upgrade_4200() {
+    $this->ctx->log->info('Applying update 4200');
+    CRM_Core_DAO::executeQuery('UPDATE foo SET bar = "whiz"');
+    CRM_Core_DAO::executeQuery('DELETE FROM bang WHERE willy = wonka(2)');
+    return TRUE;
+  } // */
+
+
+  /**
+   * Example: Run an external SQL script
+   *
+   * @return TRUE on success
+   * @throws Exception
+  public function upgrade_4201() {
+    $this->ctx->log->info('Applying update 4201');
+    // this path is relative to the extension base dir
+    $this->executeSqlFile('sql/upgrade_4201.sql');
+    return TRUE;
+  } // */
+
+
+  /**
+   * Example: Run a slow upgrade process by breaking it up into smaller chunk
+   *
+   * @return TRUE on success
+   * @throws Exception
+  public function upgrade_4202() {
+    $this->ctx->log->info('Planning update 4202'); // PEAR Log interface
+
+    $this->addTask(ts('Process first step'), 'processPart1', $arg1, $arg2);
+    $this->addTask(ts('Process second step'), 'processPart2', $arg3, $arg4);
+    $this->addTask(ts('Process second step'), 'processPart3', $arg5);
+    return TRUE;
+  }
+  public function processPart1($arg1, $arg2) { sleep(10); return TRUE; }
+  public function processPart2($arg3, $arg4) { sleep(10); return TRUE; }
+  public function processPart3($arg5) { sleep(10); return TRUE; }
+  // */
+
+
+  /**
+   * Example: Run an upgrade with a query that touches many (potentially
+   * millions) of records by breaking it up into smaller chunks.
+   *
+   * @return TRUE on success
+   * @throws Exception
+  public function upgrade_4203() {
+    $this->ctx->log->info('Planning update 4203'); // PEAR Log interface
+
+    $minId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(min(id),0) FROM civicrm_contribution');
+    $maxId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(max(id),0) FROM civicrm_contribution');
+    for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) {
+      $endId = $startId + self::BATCH_SIZE - 1;
+      $title = ts('Upgrade Batch (%1 => %2)', array(
+        1 => $startId,
+        2 => $endId,
+      ));
+      $sql = '
+        UPDATE civicrm_contribution SET foobar = whiz(wonky()+wanker)
+        WHERE id BETWEEN %1 and %2
+      ';
+      $params = array(
+        1 => array($startId, 'Integer'),
+        2 => array($endId, 'Integer'),
+      );
+      $this->addTask($title, 'executeSql', $sql, $params);
+    }
+    return TRUE;
+  } // */
+
+  public function upgrade_1400() {
+    $this->ctx->log->info('Planning update 1400'); // PEAR Log interface
+    foreach (array('ethnicity_20130725123943', 'religion_20130725124132', 'sexual_orientation_20130725124348', 'marital_status_20130913084916') as $key => $value) {
+      $optParams = array(
+        'option_group_id' => $value,
+        'label' => 'Prefer Not to Say',
+        'value' => 'Prefer Not to Say',
+        'name' => 'Prefer_Not_to_Say',
+      );
+      civicrm_api3('OptionValue', 'create', $optParams);
+      $optParam = array(
+        'option_group_id' => $value,
+        'label' => 'Not Applicable',
+        'value' => 'Not Applicable',
+        'name' => 'Not_Applicable',
+      );
+      civicrm_api3('OptionValue', 'create', $optParam);
+    }
+
+    $sql = "UPDATE civicrm_custom_field JOIN civicrm_custom_group ON civicrm_custom_group.id = civicrm_custom_field.custom_group_id SET civicrm_custom_field.default_value = CASE WHEN civicrm_custom_field.name = 'Ethnicity' THEN ' Not Applicable ' ELSE  'Not Applicable' END WHERE civicrm_custom_field.name IN ('Ethnicity','Religion', 'Sexual_Orientation', 'Marital_Status') AND civicrm_custom_group.name = 'Extended_Demographics'";
+    CRM_Core_DAO::executeQuery($sql);
+    CRM_Core_DAO::executeQuery("UPDATE civicrm_custom_group SET is_reserved = 0, collapse_display = 1 where name = 'Extended_Demographics'");
+    return TRUE;
+  }
+
+  /**
+   * Upgrade CustomGroup, setting Extended_Demographics is_reserved value to YES
+   *
+   * @return bool
+   */
+  public function upgrade_1401() {
+    $result = civicrm_api3('CustomGroup', 'get', [
+      'sequential' => 1,
+      'return' => ['id'],
+      'name' => 'Extended_Demographics',
+    ]);
+  
+    civicrm_api3('CustomGroup', 'create', [
+      'id' => $result['id'],
+      'is_reserved' => 1,
+    ]);
+
+    return TRUE;
+  }
+
+}
diff --git a/hrdemog/CRM/HRDemog/Upgrader/Base.php b/hrdemog/CRM/HRDemog/Upgrader/Base.php
new file mode 100644
index 00000000000..6e2a3fb9267
--- /dev/null
+++ b/hrdemog/CRM/HRDemog/Upgrader/Base.php
@@ -0,0 +1,298 @@
+<?php
+
+// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
+
+/**
+ * Base class which provides helpers to execute upgrade logic
+ */
+class CRM_HRDemog_Upgrader_Base {
+
+  /**
+   * @var varies, subclass of htis
+   */
+  static $instance;
+
+  /**
+   * @var CRM_Queue_TaskContext
+   */
+  protected $ctx;
+
+  /**
+   * @var string, eg 'com.example.myextension'
+   */
+  protected $extensionName;
+
+  /**
+   * @var string, full path to the extension's source tree
+   */
+  protected $extensionDir;
+
+  /**
+   * @var array(revisionNumber) sorted numerically
+   */
+  private $revisions;
+
+  /**
+   * Obtain a refernece to the active upgrade handler
+   */
+  static public function instance() {
+    if (! self::$instance) {
+      // FIXME auto-generate
+      self::$instance = new CRM_HRDemog_Upgrader(
+        'org.civicrm.hrdemog',
+        realpath(__DIR__ .'/../../../')
+      );
+    }
+    return self::$instance;
+  }
+
+  /**
+   * Adapter that lets you add normal (non-static) member functions to the queue.
+   *
+   * Note: Each upgrader instance should only be associated with one
+   * task-context; otherwise, this will be non-reentrant.
+   *
+   * @code
+   * CRM_HRDemog_Upgrader_Base::_queueAdapter($ctx, 'methodName', 'arg1', 'arg2');
+   * @endcode
+   */
+  static public function _queueAdapter() {
+    $instance = self::instance();
+    $args = func_get_args();
+    $instance->ctx = array_shift($args);
+    $instance->queue = $instance->ctx->queue;
+    $method = array_shift($args);
+    return call_user_func_array(array($instance, $method), $args);
+  }
+
+  public function __construct($extensionName, $extensionDir) {
+    $this->extensionName = $extensionName;
+    $this->extensionDir = $extensionDir;
+  }
+
+  // ******** Task helpers ********
+
+  /**
+   * Run a CustomData file
+   *
+   * @param string $relativePath the CustomData XML file path (relative to this extension's dir)
+   * @return bool
+   */
+  public function executeCustomDataFile($relativePath) {
+    $xml_file = $this->extensionDir . '/' . $relativePath;
+    return $this->executeCustomDataFileByAbsPath($xml_file);
+  }
+
+  /**
+   * Run a CustomData file
+   *
+   * @param string $xml_file  the CustomData XML file path (absolute path)
+   * @return bool
+   */
+  protected static function executeCustomDataFileByAbsPath($xml_file) {
+    require_once 'CRM/Utils/Migrate/Import.php';
+    $import = new CRM_Utils_Migrate_Import();
+    $import->run($xml_file);
+    return TRUE;
+  }
+
+  /**
+   * Run a SQL file
+   *
+   * @param string $relativePath the SQL file path (relative to this extension's dir)
+   * @return bool
+   */
+  public function executeSqlFile($relativePath) {
+    CRM_Utils_File::sourceSQLFile(
+      CIVICRM_DSN,
+      $this->extensionDir . '/' . $relativePath
+    );
+    return TRUE;
+  }
+
+  /**
+   * Run one SQL query
+   *
+   * This is just a wrapper for CRM_Core_DAO::executeSql, but it
+   * provides syntatic sugar for queueing several tasks that
+   * run different queries
+   */
+  public function executeSql($query, $params = array()) {
+    // FIXME verify that we raise an exception on error
+    CRM_Core_DAO::executeSql($query, $params);
+    return TRUE;
+  }
+
+  /**
+   * Syntatic sugar for enqueuing a task which calls a function
+   * in this class. The task is weighted so that it is processed
+   * as part of the currently-pending revision.
+   *
+   * After passing the $funcName, you can also pass parameters that will go to
+   * the function. Note that all params must be serializable.
+   */
+  public function addTask($title) {
+    $args = func_get_args();
+    $title = array_shift($args);
+    $task = new CRM_Queue_Task(
+      array(get_class($this), '_queueAdapter'),
+      $args,
+      $title
+    );
+    return $this->queue->createItem($task, array('weight' => -1));
+  }
+
+  // ******** Revision-tracking helpers ********
+
+  /**
+   * Determine if there are any pending revisions
+   *
+   * @return bool
+   */
+  public function hasPendingRevisions() {
+    $revisions = $this->getRevisions();
+    $currentRevision = $this->getCurrentRevision();
+
+    if (empty($revisions)) {
+      return FALSE;
+    }
+    if (empty($currentRevision)) {
+      return TRUE;
+    }
+
+    return ($currentRevision < max($revisions));
+  }
+
+  /**
+   * Add any pending revisions to the queue
+   */
+  public function enqueuePendingRevisions(CRM_Queue_Queue $queue) {
+    $this->queue = $queue;
+
+    $currentRevision = $this->getCurrentRevision();
+    foreach ($this->getRevisions() as $revision) {
+      if ($revision > $currentRevision) {
+        $title = ts('Upgrade %1 to revision %2', array(
+          1 => $this->extensionName,
+          2 => $revision,
+        ));
+
+        // note: don't use addTask() because it sets weight=-1
+
+        $task = new CRM_Queue_Task(
+          array(get_class($this), '_queueAdapter'),
+          array('upgrade_' . $revision),
+          $title
+        );
+        $this->queue->createItem($task);
+
+        $task = new CRM_Queue_Task(
+          array(get_class($this), '_queueAdapter'),
+          array('setCurrentRevision', $revision),
+          $title
+        );
+        $this->queue->createItem($task);
+      }
+    }
+  }
+
+  /**
+   * Get a list of revisions
+   *
+   * @return array(revisionNumbers) sorted numerically
+   */
+  public function getRevisions() {
+    if (! is_array($this->revisions)) {
+      $this->revisions = array();
+
+      $clazz = new ReflectionClass(get_class($this));
+      $methods = $clazz->getMethods();
+      foreach ($methods as $method) {
+        if (preg_match('/^upgrade_(.*)/', $method->name, $matches)) {
+          $this->revisions[] = $matches[1];
+        }
+      }
+      sort($this->revisions, SORT_NUMERIC);
+    }
+
+    return $this->revisions;
+  }
+
+  public function getCurrentRevision() {
+    // return CRM_Core_BAO_Extension::getSchemaVersion($this->extensionName);
+    $key = $this->extensionName . ':version';
+    return CRM_Core_BAO_Setting::getItem('Extension', $key);
+  }
+
+  public function setCurrentRevision($revision) {
+    // We call this during hook_civicrm_install, but the underlying SQL
+    // UPDATE fails because the extension record hasn't been INSERTed yet.
+    // Instead, track revisions in our own namespace.
+    // CRM_Core_BAO_Extension::setSchemaVersion($this->extensionName, $revision);
+
+    $key = $this->extensionName . ':version';
+    CRM_Core_BAO_Setting::setItem($revision, 'Extension', $key);
+    return TRUE;
+  }
+
+  // ******** Hook delegates ********
+
+  public function onInstall() {
+    $files = glob($this->extensionDir . '/sql/*_install.sql');
+    if (is_array($files)) {
+      foreach ($files as $file) {
+        CRM_Utils_File::sourceSQLFile(CIVICRM_DSN, $file);
+      }
+    }
+    $files = glob($this->extensionDir . '/xml/*_install.xml');
+    if (is_array($files)) {
+      foreach ($files as $file) {
+        $this->executeCustomDataFileByAbsPath($file);
+      }
+    }
+    if (is_callable(array($this, 'install'))) {
+      $this->install();
+    }
+    $revisions = $this->getRevisions();
+    if (!empty($revisions)) {
+      $this->setCurrentRevision(max($revisions));
+    }
+  }
+
+  public function onUninstall() {
+    if (is_callable(array($this, 'uninstall'))) {
+      $this->uninstall();
+    }
+    $files = glob($this->extensionDir . '/sql/*_uninstall.sql');
+    if (is_array($files)) {
+      foreach ($files as $file) {
+        CRM_Utils_File::sourceSQLFile(CIVICRM_DSN, $file);
+      }
+    }
+    $this->setCurrentRevision(NULL);
+  }
+
+  public function onEnable() {
+    // stub for possible future use
+    if (is_callable(array($this, 'enable'))) {
+      $this->enable();
+    }
+  }
+
+  public function onDisable() {
+    // stub for possible future use
+    if (is_callable(array($this, 'disable'))) {
+      $this->disable();
+    }
+  }
+
+  public function onUpgrade($op, CRM_Queue_Queue $queue = NULL) {
+    switch($op) {
+      case 'check':
+        return array($this->hasPendingRevisions());
+      case 'enqueue':
+        return $this->enqueuePendingRevisions($queue);
+      default:
+    }
+  }
+}
diff --git a/hrdemog/hrdemog.civix.php b/hrdemog/hrdemog.civix.php
new file mode 100644
index 00000000000..6b646c8cd27
--- /dev/null
+++ b/hrdemog/hrdemog.civix.php
@@ -0,0 +1,215 @@
+<?php
+
+// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
+
+/**
+ * (Delegated) Implementation of hook_civicrm_config
+ */
+function _hrdemog_civix_civicrm_config(&$config = NULL) {
+  static $configured = FALSE;
+  if ($configured) return;
+  $configured = TRUE;
+
+  $template =& CRM_Core_Smarty::singleton();
+
+  $extRoot = dirname( __FILE__ ) . DIRECTORY_SEPARATOR;
+  $extDir = $extRoot . 'templates';
+
+  if ( is_array( $template->template_dir ) ) {
+      array_unshift( $template->template_dir, $extDir );
+  } else {
+      $template->template_dir = array( $extDir, $template->template_dir );
+  }
+
+  $include_path = $extRoot . PATH_SEPARATOR . get_include_path( );
+  set_include_path( $include_path );
+}
+
+/**
+ * (Delegated) Implementation of hook_civicrm_xmlMenu
+ *
+ * @param $files array(string)
+ */
+function _hrdemog_civix_civicrm_xmlMenu(&$files) {
+  foreach (_hrdemog_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
+    $files[] = $file;
+  }
+}
+
+/**
+ * Implementation of hook_civicrm_install
+ */
+function _hrdemog_civix_civicrm_install() {
+  _hrdemog_civix_civicrm_config();
+  if ($upgrader = _hrdemog_civix_upgrader()) {
+    return $upgrader->onInstall();
+  }
+}
+
+/**
+ * Implementation of hook_civicrm_uninstall
+ */
+function _hrdemog_civix_civicrm_uninstall() {
+  _hrdemog_civix_civicrm_config();
+  if ($upgrader = _hrdemog_civix_upgrader()) {
+    return $upgrader->onUninstall();
+  }
+}
+
+/**
+ * (Delegated) Implementation of hook_civicrm_enable
+ */
+function _hrdemog_civix_civicrm_enable() {
+  _hrdemog_civix_civicrm_config();
+  if ($upgrader = _hrdemog_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onEnable'))) {
+      return $upgrader->onEnable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implementation of hook_civicrm_disable
+ */
+function _hrdemog_civix_civicrm_disable() {
+  _hrdemog_civix_civicrm_config();
+  if ($upgrader = _hrdemog_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onDisable'))) {
+      return $upgrader->onDisable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implementation of hook_civicrm_upgrade
+ *
+ * @param $op string, the type of operation being performed; 'check' or 'enqueue'
+ * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
+ *
+ * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *                for 'enqueue', returns void
+ */
+function _hrdemog_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  if ($upgrader = _hrdemog_civix_upgrader()) {
+    return $upgrader->onUpgrade($op, $queue);
+  }
+}
+
+function _hrdemog_civix_upgrader() {
+  if (!file_exists(__DIR__.'/CRM/HRDemog/Upgrader.php')) {
+    return NULL;
+  } else {
+    return CRM_HRDemog_Upgrader_Base::instance();
+  }
+}
+
+/**
+ * Search directory tree for files which match a glob pattern
+ *
+ * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
+ * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ *
+ * @param $dir string, base dir
+ * @param $pattern string, glob pattern, eg "*.txt"
+ * @return array(string)
+ */
+function _hrdemog_civix_find_files($dir, $pattern) {
+  if (is_callable(array('CRM_Utils_File', 'findFiles'))) {
+    return CRM_Utils_File::findFiles($dir, $pattern);
+  }
+
+  $todos = array($dir);
+  $result = array();
+  while (!empty($todos)) {
+    $subdir = array_shift($todos);
+    foreach (_hrdemog_civix_glob("$subdir/$pattern") as $match) {
+      if (!is_dir($match)) {
+        $result[] = $match;
+      }
+    }
+    if ($dh = opendir($subdir)) {
+      while (FALSE !== ($entry = readdir($dh))) {
+        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
+        if ($entry{0} == '.') {
+        } elseif (is_dir($path)) {
+          $todos[] = $path;
+        }
+      }
+      closedir($dh);
+    }
+  }
+  return $result;
+}
+/**
+ * (Delegated) Implementation of hook_civicrm_managed
+ *
+ * Find any *.mgd.php files, merge their content, and return.
+ */
+function _hrdemog_civix_civicrm_managed(&$entities) {
+  $mgdFiles = _hrdemog_civix_find_files(__DIR__, '*.mgd.php');
+  foreach ($mgdFiles as $file) {
+    $es = include $file;
+    foreach ($es as $e) {
+      if (empty($e['module'])) {
+        $e['module'] = 'org.civicrm.hrdemog';
+      }
+      $entities[] = $e;
+    }
+  }
+}
+
+/**
+ * Glob wrapper which is guaranteed to return an array.
+ *
+ * The documentation for glob() says, "On some systems it is impossible to
+ * distinguish between empty match and an error." Anecdotally, the return
+ * result for an empty match is sometimes array() and sometimes FALSE.
+ * This wrapper provides consistency.
+ *
+ * @see http://php.net/glob
+ * @param string $pattern
+ * @return array, possibly empty
+ */
+function _hrdemog_civix_glob($pattern) {
+  $result = glob($pattern);
+  return is_array($result) ? $result : array();
+}
+
+/**
+ * Inserts a navigation menu item at a given place in the hierarchy
+ *
+ * $menu - menu hierarchy
+ * $path - path where insertion should happen (ie. Administer/System Settings)
+ * $item - menu you need to insert (parent/child attributes will be filled for you)
+ * $parentId - used internally to recurse in the menu structure
+ */
+function _hrdemog_civix_insert_navigation_menu(&$menu, $path, $item, $parentId = NULL) {
+  static $navId;
+
+  // If we are done going down the path, insert menu
+  if (empty($path)) {
+    if (!$navId) $navId = CRM_Core_DAO::singleValueQuery("SELECT max(id) FROM civicrm_navigation");
+    $navId ++;
+    $menu[$navId] = array (
+      'attributes' => array_merge($item, array(
+        'label'      => CRM_Utils_Array::value('name', $item),
+        'active'     => 1,
+        'parentID'   => $parentId,
+        'navID'      => $navId,
+      ))
+    );
+    return true;
+  } else {
+    // Find an recurse into the next level down
+    $found = false;
+    $path = explode('/', $path);
+    $first = array_shift($path);
+    foreach ($menu as $key => &$entry) {
+      if ($entry['attributes']['name'] == $first) {
+        if (!$entry['child']) $entry['child'] = array();
+        $found = _hrdemog_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item, $key);
+      }
+    }
+    return $found;
+  }
+}
diff --git a/hrdemog/hrdemog.php b/hrdemog/hrdemog.php
new file mode 100644
index 00000000000..fdff6261f3f
--- /dev/null
+++ b/hrdemog/hrdemog.php
@@ -0,0 +1,116 @@
+<?php
+/*
++--------------------------------------------------------------------+
+| CiviHR version 1.4                                                 |
++--------------------------------------------------------------------+
+| Copyright CiviCRM LLC (c) 2004-2014                                |
++--------------------------------------------------------------------+
+| This file is a part of CiviCRM.                                    |
+|                                                                    |
+| CiviCRM is free software; you can copy, modify, and distribute it  |
+| under the terms of the GNU Affero General Public License           |
+| Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+|                                                                    |
+| CiviCRM is distributed in the hope that it will be useful, but     |
+| WITHOUT ANY WARRANTY; without even the implied warranty of         |
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+| See the GNU Affero General Public License for more details.        |
+|                                                                    |
+| You should have received a copy of the GNU Affero General Public   |
+| License and the CiviCRM Licensing Exception along                  |
+| with this program; if not, contact CiviCRM LLC                     |
+| at info[AT]civicrm[DOT]org. If you have questions about the        |
+| GNU Affero General Public License or the licensing of CiviCRM,     |
+| see the CiviCRM license FAQ at http://civicrm.org/licensing        |
++--------------------------------------------------------------------+
+*/
+
+require_once 'hrdemog.civix.php';
+
+/**
+ * Implementation of hook_civicrm_config
+ */
+function hrdemog_civicrm_config(&$config) {
+  _hrdemog_civix_civicrm_config($config);
+}
+
+/**
+ * Implementation of hook_civicrm_xmlMenu
+ *
+ * @param $files array(string)
+ */
+function hrdemog_civicrm_xmlMenu(&$files) {
+  _hrdemog_civix_civicrm_xmlMenu($files);
+}
+
+/**
+ * Implementation of hook_civicrm_install
+ */
+function hrdemog_civicrm_install() {
+  return _hrdemog_civix_civicrm_install();
+}
+
+/**
+ * Implementation of hook_civicrm_uninstall
+ */
+function hrdemog_civicrm_uninstall() {
+  $customGroup = civicrm_api3('CustomGroup', 'getsingle', array('return' => "id",'name' => "Extended_Demographics",));
+  civicrm_api3('CustomGroup', 'delete', array('id' => $customGroup['id']));
+  //delete optionGroup
+  if ($visaGroupID = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionGroup', 'is_visa_required_20130702051150', 'id', 'name')) {
+    CRM_Core_BAO_OptionGroup::del($visaGroupID);
+  }
+  return _hrdemog_civix_civicrm_uninstall();
+}
+
+/**
+ * Implementation of hook_civicrm_enable
+ */
+function hrdemog_civicrm_enable() {
+  _hrdemog_setActiveFields(1);
+  return _hrdemog_civix_civicrm_enable();
+}
+
+/**
+ * Implementation of hook_civicrm_disable
+ */
+function hrdemog_civicrm_disable() {
+  _hrdemog_setActiveFields(0);
+  return _hrdemog_civix_civicrm_disable();
+}
+
+function _hrdemog_setActiveFields($setActive) {
+  //disable/enable customgroup and customvalue
+  $sql = "UPDATE civicrm_custom_field JOIN civicrm_custom_group on civicrm_custom_group.id = civicrm_custom_field.custom_group_id SET civicrm_custom_field.is_active = {$setActive} WHERE civicrm_custom_group.name = 'Extended_Demographics'";
+  CRM_Core_DAO::executeQuery($sql);
+  CRM_Core_DAO::executeQuery("UPDATE civicrm_custom_group SET is_active = {$setActive} WHERE name = 'Extended_Demographics'");
+
+  //disable/enable optionGroup and optionValue
+  $query = "UPDATE civicrm_option_value JOIN civicrm_option_group on civicrm_option_group.id = civicrm_option_value.option_group_id SET civicrm_option_value.is_active = {$setActive} WHERE civicrm_option_group.name IN ('ethnicity_20130725123943','religion_20130725124132','sexual_orientation_20130725124348','marital_status_20130913084916','is_visa_required_20130702051150')";
+  CRM_Core_DAO::executeQuery($query);
+  CRM_Core_DAO::executeQuery("UPDATE civicrm_option_group SET is_active = {$setActive} WHERE name IN ('ethnicity_20130725123943','religion_20130725124132','sexual_orientation_20130725124348','marital_status_20130913084916','is_visa_required_20130702051150')");
+}
+
+
+/**
+ * Implementation of hook_civicrm_upgrade
+ *
+ * @param $op string, the type of operation being performed; 'check' or 'enqueue'
+ * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
+ *
+ * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *                for 'enqueue', returns void
+ */
+function hrdemog_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  return _hrdemog_civix_civicrm_upgrade($op, $queue);
+}
+
+/**
+ * Implementation of hook_civicrm_managed
+ *
+ * Generate a list of entities to create/deactivate/delete when this module
+ * is installed, disabled, uninstalled.
+ */
+function hrdemog_civicrm_managed(&$entities) {
+  return _hrdemog_civix_civicrm_managed($entities);
+}
diff --git a/hrdemog/info.xml b/hrdemog/info.xml
new file mode 100644
index 00000000000..5df28806d93
--- /dev/null
+++ b/hrdemog/info.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<extension key="org.civicrm.hrdemog" type="module">
+  <file>hrdemog</file>
+  <name>Extended Demographics</name>
+  <description>Add extended demographic fields for the contact</description>
+  <license>AGPL-3.0</license>
+  <maintainer>
+    <author>CiviCRM LLC</author>
+    <email>info@civicrm.org</email>
+  </maintainer>
+  <releaseDate>2018-06-05</releaseDate>
+  <version>1.7.7</version>
+  <develStage>stable</develStage>
+  <compatibility>
+    <ver>4.7</ver>
+  </compatibility>
+  <civix>
+    <namespace>CRM/HRDemog</namespace>
+  </civix>
+</extension>
diff --git a/uk.co.compucorp.civicrm.hrcore/xml/CustomGroups/extended_demographics_install.xml b/hrdemog/xml/auto_install.xml
similarity index 100%
rename from uk.co.compucorp.civicrm.hrcore/xml/CustomGroups/extended_demographics_install.xml
rename to hrdemog/xml/auto_install.xml
diff --git a/hrui/js/dist/hrui.min.js b/hrui/js/dist/hrui.min.js
index 78788ce52f9..609b9715b63 100644
--- a/hrui/js/dist/hrui.min.js
+++ b/hrui/js/dist/hrui.min.js
@@ -1,5 +1,5 @@
 !function(t,o){function n(o){o&&o.departments&&o.departments.length>0?t(".crm-contact-detail-departments").html("<strong>Department:</strong> "+o.departments.join(", ")):t(".crm-contact-detail-departments").html("")}t(document).on("crmLoad",function(o){t(".crm-inline-edit").one("DOMSubtreeModified",function(){var o=t(this).find("form");1===o.length&&o.find("label").each(function(){var o=t(this),n=o.attr("for");t("#"+n).attr("placeholder",o.text())})})}).on("updateContactHeader",function(o,c){var a;void 0!==c.contract&&((a=c.contract)?(t(".crm-summary-contactname-block").removeClass("crm-summary-contactname-block-without-contract"),a.position&&t(".crm-contact-detail-position").html("<strong>Position:</strong> "+a.position),a.location&&t(".crm-contact-detail-location").html("<strong>Normal place of work:</strong> "+a.location)):(t(".crm-summary-contactname-block").addClass("crm-summary-contactname-block-without-contract"),t(".crm-contact-detail-position").html(""),t(".crm-contact-detail-location").html(""),n(null))),void 0!==c.roles&&n(c.roles)})}(CRM.$,CRM._);
-!function(e,t){function a(){var t=e(this)[0].files[0];e("#js-uploaded-file").remove(),void 0!==t&&(e(this).after('<span id="js-uploaded-file" class="uploaded-file">'+t.name+' <span class="uploaded-file-icon-trash"><i class="fa fa-trash-o"></i> Remove</span>'),e(".uploaded-file-icon-trash").on("click",r))}function o(e){e.find("label").attr("for",e.find(".crm-form-date").attr("id"))}function r(){var t=e("#js-uploaded-file").parent().find('input[type="file"]');e("#js-uploaded-file").remove(),t.val("")}function n(t){e(t).removeClass("crm-collapsible collapsed").addClass("crm-summary-block").appendTo(".contactTopBar .contactCardLeft").find(".collapsible-title").hide().end().find(".crm-summary-block").show()}e(document).on("crmLoad",function(t){var r,n,i;1===e(r="input[type='file']").length&&e(r).on("change",a),1===e(".CRM_HRRecruitment_Form_HRVacancy").length&&(o(e('label[for="start_date"]').parents("tr")),o(e('label[for="end_date"]').parents("tr")),e('[name="entryURL"]').val().indexOf(";template=1")>-1&&e(e(".CRM_HRRecruitment_Form_HRVacancy tbody").get(0)).addClass("CRM_HRRecruitment_Form_HRVacancy_Template")),n=t,"contactForm"!==CRM.formName&&"viewSummary"!==CRM.pageName||(e(".crm-contact-job_title",".crm-summary-contactinfo-block").length&&e(".crm-contact-tabs-list #tab_summary a",n.target).text("Personal Details"),n.target,e("#customFields").length<1&&e("#Inline_Custom_Data").detach().find(".label").each(function(){var t=e(this),a=t.next(),o=e("<td/>");o.append(t.find("label")),o.append(e("<br/>")),o.append(a.html()),e("#nick_name").parent().after(o)}),i=n.target,e("div.crm-contact-current_employer, div.crm-contact-job_title",".crm-summary-contactinfo-block").parent("div.crm-summary-row").hide(),e("form#ContactInfo input#employer_id, form#ContactInfo input#job_title",i).closest("div.crm-summary-row").hide(),e("input#employer_id, input#job_title","form#Contact").parent("td").hide(),e(".HRJobContract_Summary",i).insertBefore(e(".crm-summary-contactinfo-block")),e("div.email-signature, td#Email-Bulkmail-html","form#Contact").hide(),e("#Email-Primary","form#Contact").prev("td").prev("td").hide(),e("td#Email-Bulkmail-html, #Email-Primary","form#Contact").prev("td").hide(),e(".crm-demographics-accordion","form#Contact").insertAfter(e(".crm-contactDetails-accordion")),e("tr#Phone_Block_2","form#Contact").length<1&&e("#addPhone").click()),e("#activityCustomData").attr("colspan",3),e("#crm-activity-view-table .crm-case-activity-view-Client .label").html("Contact"),e("span.crm-frozen-field",".crm-profile-name-hrident_tab").closest("div").parent("div").hide(),e(".crm-accordion-header.crm-master-accordion-header").on("click",function(){window.setTimeout(function(){Array.prototype.forEach.call(document.querySelectorAll(".listing-box"),function(e){Ps.initialize(e)})},0)}),e("INPUT#contact_source").parent("td").children("a").click(function(){e("#crm-notification-container .crm-help .notify-content").remove(),e("#crm-notification-container .crm-help p").length&&e("#crm-notification-container .crm-help p").remove(),e("#crm-notification-container .crm-help").append("<p>Source is a useful field where data has been migrated to CiviHR from one or a number of other legacy systems. The Source field will indicate which legacy system the contact has come from.</p>")})}).ready(function(){var t,a,o,r,n,i;e.ajax("/civicrm/hrcore/usermenu?snippet=4",{dataType:"html",success:function(t){var a,o,r;a="civihr-menu",o=e(t),(r=e("<div>")).attr("id",a),r.append(e("#civicrm-menu")),r.append(o),r.insertAfter("#page")}}),t=e(".crm-link-home"),a=e(".crm-logo-sm",t).addClass("chr_logo chr_logo--default-color").removeClass("crm-logo-sm").wrap('<span class="menumain-icon">').parent(),r=a,o=e("li > a",t).first().text("Home").wrapInner('<span class="menumain-label">').prepend(r),n=o,t.off().find("#civicrm-home").before(n).remove(),e(".CRM_HRRecruitment_Form_Application").addClass("crm-form-block"),e(".CRM_HRRecruitment_Form_Application .crm-profile-name-application_profile").addClass("form-layout-compressed"),e("#root-menu-div .menu-item-arrow").each(function(t){var a=e(this);a.before('<i class="fa fa-caret-right menu-item-arrow"></i>'),a.remove()}),i="activetarget",e(".menumain").not(".crm-Self_Service_Portal").hover(function(){e(this).addClass(i)},function(){e(this).removeClass(i)})}),e(".Inline_Custom_Data").length&&n(".Inline_Custom_Data"),n(".Extended_Demographics")}(CRM.$,CRM._);
+!function(e,t){function a(){var t=e(this)[0].files[0];e("#js-uploaded-file").remove(),void 0!==t&&(e(this).after('<span id="js-uploaded-file" class="uploaded-file">'+t.name+' <span class="uploaded-file-icon-trash"><i class="fa fa-trash-o"></i> Remove</span>'),e(".uploaded-file-icon-trash").on("click",o))}function r(e){e.find("label").attr("for",e.find(".crm-form-date").attr("id"))}function o(){var t=e("#js-uploaded-file").parent().find('input[type="file"]');e("#js-uploaded-file").remove(),t.val("")}e(document).on("crmLoad",function(t){var o,i,n;1===e(o="input[type='file']").length&&e(o).on("change",a),1===e(".CRM_HRRecruitment_Form_HRVacancy").length&&(r(e('label[for="start_date"]').parents("tr")),r(e('label[for="end_date"]').parents("tr")),e('[name="entryURL"]').val().indexOf(";template=1")>-1&&e(e(".CRM_HRRecruitment_Form_HRVacancy tbody").get(0)).addClass("CRM_HRRecruitment_Form_HRVacancy_Template")),i=t,"contactForm"!==CRM.formName&&"viewSummary"!==CRM.pageName||(e(".crm-contact-job_title",".crm-summary-contactinfo-block").length&&e(".crm-contact-tabs-list #tab_summary a",i.target).text("Personal Details"),i.target,e(".Inline_Custom_Data").length&&e(".Inline_Custom_Data").removeClass("crm-collapsible collapsed").addClass("crm-summary-block").insertAfter(".crm-summary-contactinfo-block").find(".collapsible-title").hide().end().find(".crm-summary-block").show(),e("#customFields").length<1&&e("#Inline_Custom_Data").detach().find(".label").each(function(){var t=e(this),a=t.next(),r=e("<td/>");r.append(t.find("label")),r.append(e("<br/>")),r.append(a.html()),e("#nick_name").parent().after(r)}),n=i.target,e("div.crm-contact-current_employer, div.crm-contact-job_title",".crm-summary-contactinfo-block").parent("div.crm-summary-row").hide(),e("form#ContactInfo input#employer_id, form#ContactInfo input#job_title",n).closest("div.crm-summary-row").hide(),e("input#employer_id, input#job_title","form#Contact").parent("td").hide(),e(".HRJobContract_Summary",n).insertBefore(e(".crm-summary-contactinfo-block")),e("div.email-signature, td#Email-Bulkmail-html","form#Contact").hide(),e("#Email-Primary","form#Contact").prev("td").prev("td").hide(),e("td#Email-Bulkmail-html, #Email-Primary","form#Contact").prev("td").hide(),e(".crm-demographics-accordion","form#Contact").insertAfter(e(".crm-contactDetails-accordion")),e("tr#Phone_Block_2","form#Contact").length<1&&e("#addPhone").click()),e("#activityCustomData").attr("colspan",3),e("#crm-activity-view-table .crm-case-activity-view-Client .label").html("Contact"),e("span.crm-frozen-field",".crm-profile-name-hrident_tab").closest("div").parent("div").hide(),e(".crm-accordion-header.crm-master-accordion-header").on("click",function(){window.setTimeout(function(){Array.prototype.forEach.call(document.querySelectorAll(".listing-box"),function(e){Ps.initialize(e)})},0)}),e("INPUT#contact_source").parent("td").children("a").click(function(){e("#crm-notification-container .crm-help .notify-content").remove(),e("#crm-notification-container .crm-help p").length&&e("#crm-notification-container .crm-help p").remove(),e("#crm-notification-container .crm-help").append("<p>Source is a useful field where data has been migrated to CiviHR from one or a number of other legacy systems. The Source field will indicate which legacy system the contact has come from.</p>")})}).ready(function(){var t,a,r,o,i,n;e.ajax("/civicrm/hrcore/usermenu?snippet=4",{dataType:"html",success:function(t){var a,r,o;a="civihr-menu",r=e(t),(o=e("<div>")).attr("id",a),o.append(e("#civicrm-menu")),o.append(r),o.insertAfter("#page")}}),t=e(".crm-link-home"),a=e(".crm-logo-sm",t).addClass("chr_logo chr_logo--default-color").removeClass("crm-logo-sm").wrap('<span class="menumain-icon">').parent(),o=a,r=e("li > a",t).first().text("Home").wrapInner('<span class="menumain-label">').prepend(o),i=r,t.off().find("#civicrm-home").before(i).remove(),e(".CRM_HRRecruitment_Form_Application").addClass("crm-form-block"),e(".CRM_HRRecruitment_Form_Application .crm-profile-name-application_profile").addClass("form-layout-compressed"),e("#root-menu-div .menu-item-arrow").each(function(t){var a=e(this);a.before('<i class="fa fa-caret-right menu-item-arrow"></i>'),a.remove()}),n="activetarget",e(".menumain").not(".crm-Self_Service_Portal").hover(function(){e(this).addClass(n)},function(){e(this).removeClass(n)})})}(CRM.$,CRM._);
 !function(t){"use strict";var n=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;t.fn.attrchange=function(t){if(n){var e={subtree:!1,attributes:!0},i=new n(function(n){n.forEach(function(n){t.call(n.target,n)})});return this.each(function(){i.observe(this,e)})}}}(CRM.$);
 !function(t){"use strict";var i=t("body");i.on("click","#bootstrap-theme .btn-slide",function(){var n,a,e=t(this),o=e.children("ul.panel");function c(){t(".civihr-popup").remove(),i.removeClass("civihr-popup-open")}c(),n=o.clone(!0).appendTo(i).addClass("civihr-popup"),a=e.offset(),n.css({left:+a.left-(n.width()-e.outerWidth()),top:+a.top+e.outerHeight()}),n.show(),i.addClass("civihr-popup-open"),n.find("a").click(function(){var i=t(this).parent().index();o.find("li:nth("+i+") a").click()}),e.data("attrchange-is-on")||(e.data("attrchange-is-on",!0),e.attrchange(function(){e.hasClass("btn-slide-active")||c()}))})}(CRM.$);
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["contact.js","hrui.js","civihr-popup/attrchange.js","civihr-popup/civihr-popup.js"],"names":["$","_","updateContactHeaderRolesDetails","roles","departments","length","html","join","document","on","e","one","$form","this","find","each","$label","id","attr","text","data","contract","removeClass","position","location","addClass","CRM","insertFile","fileName","files","remove","undefined","after","name","removeFile","linkLabelToDatepickerInput","$line","$input","parent","val","repositionPersonalDetailsBlock","selector","appendTo","hide","end","show","target","parents","indexOf","get","formName","pageName","detach","$labelCell","$fieldCell","next","$newTd","append","closest","insertBefore","prev","insertAfter","click","window","setTimeout","Array","prototype","forEach","call","querySelectorAll","element","Ps","initialize","children","ready","$menuItem","$wrappedLogo","$customHomeLink","$appLogo","$homeLink","className","ajax","dataType","success","menuMarkup","wrapperId","$menuMarkup","$menuWrapper","wrap","first","wrapInner","prepend","off","before","$element","$arrow","not","hover","MutationObserver","WebKitMutationObserver","MozMutationObserver","fn","attrchange","callback","options","subtree","attributes","observer","mutations","observe","$body","$popupClone","buttonOffset","$button","$popup","closePopupPanels","clone","offset","css","left","width","outerWidth","top","outerHeight","actionIndex","index","hasClass"],"mappings":"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","file":"hrui.min.js","sourcesContent":["(function ($, _) {\n  $(document)\n    .on('crmLoad', function (e) {\n      $('.crm-inline-edit').one('DOMSubtreeModified', function () {\n        var $form = $(this).find('form');\n\n        if ($form.length === 1) {\n          $form.find('label').each(function () {\n            var $label = $(this);\n            var id = $label.attr('for');\n            $('#' + id).attr('placeholder', $label.text());\n          });\n        }\n      });\n    })\n    .on('updateContactHeader', function (e, data) {\n      if (typeof data.contract !== 'undefined') {\n        updateContactHeaderContractDetails(data.contract);\n      }\n\n      if (typeof data.roles !== 'undefined') {\n        updateContactHeaderRolesDetails(data.roles);\n      }\n    });\n\n  /**\n   * Updates the contact header with the given contract details\n   *\n   * @param  {object} contract\n   */\n  function updateContactHeaderContractDetails (contract) {\n    if (contract) {\n      $('.crm-summary-contactname-block').removeClass('crm-summary-contactname-block-without-contract');\n\n      if (contract.position) {\n        $('.crm-contact-detail-position').html('<strong>Position:</strong> ' + contract.position);\n      }\n\n      if (contract.location) {\n        $('.crm-contact-detail-location').html('<strong>Normal place of work:</strong> ' + contract.location);\n      }\n    } else {\n      $('.crm-summary-contactname-block').addClass('crm-summary-contactname-block-without-contract');\n      $('.crm-contact-detail-position').html('');\n      $('.crm-contact-detail-location').html('');\n\n      updateContactHeaderRolesDetails(null);\n    }\n  }\n\n  /**\n   * Updates the contact header with the given roles details\n   *\n   * @param  {object} contract\n   */\n  function updateContactHeaderRolesDetails (roles) {\n    if (roles && roles.departments && roles.departments.length > 0) {\n      $('.crm-contact-detail-departments').html('<strong>Department:</strong> ' + roles.departments.join(', '));\n    } else {\n      $('.crm-contact-detail-departments').html('');\n    }\n  }\n}(CRM.$, CRM._));\n","/* global Ps */\n\n// Copyright CiviCRM LLC 2013. See http://civicrm.org/licensing\n(function ($, _) {\n  $(document)\n    .on('crmLoad', function (e) {\n      addUploadFileListener(\"input[type='file']\");\n      amendVacancyForm();\n      amendContactPageAndForm(e);\n      applyMiscChanges();\n      changeContactSourceFieldHelpText();\n    })\n    .ready(function () {\n      addUserMenuToMainMenu();\n      amendAppLogoMenuItem();\n      amendApplicationForm();\n      useFontAwesomeArrowsInSubMenuItems();\n      toggleActiveClassOnHoverOnAnyMainMenuItem();\n    });\n\n  /**\n   * Customizes the app logo menu item, switching from the CiviCRM logo\n   * to the CiviHR logo, and making the item a direct link instead of a\n   * toggle for a sub menu dropdown\n   */\n  function amendAppLogoMenuItem () {\n    var $menuItem = $('.crm-link-home');\n    var $wrappedLogo = swapAndWrapAppLogo($menuItem);\n    var $customHomeLink = customizeHomeLinkInLogoMenuItem($menuItem, $wrappedLogo);\n\n    removeLogoSubMenuAndKeepOnlyHomeLink($menuItem, $customHomeLink);\n  }\n\n  /**\n   * Adds the user menu by fetching it from the hrcore extension\n   */\n  function addUserMenuToMainMenu () {\n    $.ajax('/civicrm/hrcore/usermenu?snippet=4', {\n      dataType: 'html',\n      success: function (menuMarkup) {\n        injectUserMenuInAMainMenuWrapper(menuMarkup, 'civihr-menu');\n      }\n    });\n  }\n\n  /**\n   * Add an event listener on input[type=\"file\"]\n   * @param {jQuery Object} selector [selector from input file]\n   */\n  function addUploadFileListener (selector) {\n    if ($(selector).length === 1) {\n      $(selector).on('change', insertFile);\n    }\n  }\n\n  /**\n   * Amends the application form\n   */\n  function amendApplicationForm () {\n    $('.CRM_HRRecruitment_Form_Application').addClass('crm-form-block');\n    $('.CRM_HRRecruitment_Form_Application .crm-profile-name-application_profile').addClass('form-layout-compressed');\n  }\n\n  /**\n   * Amends the contact page and the contact form\n   */\n  function amendContactPageAndForm (e) {\n    if (CRM.formName === 'contactForm' || CRM.pageName === 'viewSummary') {\n      // Rename \"Summary\" tab to \"Personal Details\"\n      // Hack to check contact type - This field only appears for individuals\n      if ($('.crm-contact-job_title', '.crm-summary-contactinfo-block').length) {\n        $('.crm-contact-tabs-list #tab_summary a', e.target).text('Personal Details');\n      }\n\n      manipulateDOMOfInlineCustomData(e.target);\n      miscContactPageChanges(e.target);\n    }\n  }\n\n  /**\n   * Amends the vacancy form\n   */\n  function amendVacancyForm () {\n    if ($('.CRM_HRRecruitment_Form_HRVacancy').length === 1) {\n      linkLabelToDatepickerInput($('label[for=\"start_date\"]').parents('tr'));\n      linkLabelToDatepickerInput($('label[for=\"end_date\"]').parents('tr'));\n\n      // Add a class to identify the form 'New Vacancy Template'\n      if ($('[name=\"entryURL\"]').val().indexOf(';template=1') > -1) {\n        $($('.CRM_HRRecruitment_Form_HRVacancy tbody').get(0)).addClass('CRM_HRRecruitment_Form_HRVacancy_Template');\n      }\n    }\n  }\n\n  /**\n   * Applies miscellaneous UI changes\n   */\n  function applyMiscChanges () {\n    $('#activityCustomData').attr('colspan', 3);\n    $('#crm-activity-view-table .crm-case-activity-view-Client .label').html('Contact');\n    $('span.crm-frozen-field', '.crm-profile-name-hrident_tab').closest('div').parent('div').hide();\n\n    $('.crm-accordion-header.crm-master-accordion-header').on('click', function () {\n      window.setTimeout(function () {\n        Array.prototype.forEach.call(document.querySelectorAll('.listing-box'), function (element) {\n          Ps.initialize(element);\n        });\n      }, 0);\n    });\n  }\n\n  /**\n   * Changes of sorce help text\n   */\n  function changeContactSourceFieldHelpText () {\n    $('INPUT#contact_source').parent('td').children('a').click(function () {\n      $('#crm-notification-container .crm-help .notify-content').remove();\n\n      if ($('#crm-notification-container .crm-help p').length) {\n        $('#crm-notification-container .crm-help p').remove();\n      }\n\n      $('#crm-notification-container .crm-help').append('<p>Source is a useful field where data has been migrated to CiviHR from one or a number of other legacy systems. The Source field will indicate which legacy system the contact has come from.</p>');\n    });\n  }\n\n  /**\n   * Finds the original link to the homepage, changes the text, wraps it in a\n   * `menumain-label` element and prepends internally the given app logo\n   *\n   * @param {object} $menuItem The context where to find the link\n   * @param {object} $appLogo\n   * @return the customized home link\n   */\n  function customizeHomeLinkInLogoMenuItem ($menuItem, $appLogo) {\n    var $homeLink = $('li > a', $menuItem).first();\n\n    return $homeLink\n      .text('Home')\n      .wrapInner('<span class=\"menumain-label\">')\n      .prepend($appLogo);\n  }\n\n  /**\n   * Injects the given markup in a menu wrapper with the given id\n   * created to contain both the original menu and the user one\n   *\n   * @param {string} menuMarkup\n   * @param {string} wrapperId\n   */\n  function injectUserMenuInAMainMenuWrapper (menuMarkup, wrapperId) {\n    var $menuMarkup = $(menuMarkup);\n    var $menuWrapper = $('<div>');\n\n    $menuWrapper.attr('id', wrapperId);\n    $menuWrapper.append($('#civicrm-menu'));\n    $menuWrapper.append($menuMarkup);\n    $menuWrapper.insertAfter('#page');\n  }\n\n  /**\n   * Insert a DOM node after input[type=\"file\"]\n   * with the filename\n   */\n  function insertFile () {\n    var fileName = $(this)[0].files[0];\n\n    $('#js-uploaded-file').remove();\n    if (fileName !== undefined) {\n      $(this).after('<span id=\"js-uploaded-file\" class=\"uploaded-file\">' + fileName.name + ' <span class=\"uploaded-file-icon-trash\"><i class=\"fa fa-trash-o\"></i> Remove</span>');\n\n      $('.uploaded-file-icon-trash').on('click', removeFile);\n    }\n  }\n\n  /**\n   * Update label 'for' attr to works with the datepicker\n   *\n   * @param  {jQuery object} $line [datepicker's line parent]\n   */\n  function linkLabelToDatepickerInput ($line) {\n    $line.find('label').attr('for', $line.find('.crm-form-date').attr('id'));\n  }\n\n  /**\n   * Manipulates, at the DOM level, the blocks/fields belonging to the\n   * Inline Custom Data custom fields set\n   */\n  if ($('.Inline_Custom_Data').length) {\n    repositionPersonalDetailsBlock('.Inline_Custom_Data');\n  }\n\n  repositionPersonalDetailsBlock('.Extended_Demographics');\n\n  function manipulateDOMOfInlineCustomData () {\n    if ($('#customFields').length < 1) {\n      repositionInlineCustomDataFieldsInEditContactForm();\n    }\n  }\n\n  /**\n   * Misc changes to the page (hiding elements, inserting new ones, etc)\n   */\n  function miscContactPageChanges (target) {\n    // Hide current employer and job title\n    // Contact summary screen:\n    $('div.crm-contact-current_employer, div.crm-contact-job_title', '.crm-summary-contactinfo-block').parent('div.crm-summary-row').hide();\n    // Inline edit form\n    $('form#ContactInfo input#employer_id, form#ContactInfo input#job_title', target).closest('div.crm-summary-row').hide();\n    // Contact edit screen\n    $('input#employer_id, input#job_title', 'form#Contact').parent('td').hide();\n\n    /* Changes on Add Individual pages and Personal details tab for HR-358 */\n    // Move Job summary to top\n    $('.HRJobContract_Summary', target).insertBefore($('.crm-summary-contactinfo-block'));\n    // changes of email block, remove bulkmail and onhold\n    $('div.email-signature, td#Email-Bulkmail-html', 'form#Contact').hide();\n    $('#Email-Primary', 'form#Contact').prev('td').prev('td').hide();\n    $('td#Email-Bulkmail-html, #Email-Primary', 'form#Contact').prev('td').hide();\n\n    // shift demographic above extended demographic\n    $('.crm-demographics-accordion', 'form#Contact').insertAfter($('.crm-contactDetails-accordion'));\n\n    if ($('tr#Phone_Block_2', 'form#Contact').length < 1) {\n      $('#addPhone').click();\n    }\n  }\n\n  /**\n   * Remove the #js-uploaded-file DIV and\n   * clean input[type=\"file\"] value\n   */\n  function removeFile () {\n    var $input = $('#js-uploaded-file').parent().find('input[type=\"file\"]');\n\n    $('#js-uploaded-file').remove();\n    $input.val('');\n  }\n\n  /**\n   * Moves the given home link right under the menu item and gets rid\n   * of the original sub menu\n   *\n   * @param {object} $menuItem The context where to find the link\n   * @param {object} $homeLink\n   */\n  function removeLogoSubMenuAndKeepOnlyHomeLink ($menuItem, $homeLink) {\n    $menuItem\n      .off() // removes any handler that the original item had\n      .find('#civicrm-home')\n      .before($homeLink)\n      .remove();\n  }\n\n  /**\n   * Moves the \"Inline Custom Data\" fields towards the top of the\n   * edit contact form\n   */\n  function repositionInlineCustomDataFieldsInEditContactForm () {\n    var $fields = $('#Inline_Custom_Data').detach();\n\n    $fields.find('.label').each(function () {\n      var $labelCell = $(this);\n      var $fieldCell = $labelCell.next();\n      var $newTd = $('<td/>');\n\n      $newTd.append($labelCell.find('label'));\n      $newTd.append($('<br/>'));\n      $newTd.append($fieldCell.html());\n\n      $('#nick_name').parent().after($newTd);\n    });\n  }\n\n  /**\n   * Moves the specified selector element to the personal details tab\n   *\n   * @param selector\n   */\n  function repositionPersonalDetailsBlock (selector) {\n    $(selector)\n      .removeClass('crm-collapsible collapsed')\n      .addClass('crm-summary-block')\n      .appendTo('.contactTopBar .contactCardLeft')\n      .find('.collapsible-title').hide().end()\n      .find('.crm-summary-block').show();\n  }\n\n  /**\n   * Swaps the CiviCRM logo with the CiviHR logo\n   * and wraps it in a `menumain-icon` element\n   *\n   * @param {object} $menuItem The context where to find the logo\n   * @return the wrapper of the logo\n   */\n  function swapAndWrapAppLogo ($menuItem) {\n    var $appLogo = $('.crm-logo-sm', $menuItem);\n\n    return $appLogo\n      .addClass('chr_logo chr_logo--default-color')\n      .removeClass('crm-logo-sm')\n      .wrap('<span class=\"menumain-icon\">')\n      .parent();\n  }\n\n  /**\n   * CiviCRM by default applies on hover the .activetarget class\n   * only to main menu items with a submenu\n   *\n   * This functions makes sure that any item gets the class applied,\n   * even those with just a direct link\n   */\n  function toggleActiveClassOnHoverOnAnyMainMenuItem () {\n    var className = 'activetarget';\n\n    $('.menumain').not('.crm-Self_Service_Portal').hover(function () {\n      $(this).addClass(className);\n    }, function () {\n      $(this).removeClass(className);\n    });\n  }\n\n  /**\n   * Remove the arrow for menu items with sub-items, and replaces it\n   * with a font awesome caret\n   */\n  function useFontAwesomeArrowsInSubMenuItems () {\n    $('#root-menu-div .menu-item-arrow').each(function ($element) {\n      var $arrow = $(this);\n\n      $arrow.before('<i class=\"fa fa-caret-right menu-item-arrow\"></i>');\n      $arrow.remove();\n    });\n  }\n}(CRM.$, CRM._));\n","(function ($) {\n  'use strict';\n  var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;\n\n  /*\n  This plugin creates MutationObserver which listens to all changes to DOM Node.\n  If change has been done to it's attributes callback will be called.\n\n  @param {function} callback - to be called when attributes change\n  @returns {Array} - list of all observed elements\n  */\n  $.fn.attrchange = function (callback) {\n    if (MutationObserver) {\n      var options = {\n        subtree: false,\n        attributes: true\n      };\n\n      var observer = new MutationObserver(function (mutations) {\n        mutations.forEach(function (e) {\n          callback.call(e.target, e);\n        });\n      });\n\n      return this.each(function () {\n        observer.observe(this, options);\n      });\n    }\n  }\n})(CRM.$);\n","/* globals CRM */\n\n/**\n * Helps to display popup menus inside #bootstrap-theme elements, since .panel's\n * and other Bootstrap elements clash with CiviCRM styles producing undesired\n * results.\n *\n * It also helps with event bindings, in case the original popup button was\n * removed and recreated, by forwarding the events to the original source.\n */\n(function ($) {\n  'use strict';\n  var $body = $('body');\n\n  $body.on('click', '#bootstrap-theme .btn-slide', function () {\n    var $popupClone;\n    var $button = $(this);\n    var $popup = $button.children('ul.panel');\n\n    (function init () {\n      closePopupPanels();\n      createPopupClone();\n      openPopupClone();\n      mapCloneClickEventsToOrigin();\n      listenToMouseOutEvent();\n    })();\n\n    /**\n     * Closes the any popup panel that is currently open and removes the\n     * `.civihr-popup-open` class from the body.\n     */\n    function closePopupPanels () {\n      $('.civihr-popup').remove();\n      $body.removeClass('civihr-popup-open');\n    }\n\n    /**\n     * Creates a clone of the popup element and appends it to the document body.\n     * This prevents the popup to be hidden by any `overflow: hidden;` rule.\n     */\n    function createPopupClone () {\n      $popupClone = $popup.clone(true)\n        .appendTo($body)\n        .addClass('civihr-popup');\n    }\n\n    /**\n     * Listens to mouse events happening outside the of the panel in order to\n     * close it. The way to detected mouse out is by listening to the\n     * .btn-slide-active class change, which is added and removed by CiviCRM.\n     * the data *attrchange-is-on* is set to true in order to avoid adding\n     * multiple listeners to the same element.\n     */\n    function listenToMouseOutEvent () {\n      // If AttrChange event is already listened, then skip:\n      if ($button.data('attrchange-is-on')) {\n        return;\n      }\n\n      $button.data('attrchange-is-on', true);\n      $button.attrchange(function () {\n        // If button is already open, then skip:\n        if ($button.hasClass('btn-slide-active')) {\n          return;\n        }\n\n        closePopupPanels();\n      });\n    }\n\n    /**\n     * Maps click events on the popup options back to their original source.\n     * This is done because popup actions are executed as delegated events and\n     * the listener is not the *body* element.\n     */\n    function mapCloneClickEventsToOrigin () {\n      $popupClone.find('a').click(function () {\n        var actionIndex = $(this).parent().index();\n\n        $popup.find('li:nth(' + actionIndex + ') a').click();\n      });\n    }\n\n    /**\n     * Opens the popup panel clone\n     * and adds the .civihr-popup-open class to the body\n     */\n    function openPopupClone () {\n      var buttonOffset = $button.offset();\n\n      $popupClone.css({\n        left: +buttonOffset.left - ($popupClone.width() - $button.outerWidth()),\n        top: +buttonOffset.top + $button.outerHeight()\n      });\n      $popupClone.show();\n      $body.addClass('civihr-popup-open');\n    }\n  });\n})(CRM.$);\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["contact.js","hrui.js","civihr-popup/attrchange.js","civihr-popup/civihr-popup.js"],"names":["$","_","updateContactHeaderRolesDetails","roles","departments","length","html","join","document","on","e","one","$form","this","find","each","$label","id","attr","text","data","contract","removeClass","position","location","addClass","CRM","insertFile","fileName","files","remove","undefined","after","name","removeFile","linkLabelToDatepickerInput","$line","$input","parent","val","selector","target","parents","indexOf","get","formName","pageName","insertAfter","hide","end","show","detach","$labelCell","$fieldCell","next","$newTd","append","closest","insertBefore","prev","click","window","setTimeout","Array","prototype","forEach","call","querySelectorAll","element","Ps","initialize","children","ready","$menuItem","$wrappedLogo","$customHomeLink","$appLogo","$homeLink","className","ajax","dataType","success","menuMarkup","wrapperId","$menuMarkup","$menuWrapper","wrap","first","wrapInner","prepend","off","before","$element","$arrow","not","hover","MutationObserver","WebKitMutationObserver","MozMutationObserver","fn","attrchange","callback","options","subtree","attributes","observer","mutations","observe","$body","$popupClone","buttonOffset","$button","$popup","closePopupPanels","clone","appendTo","offset","css","left","width","outerWidth","top","outerHeight","actionIndex","index","hasClass"],"mappings":"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","file":"hrui.min.js","sourcesContent":["(function ($, _) {\n  $(document)\n    .on('crmLoad', function (e) {\n      $('.crm-inline-edit').one('DOMSubtreeModified', function () {\n        var $form = $(this).find('form');\n\n        if ($form.length === 1) {\n          $form.find('label').each(function () {\n            var $label = $(this);\n            var id = $label.attr('for');\n            $('#' + id).attr('placeholder', $label.text());\n          });\n        }\n      });\n    })\n    .on('updateContactHeader', function (e, data) {\n      if (typeof data.contract !== 'undefined') {\n        updateContactHeaderContractDetails(data.contract);\n      }\n\n      if (typeof data.roles !== 'undefined') {\n        updateContactHeaderRolesDetails(data.roles);\n      }\n    });\n\n  /**\n   * Updates the contact header with the given contract details\n   *\n   * @param  {object} contract\n   */\n  function updateContactHeaderContractDetails (contract) {\n    if (contract) {\n      $('.crm-summary-contactname-block').removeClass('crm-summary-contactname-block-without-contract');\n\n      if (contract.position) {\n        $('.crm-contact-detail-position').html('<strong>Position:</strong> ' + contract.position);\n      }\n\n      if (contract.location) {\n        $('.crm-contact-detail-location').html('<strong>Normal place of work:</strong> ' + contract.location);\n      }\n    } else {\n      $('.crm-summary-contactname-block').addClass('crm-summary-contactname-block-without-contract');\n      $('.crm-contact-detail-position').html('');\n      $('.crm-contact-detail-location').html('');\n\n      updateContactHeaderRolesDetails(null);\n    }\n  }\n\n  /**\n   * Updates the contact header with the given roles details\n   *\n   * @param  {object} contract\n   */\n  function updateContactHeaderRolesDetails (roles) {\n    if (roles && roles.departments && roles.departments.length > 0) {\n      $('.crm-contact-detail-departments').html('<strong>Department:</strong> ' + roles.departments.join(', '));\n    } else {\n      $('.crm-contact-detail-departments').html('');\n    }\n  }\n}(CRM.$, CRM._));\n","/* global Ps */\n\n// Copyright CiviCRM LLC 2013. See http://civicrm.org/licensing\n(function ($, _) {\n  $(document)\n    .on('crmLoad', function (e) {\n      addUploadFileListener(\"input[type='file']\");\n      amendVacancyForm();\n      amendContactPageAndForm(e);\n      applyMiscChanges();\n      changeContactSourceFieldHelpText();\n    })\n    .ready(function () {\n      addUserMenuToMainMenu();\n      amendAppLogoMenuItem();\n      amendApplicationForm();\n      useFontAwesomeArrowsInSubMenuItems();\n      toggleActiveClassOnHoverOnAnyMainMenuItem();\n    });\n\n  /**\n   * Customizes the app logo menu item, switching from the CiviCRM logo\n   * to the CiviHR logo, and making the item a direct link instead of a\n   * toggle for a sub menu dropdown\n   */\n  function amendAppLogoMenuItem () {\n    var $menuItem = $('.crm-link-home');\n    var $wrappedLogo = swapAndWrapAppLogo($menuItem);\n    var $customHomeLink = customizeHomeLinkInLogoMenuItem($menuItem, $wrappedLogo);\n\n    removeLogoSubMenuAndKeepOnlyHomeLink($menuItem, $customHomeLink);\n  }\n\n  /**\n   * Adds the user menu by fetching it from the hrcore extension\n   */\n  function addUserMenuToMainMenu () {\n    $.ajax('/civicrm/hrcore/usermenu?snippet=4', {\n      dataType: 'html',\n      success: function (menuMarkup) {\n        injectUserMenuInAMainMenuWrapper(menuMarkup, 'civihr-menu');\n      }\n    });\n  }\n\n  /**\n   * Add an event listener on input[type=\"file\"]\n   * @param {jQuery Object} selector [selector from input file]\n   */\n  function addUploadFileListener (selector) {\n    if ($(selector).length === 1) {\n      $(selector).on('change', insertFile);\n    }\n  }\n\n  /**\n   * Amends the application form\n   */\n  function amendApplicationForm () {\n    $('.CRM_HRRecruitment_Form_Application').addClass('crm-form-block');\n    $('.CRM_HRRecruitment_Form_Application .crm-profile-name-application_profile').addClass('form-layout-compressed');\n  }\n\n  /**\n   * Amends the contact page and the contact form\n   */\n  function amendContactPageAndForm (e) {\n    if (CRM.formName === 'contactForm' || CRM.pageName === 'viewSummary') {\n      // Rename \"Summary\" tab to \"Personal Details\"\n      // Hack to check contact type - This field only appears for individuals\n      if ($('.crm-contact-job_title', '.crm-summary-contactinfo-block').length) {\n        $('.crm-contact-tabs-list #tab_summary a', e.target).text('Personal Details');\n      }\n\n      manipulateDOMOfInlineCustomData(e.target);\n      miscContactPageChanges(e.target);\n    }\n  }\n\n  /**\n   * Amends the vacancy form\n   */\n  function amendVacancyForm () {\n    if ($('.CRM_HRRecruitment_Form_HRVacancy').length === 1) {\n      linkLabelToDatepickerInput($('label[for=\"start_date\"]').parents('tr'));\n      linkLabelToDatepickerInput($('label[for=\"end_date\"]').parents('tr'));\n\n      // Add a class to identify the form 'New Vacancy Template'\n      if ($('[name=\"entryURL\"]').val().indexOf(';template=1') > -1) {\n        $($('.CRM_HRRecruitment_Form_HRVacancy tbody').get(0)).addClass('CRM_HRRecruitment_Form_HRVacancy_Template');\n      }\n    }\n  }\n\n  /**\n   * Applies miscellaneous UI changes\n   */\n  function applyMiscChanges () {\n    $('#activityCustomData').attr('colspan', 3);\n    $('#crm-activity-view-table .crm-case-activity-view-Client .label').html('Contact');\n    $('span.crm-frozen-field', '.crm-profile-name-hrident_tab').closest('div').parent('div').hide();\n\n    $('.crm-accordion-header.crm-master-accordion-header').on('click', function () {\n      window.setTimeout(function () {\n        Array.prototype.forEach.call(document.querySelectorAll('.listing-box'), function (element) {\n          Ps.initialize(element);\n        });\n      }, 0);\n    });\n  }\n\n  /**\n   * Changes of sorce help text\n   */\n  function changeContactSourceFieldHelpText () {\n    $('INPUT#contact_source').parent('td').children('a').click(function () {\n      $('#crm-notification-container .crm-help .notify-content').remove();\n\n      if ($('#crm-notification-container .crm-help p').length) {\n        $('#crm-notification-container .crm-help p').remove();\n      }\n\n      $('#crm-notification-container .crm-help').append('<p>Source is a useful field where data has been migrated to CiviHR from one or a number of other legacy systems. The Source field will indicate which legacy system the contact has come from.</p>');\n    });\n  }\n\n  /**\n   * Finds the original link to the homepage, changes the text, wraps it in a\n   * `menumain-label` element and prepends internally the given app logo\n   *\n   * @param {object} $menuItem The context where to find the link\n   * @param {object} $appLogo\n   * @return the customized home link\n   */\n  function customizeHomeLinkInLogoMenuItem ($menuItem, $appLogo) {\n    var $homeLink = $('li > a', $menuItem).first();\n\n    return $homeLink\n      .text('Home')\n      .wrapInner('<span class=\"menumain-label\">')\n      .prepend($appLogo);\n  }\n\n  /**\n   * Injects the given markup in a menu wrapper with the given id\n   * created to contain both the original menu and the user one\n   *\n   * @param {string} menuMarkup\n   * @param {string} wrapperId\n   */\n  function injectUserMenuInAMainMenuWrapper (menuMarkup, wrapperId) {\n    var $menuMarkup = $(menuMarkup);\n    var $menuWrapper = $('<div>');\n\n    $menuWrapper.attr('id', wrapperId);\n    $menuWrapper.append($('#civicrm-menu'));\n    $menuWrapper.append($menuMarkup);\n    $menuWrapper.insertAfter('#page');\n  }\n\n  /**\n   * Insert a DOM node after input[type=\"file\"]\n   * with the filename\n   */\n  function insertFile () {\n    var fileName = $(this)[0].files[0];\n\n    $('#js-uploaded-file').remove();\n    if (fileName !== undefined) {\n      $(this).after('<span id=\"js-uploaded-file\" class=\"uploaded-file\">' + fileName.name + ' <span class=\"uploaded-file-icon-trash\"><i class=\"fa fa-trash-o\"></i> Remove</span>');\n\n      $('.uploaded-file-icon-trash').on('click', removeFile);\n    }\n  }\n\n  /**\n   * Update label 'for' attr to works with the datepicker\n   *\n   * @param  {jQuery object} $line [datepicker's line parent]\n   */\n  function linkLabelToDatepickerInput ($line) {\n    $line.find('label').attr('for', $line.find('.crm-form-date').attr('id'));\n  }\n\n  /**\n   * Manipulates, at the DOM level, the blocks/fields belonging to the\n   * Inline Custom Data custom fields set\n   */\n  function manipulateDOMOfInlineCustomData () {\n    if ($('.Inline_Custom_Data').length) {\n      repositionInlineCustomDataBlockInPersonalDetailsTab();\n    }\n\n    if ($('#customFields').length < 1) {\n      repositionInlineCustomDataFieldsInEditContactForm();\n    }\n  }\n\n  /**\n   * Misc changes to the page (hiding elements, inserting new ones, etc)\n   */\n  function miscContactPageChanges (target) {\n    // Hide current employer and job title\n    // Contact summary screen:\n    $('div.crm-contact-current_employer, div.crm-contact-job_title', '.crm-summary-contactinfo-block').parent('div.crm-summary-row').hide();\n    // Inline edit form\n    $('form#ContactInfo input#employer_id, form#ContactInfo input#job_title', target).closest('div.crm-summary-row').hide();\n    // Contact edit screen\n    $('input#employer_id, input#job_title', 'form#Contact').parent('td').hide();\n\n    /* Changes on Add Individual pages and Personal details tab for HR-358 */\n    // Move Job summary to top\n    $('.HRJobContract_Summary', target).insertBefore($('.crm-summary-contactinfo-block'));\n    // changes of email block, remove bulkmail and onhold\n    $('div.email-signature, td#Email-Bulkmail-html', 'form#Contact').hide();\n    $('#Email-Primary', 'form#Contact').prev('td').prev('td').hide();\n    $('td#Email-Bulkmail-html, #Email-Primary', 'form#Contact').prev('td').hide();\n\n    // shift demographic above extended demographic\n    $('.crm-demographics-accordion', 'form#Contact').insertAfter($('.crm-contactDetails-accordion'));\n\n    if ($('tr#Phone_Block_2', 'form#Contact').length < 1) {\n      $('#addPhone').click();\n    }\n  }\n\n  /**\n   * Remove the #js-uploaded-file DIV and\n   * clean input[type=\"file\"] value\n   */\n  function removeFile () {\n    var $input = $('#js-uploaded-file').parent().find('input[type=\"file\"]');\n\n    $('#js-uploaded-file').remove();\n    $input.val('');\n  }\n\n  /**\n   * Moves the given home link right under the menu item and gets rid\n   * of the original sub menu\n   *\n   * @param {object} $menuItem The context where to find the link\n   * @param {object} $homeLink\n   */\n  function removeLogoSubMenuAndKeepOnlyHomeLink ($menuItem, $homeLink) {\n    $menuItem\n      .off() // removes any handler that the original item had\n      .find('#civicrm-home')\n      .before($homeLink)\n      .remove();\n  }\n\n  /**\n   * Moves the \"Inline Custom Data\" fields towards the top of the\n   * edit contact form\n   */\n  function repositionInlineCustomDataFieldsInEditContactForm () {\n    var $fields = $('#Inline_Custom_Data').detach();\n\n    $fields.find('.label').each(function () {\n      var $labelCell = $(this);\n      var $fieldCell = $labelCell.next();\n      var $newTd = $('<td/>');\n\n      $newTd.append($labelCell.find('label'));\n      $newTd.append($('<br/>'));\n      $newTd.append($fieldCell.html());\n\n      $('#nick_name').parent().after($newTd);\n    });\n  }\n\n  /**\n   * Moves the \"Inline Custom Data\" block towards the top of the\n   * personal details tab\n   */\n  function repositionInlineCustomDataBlockInPersonalDetailsTab () {\n    $('.Inline_Custom_Data')\n      .removeClass('crm-collapsible collapsed')\n      .addClass('crm-summary-block')\n      .insertAfter('.crm-summary-contactinfo-block')\n      .find('.collapsible-title').hide().end()\n      .find('.crm-summary-block').show();\n  }\n\n  /**\n   * Swaps the CiviCRM logo with the CiviHR logo\n   * and wraps it in a `menumain-icon` element\n   *\n   * @param {object} $menuItem The context where to find the logo\n   * @return the wrapper of the logo\n   */\n  function swapAndWrapAppLogo ($menuItem) {\n    var $appLogo = $('.crm-logo-sm', $menuItem);\n\n    return $appLogo\n      .addClass('chr_logo chr_logo--default-color')\n      .removeClass('crm-logo-sm')\n      .wrap('<span class=\"menumain-icon\">')\n      .parent();\n  }\n\n  /**\n   * CiviCRM by default applies on hover the .activetarget class\n   * only to main menu items with a submenu\n   *\n   * This functions makes sure that any item gets the class applied,\n   * even those with just a direct link\n   */\n  function toggleActiveClassOnHoverOnAnyMainMenuItem () {\n    var className = 'activetarget';\n\n    $('.menumain').not('.crm-Self_Service_Portal').hover(function () {\n      $(this).addClass(className);\n    }, function () {\n      $(this).removeClass(className);\n    });\n  }\n\n  /**\n   * Remove the arrow for menu items with sub-items, and replaces it\n   * with a font awesome caret\n   */\n  function useFontAwesomeArrowsInSubMenuItems () {\n    $('#root-menu-div .menu-item-arrow').each(function ($element) {\n      var $arrow = $(this);\n\n      $arrow.before('<i class=\"fa fa-caret-right menu-item-arrow\"></i>');\n      $arrow.remove();\n    });\n  }\n}(CRM.$, CRM._));\n","(function ($) {\n  'use strict';\n  var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;\n\n  /*\n  This plugin creates MutationObserver which listens to all changes to DOM Node.\n  If change has been done to it's attributes callback will be called.\n\n  @param {function} callback - to be called when attributes change\n  @returns {Array} - list of all observed elements\n  */\n  $.fn.attrchange = function (callback) {\n    if (MutationObserver) {\n      var options = {\n        subtree: false,\n        attributes: true\n      };\n\n      var observer = new MutationObserver(function (mutations) {\n        mutations.forEach(function (e) {\n          callback.call(e.target, e);\n        });\n      });\n\n      return this.each(function () {\n        observer.observe(this, options);\n      });\n    }\n  }\n})(CRM.$);\n","/* globals CRM */\n\n/**\n * Helps to display popup menus inside #bootstrap-theme elements, since .panel's\n * and other Bootstrap elements clash with CiviCRM styles producing undesired\n * results.\n *\n * It also helps with event bindings, in case the original popup button was\n * removed and recreated, by forwarding the events to the original source.\n */\n(function ($) {\n  'use strict';\n  var $body = $('body');\n\n  $body.on('click', '#bootstrap-theme .btn-slide', function () {\n    var $popupClone;\n    var $button = $(this);\n    var $popup = $button.children('ul.panel');\n\n    (function init () {\n      closePopupPanels();\n      createPopupClone();\n      openPopupClone();\n      mapCloneClickEventsToOrigin();\n      listenToMouseOutEvent();\n    })();\n\n    /**\n     * Closes the any popup panel that is currently open and removes the\n     * `.civihr-popup-open` class from the body.\n     */\n    function closePopupPanels () {\n      $('.civihr-popup').remove();\n      $body.removeClass('civihr-popup-open');\n    }\n\n    /**\n     * Creates a clone of the popup element and appends it to the document body.\n     * This prevents the popup to be hidden by any `overflow: hidden;` rule.\n     */\n    function createPopupClone () {\n      $popupClone = $popup.clone(true)\n        .appendTo($body)\n        .addClass('civihr-popup');\n    }\n\n    /**\n     * Listens to mouse events happening outside the of the panel in order to\n     * close it. The way to detected mouse out is by listening to the\n     * .btn-slide-active class change, which is added and removed by CiviCRM.\n     * the data *attrchange-is-on* is set to true in order to avoid adding\n     * multiple listeners to the same element.\n     */\n    function listenToMouseOutEvent () {\n      // If AttrChange event is already listened, then skip:\n      if ($button.data('attrchange-is-on')) {\n        return;\n      }\n\n      $button.data('attrchange-is-on', true);\n      $button.attrchange(function () {\n        // If button is already open, then skip:\n        if ($button.hasClass('btn-slide-active')) {\n          return;\n        }\n\n        closePopupPanels();\n      });\n    }\n\n    /**\n     * Maps click events on the popup options back to their original source.\n     * This is done because popup actions are executed as delegated events and\n     * the listener is not the *body* element.\n     */\n    function mapCloneClickEventsToOrigin () {\n      $popupClone.find('a').click(function () {\n        var actionIndex = $(this).parent().index();\n\n        $popup.find('li:nth(' + actionIndex + ') a').click();\n      });\n    }\n\n    /**\n     * Opens the popup panel clone\n     * and adds the .civihr-popup-open class to the body\n     */\n    function openPopupClone () {\n      var buttonOffset = $button.offset();\n\n      $popupClone.css({\n        left: +buttonOffset.left - ($popupClone.width() - $button.outerWidth()),\n        top: +buttonOffset.top + $button.outerHeight()\n      });\n      $popupClone.show();\n      $body.addClass('civihr-popup-open');\n    }\n  });\n})(CRM.$);\n"]}
diff --git a/hrui/js/src/hrui.js b/hrui/js/src/hrui.js
index a8085de481e..2bd80d64aae 100755
--- a/hrui/js/src/hrui.js
+++ b/hrui/js/src/hrui.js
@@ -186,13 +186,11 @@
    * Manipulates, at the DOM level, the blocks/fields belonging to the
    * Inline Custom Data custom fields set
    */
-  if ($('.Inline_Custom_Data').length) {
-    repositionPersonalDetailsBlock('.Inline_Custom_Data');
-  }
-
-  repositionPersonalDetailsBlock('.Extended_Demographics');
-
   function manipulateDOMOfInlineCustomData () {
+    if ($('.Inline_Custom_Data').length) {
+      repositionInlineCustomDataBlockInPersonalDetailsTab();
+    }
+
     if ($('#customFields').length < 1) {
       repositionInlineCustomDataFieldsInEditContactForm();
     }
@@ -273,15 +271,14 @@
   }
 
   /**
-   * Moves the specified selector element to the personal details tab
-   *
-   * @param selector
+   * Moves the "Inline Custom Data" block towards the top of the
+   * personal details tab
    */
-  function repositionPersonalDetailsBlock (selector) {
-    $(selector)
+  function repositionInlineCustomDataBlockInPersonalDetailsTab () {
+    $('.Inline_Custom_Data')
       .removeClass('crm-collapsible collapsed')
       .addClass('crm-summary-block')
-      .appendTo('.contactTopBar .contactCardLeft')
+      .insertAfter('.crm-summary-contactinfo-block')
       .find('.collapsible-title').hide().end()
       .find('.crm-summary-block').show();
   }
diff --git a/hrvisa/tests/phpunit/CRM/HRVisa/ActivityTest.php b/hrvisa/tests/phpunit/CRM/HRVisa/ActivityTest.php
index 49e40ddaa7a..d822db9ec16 100644
--- a/hrvisa/tests/phpunit/CRM/HRVisa/ActivityTest.php
+++ b/hrvisa/tests/phpunit/CRM/HRVisa/ActivityTest.php
@@ -16,6 +16,8 @@ class CRM_HRVisa_ActivityTest extends PHPUnit_Framework_TestCase implements Head
   public function setUpHeadless() {
     return \Civi\Test::headless()
       ->installMe(__DIR__)
+      // hrdemog is necessary because it creates the Immigration fields used by the tests
+      ->install('org.civicrm.hrdemog')
       ->install('uk.co.compucorp.civicrm.hrcore')
       ->apply();
   }
diff --git a/uk.co.compucorp.civicrm.hrcontactactionsmenu/CRM/HRContactActionsMenu/Page/UserMailNotifier.php b/uk.co.compucorp.civicrm.hrcontactactionsmenu/CRM/HRContactActionsMenu/Page/UserMailNotifier.php
index f3907946bd1..aadc269032f 100644
--- a/uk.co.compucorp.civicrm.hrcontactactionsmenu/CRM/HRContactActionsMenu/Page/UserMailNotifier.php
+++ b/uk.co.compucorp.civicrm.hrcontactactionsmenu/CRM/HRContactActionsMenu/Page/UserMailNotifier.php
@@ -14,7 +14,7 @@ class CRM_HRContactActionsMenu_Page_UserMailNotifier {
   public static function sendPasswordResetEmail() {
     $contactID = CRM_Utils_Array::value('cid', $_GET);
     $contactInfo = ContactHelper::getUserInformation($contactID);
-    $cmsUserMailNotifier = Civi::container()->get('civihr.cms.notifier');
+    $cmsUserMailNotifier = Civi::container()->get('hrcore.cms_notifier');
     $cmsUserMailNotifier->sendPasswordResetEmail($contactInfo);
 
     CRM_Core_Session::setStatus(ts('Password Reset Email sent'), 'Success', 'success');
@@ -30,7 +30,7 @@ public static function sendPasswordResetEmail() {
   public static function sendWelcomeEmail() {
     $contactID = CRM_Utils_Array::value('cid', $_GET);
     $contactInfo = ContactHelper::getUserInformation($contactID);
-    $cmsUserMailNotifier = Civi::container()->get('civihr.cms.notifier');
+    $cmsUserMailNotifier = Civi::container()->get('hrcore.cms_notifier');
     $cmsUserMailNotifier->sendWelcomeEmail($contactInfo);
 
     CRM_Core_Session::setStatus(ts('Welcome Email sent'), 'Success', 'success');
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Form/AbstractDrupalInteractionTaskForm.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Form/AbstractDrupalInteractionTaskForm.php
index d328fcbf322..0997556e4af 100644
--- a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Form/AbstractDrupalInteractionTaskForm.php
+++ b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Form/AbstractDrupalInteractionTaskForm.php
@@ -26,7 +26,7 @@ public function __construct(
     $method = 'post',
     $name = NULL
   ) {
-    $this->drupalUserService = Civi::container()->get('civihr.cms.drupal_user_service');
+    $this->drupalUserService = Civi::container()->get('drupal_user_service');
     parent::__construct($state, $action, $method, $name);
   }
 
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Disable/CustomGroupDisabler.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Disable/CustomGroupDisabler.php
deleted file mode 100644
index bc2369c0dc8..00000000000
--- a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Disable/CustomGroupDisabler.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class CRM_HRCore_Hook_Disable_CustomGroupDisabler {
-
-  /**
-   * Handle disabling the custom group and fields for this extension
-   */
-  public function handle() {
-    $customGroups = ['Extended_Demographics'];
-    $switcher = Civi::container()->get('civihr.custom_group_status_switcher');
-
-    foreach ($customGroups as $groupName) {
-      $switcher->disable($groupName);
-    }
-  }
-
-}
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Enable/CustomGroupEnabler.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Enable/CustomGroupEnabler.php
deleted file mode 100644
index b6043723f4a..00000000000
--- a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Enable/CustomGroupEnabler.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-use CRM_HRCore_Service_CustomGroupStatusSwitcher as CustomGroupStatusSwitcher;
-
-class CRM_HRCore_Hook_Enable_CustomGroupEnabler {
-
-  /**
-   * Handle enabling the custom group and fields for this extension
-   */
-  public function handle() {
-    $customGroups = ['Extended_Demographics'];
-
-    // cannot use container service for this extension before being enabled
-    $switcher = new CustomGroupStatusSwitcher();
-
-    foreach ($customGroups as $groupName) {
-      $switcher->enable($groupName);
-    }
-  }
-
-}
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Uninstall/CustomGroupRemover.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Uninstall/CustomGroupRemover.php
deleted file mode 100644
index 302e5ee0664..00000000000
--- a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Uninstall/CustomGroupRemover.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-class CRM_HRCore_Hook_Uninstall_CustomGroupRemover {
-
-  /**
-   * Handle removing the custom groups added by this extension
-   */
-  public function handle() {
-    $customGroups = [
-      'Extended_Demographics'
-    ];
-
-    foreach ($customGroups as $customGroupName) {
-      $params = ['return' => 'id', 'name' => $customGroupName];
-      $result = civicrm_api3('CustomGroup', 'get', $params);
-
-      if ($result['count'] != 1) {
-        continue;
-      }
-      $customGroup = array_shift($result['values']);
-
-      civicrm_api3('CustomGroup', 'delete', ['id' => $customGroup['id']]);
-    }
-  }
-}
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Service/CustomGroupStatusSwitcher.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Service/CustomGroupStatusSwitcher.php
deleted file mode 100644
index f381b3be7d5..00000000000
--- a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Service/CustomGroupStatusSwitcher.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-class CRM_HRCore_Service_CustomGroupStatusSwitcher {
-
-  /**
-   * Enable a custom group and all its fields
-   *
-   * @param string $customGroupName
-   */
-  public function enable($customGroupName) {
-    $this->changeStatus($customGroupName, TRUE);
-  }
-
-  /**
-   * Disable a custom group and all its fields
-   *
-   * @param string $customGroupName
-   */
-  public function disable($customGroupName) {
-    $this->changeStatus($customGroupName, FALSE);
-  }
-
-  /**
-   * Switches the status for custom group and all its fields
-   *
-   * @param string $customGroupName
-   * @param bool $status
-   */
-  private function changeStatus($customGroupName, $status) {
-    $customGroup = $this->getCustomGroup($customGroupName);
-
-    if (!$customGroup) {
-      $err = sprintf('Could not find group with name "%s"', $customGroupName);
-      throw new \Exception($err);
-    }
-
-    $customGroupId = (int) $customGroup['id'];
-    $this->changeGroupStatus($customGroupId, $status);
-    $this->changeAllGroupFieldsStatus($customGroupId, $status);
-  }
-
-  /**
-   * Update the 'is_active' status for a custom group
-   *
-   * @param int $customGroupId
-   * @param bool $status
-   */
-  private function changeGroupStatus($customGroupId, $status) {
-    $params = ['id' => $customGroupId, 'is_active' => $status];
-    civicrm_api3('CustomGroup', 'create', $params);
-  }
-
-  /**
-   * Update the 'is_active' status for all custom fields for a group
-   *
-   * @param int $customGroupId
-   * @param bool $status
-   */
-  private function changeAllGroupFieldsStatus($customGroupId, $status) {
-    $fields = $this->getAllCustomFields($customGroupId);
-
-    foreach ($fields as $field) {
-      $params = ['id' => $field['id'], 'is_active' => $status];
-      // Custom field endpoint freaks out if custom_group_id is missing
-      $params['custom_group_id'] = $field['custom_group_id'];
-      civicrm_api3('CustomField', 'create', $params);
-    }
-  }
-
-  /**
-   * Fetches all custom fields for a custom group
-   *
-   * @param int $customGroupId
-   *
-   * @return array
-   */
-  private function getAllCustomFields($customGroupId) {
-    $params = ['custom_group_id' => $customGroupId];
-    $result = civicrm_api3('CustomField', 'get', $params);
-
-    return $result['values'];
-  }
-
-  /**
-   * Gets a custom group based on name, returns null if group doesn't exist
-   *
-   * @param string $customGroupName
-   *
-   * @return mixed|null
-   */
-  private function getCustomGroup($customGroupName) {
-    $params = ['name' => $customGroupName];
-    $result = civicrm_api3('CustomGroup', 'get', $params);
-
-    if ($result['count'] != 1) {
-      return NULL;
-    }
-
-    return array_shift($result['values']);
-  }
-
-}
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Test/Fabricator/CustomField.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Test/Fabricator/CustomField.php
deleted file mode 100644
index e2030ae18c1..00000000000
--- a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Test/Fabricator/CustomField.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class CRM_HRCore_Test_Fabricator_CustomField {
-
-  private static $defaultParams = [
-    'name' => 'test_custom_field',
-    'html_type' => 'Text',
-    'data_type' => 'String',
-  ];
-
-  public static function fabricate($params = []) {
-    $params = array_merge(self::$defaultParams, $params);
-
-    if (!isset($params['label'])) {
-      $params['label'] = $params['name'];
-    }
-
-    $result = civicrm_api3('CustomField', 'create', $params);
-
-    return array_shift($result['values']);
-  }
-
-}
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Test/Fabricator/CustomGroup.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Test/Fabricator/CustomGroup.php
deleted file mode 100644
index 5ac6eecbbdd..00000000000
--- a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Test/Fabricator/CustomGroup.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-class CRM_HRCore_Test_Fabricator_CustomGroup {
-
-  public static function fabricate($params = []) {
-    $params = array_merge(self::getDefaultParams(), $params);
-
-    $result = civicrm_api3(
-      'CustomGroup',
-      'create',
-      $params
-    );
-
-    return array_shift($result['values']);
-  }
-
-  private static function getDefaultParams() {
-    static $count = 0;
-    $count++;
-
-    return [
-      'name' => 'test_custom_group_' . $count,
-      'title' => 'Test Custom Group ' . $count,
-      'extends' => 'Individual'
-    ];
-  }
-
-}
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader.php
index 208c2f772d5..2d69d9e62dc 100755
--- a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader.php
+++ b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader.php
@@ -25,7 +25,6 @@ class CRM_HRCore_Upgrader extends CRM_HRCore_Upgrader_Base {
   use CRM_HRCore_Upgrader_Steps_1015;
   use CRM_HRCore_Upgrader_Steps_1016;
   use CRM_HRCore_Upgrader_Steps_1017;
-  use CRM_HRCore_Upgrader_Steps_1021;
   use CRM_HRCore_Upgrader_Steps_1018;
   use CRM_HRCore_Upgrader_Steps_1019;
   use CRM_HRCore_Upgrader_Steps_1020;
@@ -59,18 +58,10 @@ class CRM_HRCore_Upgrader extends CRM_HRCore_Upgrader_Base {
     'Validate Email Address from Mailings.'
   ];
 
-  /**
-   * A list of directories to be scanned for XML installation files
-   *
-   * @var array
-   */
-  private $xmlDirectories = ['CustomGroups'];
-
   /**
    * Callback called when the extension is installed
    */
   public function install() {
-    $this->processXMLInstallationFiles();
     $this->setScheduledJobsDefaultStatus();
     $this->deleteLocationTypes();
     $this->createRequiredLocationTypes();
@@ -79,25 +70,6 @@ public function install() {
     $this->runAllUpgraders();
   }
 
-  /**
-   * Scans all the directories in $xmlDirectories for installation files
-   * (xml files ending with _install.xml) and processes them.
-   */
-  private function processXMLInstallationFiles() {
-    foreach($this->xmlDirectories as $directory) {
-      $files = glob($this->extensionDir . "/xml/{$directory}/*_install.xml");
-      if (is_array($files)) {
-        foreach ($files as $file) {
-          $this->executeCustomDataFileByAbsPath($file);
-        }
-      }
-    }
-    // Flush the cache so that all pseudoconstants can be re-read from db
-    // This is to avoid issues when running upgraders during installation
-    // whereby some pseudoconstants were not available.
-    CRM_Core_PseudoConstant::flush();
-  }
-
   /**
    * Callback method called when the extension is uninstalled.
    *
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader/Steps/1021.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader/Steps/1021.php
deleted file mode 100644
index 0a59b627d43..00000000000
--- a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader/Steps/1021.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-trait CRM_HRCore_Upgrader_Steps_1021 {
-
-  /**
-   * Uninstall the hrdemog extension.
-   *
-   * This extension was already deleted from the code at this point, so this
-   * will fail if you run it from the UI (missing extension). Running
-   * upgraders from the CLI (as is done for production releases) will work
-   *
-   * @return bool
-   */
-  public function upgrade_1021() {
-    $key = 'org.civicrm.hrdemog';
-
-    if (!CRM_HRCore_Helper_ExtensionHelper::isExtensionEnabled($key)) {
-      return TRUE;
-    }
-
-    civicrm_api3('Extension', 'disable', ['keys' => $key]);
-    civicrm_api3('Extension', 'uninstall', ['keys' => $key]);
-
-    return TRUE;
-  }
-
-}
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader/Steps/1025.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader/Steps/1025.php
deleted file mode 100644
index 56cf2743be4..00000000000
--- a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Upgrader/Steps/1025.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-trait CRM_HRCore_Upgrader_Steps_1025 {
-
-  /**
-   * Deletes some demographics fields where they are not in use
-   *
-   * @return bool
-   */
-  public function upgrade_1025() {
-
-    $this->up1025_deleteExtendDemographicFields([
-      'Ethnicity',
-      'Religion',
-      'Sexual_Orientation',
-    ]);
-
-    return TRUE;
-  }
-
-  /**
-   * Deletes Custom Demographic Fields only if they are not used
-   *
-   * @param array $fieldsToDelete
-   */
-  private function up1025_deleteExtendDemographicFields($fieldsToDelete) {
-    $customGroup = civicrm_api3('CustomGroup', 'get', [
-      'name' => 'Extended_Demographics',
-    ]);
-    $customGroup = array_shift($customGroup['values']);
-    $customFields = civicrm_api3('CustomField', 'get', [
-      'name' => ['IN' => $fieldsToDelete],
-    ]);
-    $tableName = $customGroup['table_name'];
-    foreach ($customFields['values'] as $customField) {
-      $column = $customField['column_name'];
-      $queryFormat = 'SELECT COUNT(id) FROM %s'
-        . ' WHERE %s NOT LIKE "%%Not Applicable%%"'
-        . ' AND %s IS NOT NULL'
-        . ' AND %s <> ""';
-
-      $query = sprintf($queryFormat, $tableName, $column, $column, $column);
-      $customFieldItems = CRM_Core_DAO::singleValueQuery($query);
-      if ($customFieldItems > 0) {
-        continue;
-      }
-
-      civicrm_api3('CustomField', 'delete', [
-        'id' => $customField['id'],
-      ]);
-    }
-  }
-
-}
diff --git a/uk.co.compucorp.civicrm.hrcore/api/v3/Job/CheckCivihrVersion.php b/uk.co.compucorp.civicrm.hrcore/api/v3/Job/CheckCivihrVersion.php
index 22f3b99120a..d1956223a66 100644
--- a/uk.co.compucorp.civicrm.hrcore/api/v3/Job/CheckCivihrVersion.php
+++ b/uk.co.compucorp.civicrm.hrcore/api/v3/Job/CheckCivihrVersion.php
@@ -7,8 +7,8 @@
  */
 function civicrm_api3_job_check_civihr_version() {
   $container = Civi::container();
-  $currentStats = $container->get('civihr.stats_cache')->fetchCurrent();
-  $container->get('civihr.stats_sender')->send($currentStats);
+  $currentStats = $container->get('civihr_stats_cache')->fetchCurrent();
+  $container->get('civihr_stats_sender')->send($currentStats);
 
   return civicrm_api3_create_success();
 }
diff --git a/uk.co.compucorp.civicrm.hrcore/config/container/container.xml b/uk.co.compucorp.civicrm.hrcore/config/container/container.xml
index 3055b64c30b..ffa8e04b42c 100644
--- a/uk.co.compucorp.civicrm.hrcore/config/container/container.xml
+++ b/uk.co.compucorp.civicrm.hrcore/config/container/container.xml
@@ -3,50 +3,48 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
   <parameters>
-    <parameter key="civihr.connection_timeout">10</parameter>
+    <parameter key="connection_timeout">10</parameter>
   </parameters>
 
   <services>
-    <service id="civihr.cms.notifier"
+    <service id="hrcore.cms_notifier"
              class="CRM_HRCore_CMSData_UserMailNotifierInterface"
              factory-class="CRM_HRCore_CMSData_UserMailNotifierFactory"
              factory-method="create">
     </service>
-    <service id="civihr.cms.drupal_role_service"
-             class="CRM_HRCore_CMSData_Role_DrupalRoleService"/>
-    <service id="civihr.cms.drupal_user_service" class="CRM_HRCore_Service_DrupalUserService">
-      <argument id="civihr.cms.drupal_role_service" type="service"/>
+    <service id="drupal_role_service" class="CRM_HRCore_CMSData_Role_DrupalRoleService"/>
+    <service id="drupal_user_service" class="CRM_HRCore_Service_DrupalUserService">
+      <argument id="drupal_role_service" type="service"/>
     </service>
-    <service id="civihr.stats_gatherer" class="CRM_HRCore_Service_Stats_StatsGatherer">
-      <argument id="civihr.cms.site_info" type="service"/>
-      <argument id="civihr.cms.role_service" type="service"/>
+    <service id="civihr_stats_gatherer" class="CRM_HRCore_Service_Stats_StatsGatherer">
+      <argument id="cms_site_info" type="service"/>
+      <argument id="cms_role_service" type="service"/>
     </service>
     <service
-            id="civihr.cms.site_info"
+            id="cms_site_info"
             factory-class="CRM_HRCore_CMSData_SiteInformationFactory"
             factory-method="create"
             class="CRM_HRCore_CMSData_SiteInformation_SiteInformationInterface"
     />
     <service
-            id="civihr.cms.role_service"
+            id="cms_role_service"
             factory-class="CRM_HRCore_CMSData_CMSRoleServiceFactory"
             factory-method="create"
             class="CRM_HRCore_CMSData_Role_RoleServiceInterface"
     />
     <service id="core.cache" class="CRM_Core_BAO_Cache"/>
     <service id="core.http_client" class="CRM_Utils_HttpClient">
-      <argument>%civihr.connection_timeout%</argument>
+      <argument>%connection_timeout%</argument>
     </service>
-    <service id="civihr.stats_sender" class="CRM_HRCore_Service_Stats_StatsSender">
+    <service id="civihr_stats_sender" class="CRM_HRCore_Service_Stats_StatsSender">
       <argument type="service" id="core.http_client"/>
       <argument type="service" id="psr_log"/>
     </service>
     <service id="civihr.file_cache" class="CRM_HRCore_Service_FileCache"/>
-    <service id="civihr.stats_cache" class="CRM_HRCore_Service_Stats_StatsCache">
-      <argument id="civihr.stats_gatherer" type="service"/>
+    <service id="civihr_stats_cache" class="CRM_HRCore_Service_Stats_StatsCache">
+      <argument id="civihr_stats_gatherer" type="service"/>
       <argument id="civihr.file_cache" type="service"/>
     </service>
-    <service id="civihr.custom_group_status_switcher" class="CRM_HRCore_Service_CustomGroupStatusSwitcher"/>
   </services>
 
 </container>
diff --git a/uk.co.compucorp.civicrm.hrcore/hrcore.php b/uk.co.compucorp.civicrm.hrcore/hrcore.php
index afc7549338b..6c3eb765a2e 100644
--- a/uk.co.compucorp.civicrm.hrcore/hrcore.php
+++ b/uk.co.compucorp.civicrm.hrcore/hrcore.php
@@ -180,14 +180,6 @@ function hrcore_civicrm_postInstall() {
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
  */
 function hrcore_civicrm_uninstall() {
-  $listeners = [
-    new CRM_HRCore_Hook_Uninstall_CustomGroupRemover()
-  ];
-
-  foreach ($listeners as $listener) {
-    $listener->handle();
-  }
-
   _hrcore_civix_civicrm_uninstall();
 }
 
@@ -197,19 +189,6 @@ function hrcore_civicrm_uninstall() {
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
  */
 function hrcore_civicrm_enable() {
-  // _hrcore_civix_civicrm_config() will add this extension to the include path.
-  // We need to do this here because before extension is enabled the config
-  // hook is not called for it
-  _hrcore_civix_civicrm_config();
-
-  $listeners = [
-    new CRM_HRCore_Hook_Enable_CustomGroupEnabler()
-  ];
-
-  foreach ($listeners as $listener) {
-    $listener->handle();
-  }
-
   _hrcore_civix_civicrm_enable();
 }
 
@@ -219,14 +198,6 @@ function hrcore_civicrm_enable() {
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
  */
 function hrcore_civicrm_disable() {
-  $listeners = [
-    new CRM_HRCore_Hook_Disable_CustomGroupDisabler()
-  ];
-
-  foreach ($listeners as $listener) {
-    $listener->handle();
-  }
-
   _hrcore_civix_civicrm_disable();
 }
 
diff --git a/uk.co.compucorp.civicrm.hrcore/tests/phpunit/CRM/HRCore/Helper/ExtensionHelperTest.php b/uk.co.compucorp.civicrm.hrcore/tests/phpunit/CRM/HRCore/Helper/ExtensionHelperTest.php
index e67d3ea052d..f7bde0da97f 100644
--- a/uk.co.compucorp.civicrm.hrcore/tests/phpunit/CRM/HRCore/Helper/ExtensionHelperTest.php
+++ b/uk.co.compucorp.civicrm.hrcore/tests/phpunit/CRM/HRCore/Helper/ExtensionHelperTest.php
@@ -10,15 +10,16 @@ class CRM_HRCore_Helper_ExtensionHelperTest extends CRM_HRCore_Test_BaseHeadless
   /**
    * @var string
    */
-  private $extensionKey = 'uk.co.compucorp.civicrm.hremails';
+  private $hrCoreKey = 'uk.co.compucorp.civicrm.hrcore';
 
   public function testCheckIsFalseAfterExtensionIsDisabled() {
-    civicrm_api3('Extension', 'disable', ['keys' => $this->extensionKey]);
-    $this->assertFalse(ExtensionHelper::isExtensionEnabled($this->extensionKey));
+    // hrcore is enabled by default in CRM_HRCore_Test_BaseHeadlessTest
+    civicrm_api3('Extension', 'disable', ['keys' => $this->hrCoreKey]);
+    $this->assertFalse(ExtensionHelper::isExtensionEnabled($this->hrCoreKey));
   }
 
   public function testCheckIsTrueAfterExtensionIsEnabled() {
-    civicrm_api3('Extension', 'enable', ['keys' => $this->extensionKey]);
-    $this->assertTrue(ExtensionHelper::isExtensionEnabled($this->extensionKey));
+    civicrm_api3('Extension', 'enable', ['keys' => $this->hrCoreKey]);
+    $this->assertTrue(ExtensionHelper::isExtensionEnabled($this->hrCoreKey));
   }
 }
diff --git a/uk.co.compucorp.civicrm.hrcore/tests/phpunit/CRM/HRCore/Service/CustomGroupStatusSwitcherTest.php b/uk.co.compucorp.civicrm.hrcore/tests/phpunit/CRM/HRCore/Service/CustomGroupStatusSwitcherTest.php
deleted file mode 100644
index a1d65aacdd3..00000000000
--- a/uk.co.compucorp.civicrm.hrcore/tests/phpunit/CRM/HRCore/Service/CustomGroupStatusSwitcherTest.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-use CRM_HRCore_Test_BaseHeadlessTest as BaseHeadlessTest;
-use CRM_HRCore_Service_CustomGroupStatusSwitcher as CustomGroupStatusSwitcher;
-use CRM_HRCore_Test_Fabricator_CustomGroup as CustomGroupFabricator;
-use CRM_HRCore_Test_Fabricator_CustomField as CustomFieldFabricator;
-
-/**
- * @group headless
- */
-class CRM_HRCore_Service_CustomGroupStatusSwitcherTest extends BaseHeadlessTest {
-
-  /**
-   * @var array
-   */
-  private static $customGroup = [];
-
-  /**
-   * @var array
-   */
-  private static $customFields = [];
-
-  public function testDisablingWillDisableAllFields() {
-    $groupId = self::$customGroup['id'];
-
-    $switcher = new CustomGroupStatusSwitcher();
-    $switcher->disable(self::$customGroup['name']);
-
-    // check that all custom fields were disabled
-    foreach (self::$customFields as $customField) {
-      $id = $customField['id'];
-      $updatedField = civicrm_api3('CustomField', 'getsingle', ['id' => $id]);
-      $this->assertEquals(0, $updatedField['is_active']);
-    }
-
-    // check custom group was disabled
-    $updatedGroup = civicrm_api3('CustomGroup', 'getsingle', ['id' => $groupId]);
-    $this->assertEquals(0, $updatedGroup['is_active']);
-
-  }
-
-  public function testEnablingWillEnableAllFields() {
-    $groupId = self::$customGroup['id'];
-    // disable the group
-    civicrm_api3('CustomGroup', 'create', ['id' => $groupId, 'is_active' => 0]);
-
-    // disable the fields
-    foreach (self::$customFields as $customField) {
-      civicrm_api3('CustomField', 'create', [
-        'id' => $customField['id'],
-        'is_active' => 0,
-      ]);
-    }
-
-    $switcher = new CustomGroupStatusSwitcher();
-    $switcher->enable(self::$customGroup['name']);
-
-    // check that all custom fields were enabled
-    foreach (self::$customFields as $customField) {
-      $id = $customField['id'];
-      $updatedField = civicrm_api3('CustomField', 'getsingle', ['id' => $id]);
-      $this->assertEquals(1, $updatedField['is_active']);
-    }
-
-    // check custom group was enabled
-    $updatedGroup = civicrm_api3('CustomGroup', 'getsingle', ['id' => $groupId]);
-    $this->assertEquals(1, $updatedGroup['is_active']);
-  }
-
-  public function testNonExistingGroupNameWillThrowException() {
-    $groupName = 'Lala';
-    $expectedMessage = 'Could not find group with name "Lala"';
-    $this->setExpectedException(\Exception::class, $expectedMessage);
-    $switcher = new CustomGroupStatusSwitcher();
-    $switcher->enable($groupName);
-  }
-
-  /**
-   * CiviCRM test transactions are broken by custom group creation. If you
-   * create and subsequently delete a custom group in a test it will drop the
-   * table but leave the civicrm_custom_group entry. This means the next
-   * time the test is run it will fail when it tries to drop a table that
-   * doesn't exist.
-   *
-   * Similarly with custom fields, if you drop one inside a test the column
-   * will be dropped outside of the transaction, but the field will only be
-   * dropped inside the transaction, meaning the next time you try to delete
-   * a custom group it will fail because it tries to drop columns that don't
-   * exist.
-   *
-   * To avoid these problems all custom group / field creation and deletion is
-   * done outside the test. The CiviTestListener manages transactions in
-   * SetUp and TearDown, so we use the "BeforeClass" and "AfterClass" methods
-   */
-  public static function setUpBeforeClass() {
-    // If the last test critically errored the group might still exist
-    self::deleteCustomGroupIfExists('Foo');
-
-    self::$customGroup = CustomGroupFabricator::fabricate(['name' => 'Foo']);
-    self::createCustomFields(2);
-  }
-
-  /**
-   * Clean up everything created in this test class
-   */
-  public static function tearDownAfterClass() {
-    static::deleteCustomGroupIfExists(self::$customGroup['name']);
-  }
-
-  /**
-   * Checks if a custom group exists (by name) and deletes it if it does
-   *
-   * @param string $groupName
-   */
-  private static function deleteCustomGroupIfExists($groupName) {
-    $existing = civicrm_api3('CustomGroup', 'get', ['name' => $groupName]);
-    if ($existing['count'] > 0) {
-      $existing = array_shift($existing['values']);
-      civicrm_api3('CustomGroup', 'delete', ['id' => $existing['id']]);
-    }
-  }
-
-  /**
-   * Create some custom fields for the test custom group
-   *
-   * @param int $count
-   */
-  private static function createCustomFields($count) {
-    $customFields = [];
-
-    for ($i = 0; $i < $count; $i++) {
-      $params['custom_group_id'] = self::$customGroup['id'];
-      $params['name'] = 'bar_' . $i;
-      $customFields[] = CustomFieldFabricator::fabricate($params);
-    }
-
-    self::$customFields = $customFields;
-  }
-
-}
diff --git a/uk.co.compucorp.civicrm.hrsampledata/resources/csv/civicrm_option_value.csv b/uk.co.compucorp.civicrm.hrsampledata/resources/csv/civicrm_option_value.csv
index ed6ff7da462..70beb41a1e1 100644
--- a/uk.co.compucorp.civicrm.hrsampledata/resources/csv/civicrm_option_value.csv
+++ b/uk.co.compucorp.civicrm.hrsampledata/resources/csv/civicrm_option_value.csv
@@ -85,6 +85,9 @@ name,phone_type,Mobile,Mobile,,0,0,0,0,,0
 name,marital_status_20130913084916,Single,Single,,0,0,0,0,,0
 name,marital_status_20130913084916,Married,Married,,0,0,0,0,,0
 name,marital_status_20130913084916,Divorced,Divorced,,0,0,0,0,,0
+name,sexual_orientation_20130725124348,Not Applicable,Not Applicable,,0,0,0,0,,0
+name,religion_20130725124132,Not Applicable,Not Applicable,,0,0,0,0,,0
+name,ethnicity_20130725123943,Not Applicable,Not Applicable,,0,0,0,0,,0
 name,hrjc_benefit_type,Fixed,Fixed,,0,0,0,0,,0
 name,hrjc_benefit_name,Bike,Bike,,0,0,0,0,,0
 name,postal_greeting,Dear {contact.first_name},Dear {contact.first_name},,1,1,0,0,,0
diff --git a/uk.co.compucorp.civicrm.hrsampledata/tests/phpunit/CRM/HRSampleData/BaseCSVProcessorTest.php b/uk.co.compucorp.civicrm.hrsampledata/tests/phpunit/CRM/HRSampleData/BaseCSVProcessorTest.php
index 04c4a161ff7..59bd263f19d 100644
--- a/uk.co.compucorp.civicrm.hrsampledata/tests/phpunit/CRM/HRSampleData/BaseCSVProcessorTest.php
+++ b/uk.co.compucorp.civicrm.hrsampledata/tests/phpunit/CRM/HRSampleData/BaseCSVProcessorTest.php
@@ -20,6 +20,7 @@ public function setUpHeadless() {
       ->install('com.civicrm.hrjobroles')
       ->install('org.civicrm.hrrecruitment')
       ->install('org.civicrm.hremergency')
+      ->install('org.civicrm.hrdemog')
       ->install('org.civicrm.hrbank')
       ->install('uk.co.compucorp.civicrm.tasksassignments')
       ->install('org.civicrm.hrcase')
diff --git a/uk.co.compucorp.civicrm.hrsampledata/tests/phpunit/CRM/HRSampleData/Importer/ExtendedDemographicsTest.php b/uk.co.compucorp.civicrm.hrsampledata/tests/phpunit/CRM/HRSampleData/Importer/ExtendedDemographicsTest.php
index a429706bc4b..60a7184a6eb 100644
--- a/uk.co.compucorp.civicrm.hrsampledata/tests/phpunit/CRM/HRSampleData/Importer/ExtendedDemographicsTest.php
+++ b/uk.co.compucorp.civicrm.hrsampledata/tests/phpunit/CRM/HRSampleData/Importer/ExtendedDemographicsTest.php
@@ -22,6 +22,9 @@ public function testProcess() {
     $this->rows[] = [
       $this->testContact['id'],
       1020,
+      'Not Applicable',
+      'Not Applicable',
+      'Not Applicable',
       'Single',
     ];
 
@@ -40,6 +43,9 @@ private function importHeadersFixture() {
     return [
       'entity_id',
       'Nationality',
+      'Ethnicity',
+      'Religion',
+      'Sexual_Orientation',
       'Marital_Status',
     ];
   }