diff --git a/.gitignore b/.gitignore
index 89d575b..dd154cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,10 @@
 _build/build.config.php
 config.core.php
+
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/_build/build.config.sample.php b/_build/build.config.sample.php
deleted file mode 100644
index f3e5fd4..0000000
--- a/_build/build.config.sample.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * faqMan
- *
- * Copyright 2010 by Josh Tambunga <josh+faqman@joshsmind.com>
- *
- * faqMan is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * faqMan 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * faqMan; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-/**
- * Define the MODX path constants necessary for installation
- *
- * @package faqman
- * @subpackage build
- */
-define('MODX_BASE_PATH', dirname(dirname(dirname(dirname(__FILE__)))) . '/modx/');
-define('MODX_CORE_PATH', MODX_BASE_PATH . 'core/');
-define('MODX_MANAGER_PATH', MODX_BASE_PATH . 'manager/');
-define('MODX_CONNECTORS_PATH', MODX_BASE_PATH . 'connectors/');
-define('MODX_ASSETS_PATH', MODX_BASE_PATH . 'assets/');
-
-define('MODX_BASE_URL','/modx/');
-define('MODX_CORE_URL', MODX_BASE_URL . 'core/');
-define('MODX_MANAGER_URL', MODX_BASE_URL . 'manager/');
-define('MODX_CONNECTORS_URL', MODX_BASE_URL . 'connectors/');
-define('MODX_ASSETS_URL', MODX_BASE_URL . 'assets/');
diff --git a/_build/build.schema.php b/_build/build.schema.php
index 4faa470..0dd9a12 100644
--- a/_build/build.schema.php
+++ b/_build/build.schema.php
@@ -34,11 +34,11 @@
 define('PKG_NAME_LOWER', strtolower(PKG_NAME));
 
 // Define sources
-$root = dirname(dirname(__FILE__)).'/';
+$root = dirname(__FILE__, 2).'/';
 $sources = array(
     'root'   => $root,
     'core'   => $root . 'core/components/' . PKG_NAME_LOWER . '/',
-    'model'  => $root . 'core/components/' . PKG_NAME_LOWER . '/model/',
+    'model'  => $root . 'core/components/' . PKG_NAME_LOWER . '/src/',
     'assets' => $root . 'assets/components/' . PKG_NAME_LOWER . '/',
 );
 
@@ -47,7 +47,6 @@
 include_once MODX_CORE_PATH . 'model/modx/modx.class.php';
 $modx = new modX();
 $modx->initialize('mgr');
-$modx->loadClass('transport.modPackageBuilder', '', false, true);
 
 // Used for nice formatting of log messages
 echo '<pre>';
@@ -57,30 +56,10 @@
 $manager   = $modx->getManager();
 $generator = $manager->getGenerator();
 
-$generator->classTemplate= <<<EOD
-<?php
-/**
- * [+phpdoc-package+]
- */
-class [+class+] extends [+extends+] {}
-?>
-EOD;
-$generator->platformTemplate= <<<EOD
-<?php
-/**
- * [+phpdoc-package+]
- */
-require_once (strtr(realpath(dirname(dirname(__FILE__))), '\\\\', '/') . '/[+class-lowercase+].class.php');
-class [+class+]_[+platform+] extends [+class+] {}
-?>
-EOD;
-$generator->mapHeader= <<<EOD
-<?php
-/**
- * [+phpdoc-package+]
- */
-EOD;
-$generator->parseSchema($sources['model'] . 'schema/'.PKG_NAME_LOWER.'.mysql.schema.xml', $sources['model']);
+
+$generator->parseSchema($sources['core'] . '/model/schema/'.PKG_NAME_LOWER.'.mysql.schema.xml', $sources['model'], ['namespacePrefix' => 'faqMan']);
+//$manager->createObjectContainer('faqMan\Model\faqManItem');
+
 
 $mtime     = microtime();
 $mtime     = explode(" ", $mtime);
diff --git a/_build/build.transport.php b/_build/build.transport.php
index 5a434c6..2f72b9d 100644
--- a/_build/build.transport.php
+++ b/_build/build.transport.php
@@ -23,6 +23,9 @@
  * @package faqman
  * @subpackage build
  */
+
+use MODX\Revolution\Transport\modPackageBuilder;
+
 $mtime  = microtime();
 $mtime  = explode(' ', $mtime);
 $mtime  = $mtime[1] + $mtime[0];
@@ -32,7 +35,7 @@
 // Define package
 define('PKG_NAME','faqMan');
 define('PKG_NAME_LOWER',strtolower(PKG_NAME));
-define('PKG_VERSION','2.0.1');
+define('PKG_VERSION','2.0.2');
 define('PKG_RELEASE','pl');
 
 // Define sources
diff --git a/assets/components/faqman/connector.php b/assets/components/faqman/connector.php
index a3cfa21..18285ce 100644
--- a/assets/components/faqman/connector.php
+++ b/assets/components/faqman/connector.php
@@ -22,18 +22,19 @@
  *
  * @package faqman
  */
-require_once dirname(dirname(dirname(dirname(__FILE__)))).'/config.core.php';
+if (!@include_once dirname(__FILE__, 5).'/config.core.php') {
+    require_once dirname(__FILE__, 4).'/config.core.php';
+}
 require_once MODX_CORE_PATH.'config/'.MODX_CONFIG_KEY.'.inc.php';
 require_once MODX_CONNECTORS_PATH.'index.php';
 
 $corePath = $modx->getOption('faqman.core_path',null,$modx->getOption('core_path').'components/faqman/');
-require_once $corePath.'model/faqman/faqman.class.php';
-$modx->faqman = new faqMan($modx);
+$modx->faqman = $modx->services->get('faqMan');
 
 $modx->lexicon->load('faqman:default');
 
 /* handle request */
-$path = $modx->getOption('processorsPath',$modx->faqman->config,$corePath.'processors/');
+$path = $modx->getOption('processorsPath',$modx->faqman->config,$corePath.'src/Processors/');
 $modx->request->handleRequest(array(
     'processors_path' => $path,
     'location' => '',
diff --git a/assets/components/faqman/css/index.html b/assets/components/faqman/css/index.html
deleted file mode 100644
index e69de29..0000000
diff --git a/assets/components/faqman/index.html b/assets/components/faqman/index.html
deleted file mode 100644
index e69de29..0000000
diff --git a/assets/components/faqman/js/index.html b/assets/components/faqman/js/index.html
deleted file mode 100644
index e69de29..0000000
diff --git a/assets/components/faqman/js/mgr/widgets/items.grid.js b/assets/components/faqman/js/mgr/widgets/items.grid.js
index 0dbba5e..8347259 100644
--- a/assets/components/faqman/js/mgr/widgets/items.grid.js
+++ b/assets/components/faqman/js/mgr/widgets/items.grid.js
@@ -11,7 +11,7 @@ Faqman.grid.Items = function(config) {
         id: 'faqman-grid-items'
         ,url: Faqman.config.connectorUrl
         ,baseParams: {
-            action: 'mgr/item/getList'
+            action: 'faqMan\\Processors\\Mgr\\Item\\getList'
             ,set: config.setid
         }
         ,fields: ['id', 'question', 'answer', 'set', 'rank', 'actions']
@@ -222,7 +222,7 @@ Ext.extend(Faqman.grid.Items,MODx.grid.Grid,{
             ,text: _('faqman.item_remove_confirm')
             ,url: Faqman.config.connectorUrl
             ,params: {
-                action: 'mgr/item/remove'
+                action: 'faqMan\\Processors\\Mgr\\Item\\Remove'
                 ,id: this.menu.record.id
             }
             ,listeners: {
@@ -239,7 +239,7 @@ Ext.extend(Faqman.grid.Items,MODx.grid.Grid,{
         MODx.Ajax.request({
             url: Faqman.config.connectorUrl
             ,params: {
-                action: 'mgr/item/publish'
+                action: 'faqMan\\Processors\\Mgr\\Item\\Publish'
                 ,id: this.menu.record.id
             }
             ,listeners: {
@@ -254,7 +254,7 @@ Ext.extend(Faqman.grid.Items,MODx.grid.Grid,{
         MODx.Ajax.request({
             url: Faqman.config.connectorUrl
             ,params: {
-                action: 'mgr/item/unpublish'
+                action: 'faqMan\\Processors\\Mgr\\Item\\Unpublish'
                 ,id: this.menu.record.id
             }
             ,listeners: {
@@ -305,7 +305,7 @@ Faqman.window.CreateItem = function(config) {
         ,url: Faqman.config.connectorUrl
         ,closeAction: 'close'
         ,baseParams: {
-            action: 'mgr/item/create'
+            action: 'faqMan\\Processors\\Mgr\\Item\\Create'
             ,set: config.set
         }
         ,fields: [{
@@ -343,7 +343,7 @@ Faqman.window.UpdateItem = function(config) {
         ,width: 650
         ,modal: true
         ,url: Faqman.config.connectorUrl
-        ,action: 'mgr/item/update'
+        ,action: 'faqMan\\Processors\\Mgr\\Item\\Update'
         ,closeAction: 'close'
         ,fields: [{
             xtype: 'hidden'
diff --git a/assets/components/faqman/js/mgr/widgets/sets.grid.js b/assets/components/faqman/js/mgr/widgets/sets.grid.js
index 0d6b0de..235e2d9 100644
--- a/assets/components/faqman/js/mgr/widgets/sets.grid.js
+++ b/assets/components/faqman/js/mgr/widgets/sets.grid.js
@@ -19,7 +19,7 @@ Faqman.grid.Sets = function(config) {
     Ext.applyIf(config,{
         id: 'faqman-grid-sets'
         ,url: Faqman.config.connectorUrl
-        ,baseParams: { action: 'mgr/set/getList' }
+        ,baseParams: { action: 'faqMan\\Processors\\Mgr\\Set\\getList' }
         ,fields: ['id','name','description','rank', 'published']
         ,autoHeight: true
         ,paging: true
@@ -28,7 +28,7 @@ Faqman.grid.Sets = function(config) {
         ,remoteSort: true
         ,anchor: '97%'
         ,autoExpandColumn: 'name'
-        ,save_action: 'mgr/set/updateFromGrid'
+        ,save_action: 'faqMan\\Processors\\Mgr\\Set\\UpdateFromGrid'
         ,autosave: true
         ,view: gridView
         ,columns: [
@@ -95,7 +95,7 @@ Ext.extend(Faqman.grid.Sets,MODx.grid.Grid,{
         MODx.Ajax.request({
             url: this.config.url
             ,params: {
-                action: 'mgr/set/sort'
+                action: 'faqMan\\Processors\\Mgr\\Set\\Sort'
                 ,source: o.source.id
                 ,target: o.target.id
             }
@@ -190,7 +190,7 @@ Ext.extend(Faqman.grid.Sets,MODx.grid.Grid,{
         MODx.Ajax.request({
             url: this.config.url
             ,params: {
-                action: 'mgr/set/publish'
+                action: 'faqMan\\Processors\\Mgr\\Set\\Publish'
                 ,id: this.menu.record.id
             }
             ,listeners: {
@@ -207,7 +207,7 @@ Ext.extend(Faqman.grid.Sets,MODx.grid.Grid,{
         MODx.Ajax.request({
             url: this.config.url
             ,params: {
-                action: 'mgr/set/unpublish'
+                action: 'faqMan\\Processors\\Mgr\\Set\\Unpublish'
                 ,id: this.menu.record.id
             }
             ,listeners: {
@@ -248,7 +248,7 @@ Faqman.window.CreateSet = function(config) {
         ,width: 475
         ,modal: true
         ,url: Faqman.config.connectorUrl
-        ,action: 'mgr/set/create'
+        ,action: 'faqMan\\Processors\\Mgr\\Set\\Create'
         ,fields: [{
             xtype: 'textfield'
             ,fieldLabel: _('name')
@@ -276,7 +276,7 @@ Faqman.window.UpdateSet = function(config) {
         ,width: 475
         ,modal: true
         ,url: Faqman.config.connectorUrl
-        ,action: 'mgr/set/update'
+        ,action: 'faqMan\\Processors\\Mgr\\Set\\Update'
         ,fields: [{
             xtype: 'hidden'
             ,name: 'id'
diff --git a/core/components/faqman/bootstrap.php b/core/components/faqman/bootstrap.php
new file mode 100644
index 0000000..fdcf9d8
--- /dev/null
+++ b/core/components/faqman/bootstrap.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @var \MODX\Revolution\modX $modx
+ * @var array $namespace
+ */
+
+require_once $namespace['path'] . 'vendor/autoload.php';
+
+$modx->addPackage('faqMan\Model', $namespace['path'] . 'src/', null, 'faqMan\\');
+
+$modx->services->add('faqMan', function() use ($modx) {
+    return new faqMan\faqMan($modx);
+});
diff --git a/core/components/faqman/composer.json b/core/components/faqman/composer.json
new file mode 100644
index 0000000..baa065a
--- /dev/null
+++ b/core/components/faqman/composer.json
@@ -0,0 +1,7 @@
+{
+  "autoload": {
+    "psr-4": {
+      "faqMan\\": "src/"
+    }
+  }
+}
diff --git a/core/components/faqman/composer.lock b/core/components/faqman/composer.lock
new file mode 100644
index 0000000..ba6fe47
--- /dev/null
+++ b/core/components/faqman/composer.lock
@@ -0,0 +1,18 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "d751713988987e9331980363e24189ce",
+    "packages": [],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.6.0"
+}
diff --git a/core/components/faqman/controllers/index.class.php b/core/components/faqman/controllers/index.class.php
index 611b7e2..6ff6bd7 100644
--- a/core/components/faqman/controllers/index.class.php
+++ b/core/components/faqman/controllers/index.class.php
@@ -21,11 +21,10 @@
  * @package faqman
  * @subpackage controllers
  */
-require_once dirname(dirname(__FILE__)).'/model/faqman/faqman.class.php';
-class FaqmanIndexManagerController extends \modExtraManagerController {
+class FaqmanIndexManagerController extends modExtraManagerController {
     public $faqman;
     public function initialize() {
-        $this->faqman = new faqMan($this->modx);
+        $this->faqman = $this->modx->services->get('faqMan');
         $this->addCss($this->faqman->config['cssUrl'].'mgr.css');
         $this->addJavascript($this->faqman->config['jsUrl'].'mgr/faqman.js');
         $this->addHtml('<script>
diff --git a/core/components/faqman/elements/snippets/snippet.faqman.php b/core/components/faqman/elements/snippets/snippet.faqman.php
index 7fe3b95..bfe32e6 100644
--- a/core/components/faqman/elements/snippets/snippet.faqman.php
+++ b/core/components/faqman/elements/snippets/snippet.faqman.php
@@ -4,13 +4,11 @@
  *
  * @package faqman
  */
-$faqMan = $modx->getService(
-    'faqman',
-    'faqMan',
-    $modx->getOption('faqman.core_path', null, $modx->getOption('core_path').'components/faqman/').'model/faqman/',
-    $scriptProperties
-);
-if (!($faqMan instanceof faqMan)) return '';
+use \faqMan\Model\faqManSet;
+use \faqMan\Model\faqManItem;
+
+$faqMan = $modx->services->get('faqMan');
+if (!($faqMan instanceof \faqMan\faqMan)) return '';
 
 $set                = $modx->getOption('set', $scriptProperties, null);
 $sets               = $modx->getOption('sets', $scriptProperties, null);
@@ -26,7 +24,7 @@
 $setOutputSeparator = $modx->getOption('setOutputSeparator', $scriptProperties, "\n");
 
 /* build query */
-$c = $modx->newQuery('faqManSet');
+$c = $modx->newQuery(faqManSet::class);
 
 if (!empty($set)) {
     $c->where(array(
@@ -48,7 +46,7 @@
 if (!empty($limit)) $c->limit($limit);
 
 // Get collection of FAQ sets based on query
-$sets = $modx->getCollection('faqManSet', $c);
+$sets = $modx->getCollection(faqManSet::class, $c);
 
 // Loop through found FAQ sets and build the output
 $list = array();
@@ -58,7 +56,7 @@
     $setArray = $set->toArray();
 
     // Loop through items and set output to array
-    $ci = $modx->newQuery('faqManItem');
+    $ci = $modx->newQuery(faqManItem::class);
 
     // Hide unpublished items
     if (!$showUnpublished) {
diff --git a/core/components/faqman/elements/snippets/snippet.faqmansets.php b/core/components/faqman/elements/snippets/snippet.faqmansets.php
index 5998210..5d495f8 100644
--- a/core/components/faqman/elements/snippets/snippet.faqmansets.php
+++ b/core/components/faqman/elements/snippets/snippet.faqmansets.php
@@ -6,9 +6,11 @@
  *
  * @package faqman
  */
+use faqMan\Model\faqManSet;
+use faqMan\Model\faqManItem;
 
-$faqMan = $modx->getService('faqman','faqMan',$modx->getOption('faqman.core_path',null,$modx->getOption('core_path').'components/faqman/').'model/faqman/',$scriptProperties);
-if (!($faqMan instanceof faqMan)) return '';
+$faqMan = $modx->services->get('faqMan');
+if (!($faqMan instanceof faqMan\faqMan)) return '';
 
 $set = $modx->getOption('set',$scriptProperties,null);
 $tpl = $modx->getOption('tpl',$scriptProperties,'Faqs');
@@ -22,7 +24,7 @@
 $showUnpublished = $modx->getOption('showUnpublished', $scriptProperties, false);
 
 /* build query */
-$c = $modx->newQuery('faqManSet');
+$c = $modx->newQuery(faqManSet::class);
 
 if (!empty($set)) {
     $field = (is_numeric($set)) ? 'id' : 'name';
@@ -38,7 +40,7 @@
 
 $c->sortby($modx->quote($sortBy),$sortDir);
 if (!empty($limit)) $c->limit($limit);
-$items = $modx->getCollection('faqManSet',$c);
+$items = $modx->getCollection(faqManSet::class,$c);
 
 /* iterate through items */
 $list = array();
@@ -50,7 +52,7 @@
     $itemArray['setidx'] = $si;
 
     // get faqManItems of this set
-    $criteria = $modx->newQuery('faqManItem');
+    $criteria = $modx->newQuery(faqManItem::class);
     if (!$showUnpublished) {
         $criteria->where(array('published' => true));
     }
diff --git a/core/components/faqman/model/schema/faqman.mysql.schema.xml b/core/components/faqman/model/schema/faqman.mysql.schema.xml
index a5a8db4..a2445b2 100644
--- a/core/components/faqman/model/schema/faqman.mysql.schema.xml
+++ b/core/components/faqman/model/schema/faqman.mysql.schema.xml
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model package="faqman" baseClass="xPDOObject" platform="mysql" defaultEngine="MyISAM" phpdoc-package="faqman" version="1.1">
+<model package="faqMan\Model" platform="mysql" defaultEngine="InnoDB" phpdoc-package="faqman" version="3.0">
 
     <!-- FAQ's are grouped into 'sets', when categories are implemented they will be used to group items within sets -->
-    <object class="faqManSet" table="faqman_set" extends="xPDOSimpleObject">
+    <object class="faqManSet" table="faqman_set" extends="xPDO\Om\xPDOSimpleObject">
         <field key="name" dbtype="varchar" precision="255" phptype="string" null="false" default="" />
         <field key="description" dbtype="text" phptype="string" null="false" default="" />
         <field key="rank" dbtype="integer" precision="5" attributes="unsigned" phptype="integer" null="false" default="0" />
         <field key="published" dbtype="integer" precision="1" attributes="unsigned" phptype="integer" null="false" default="1" />
-
-        <composite alias="Item" class="faqManItem" local="id" foreign="set" cardinality="many" owner="local" />
+        <composite alias="Item" class="faqMan\Model\faqManItem" local="id" foreign="set" cardinality="many" owner="local" />
     </object>
 
-    <object class="faqManItem" table="faqman_items" extends="xPDOSimpleObject">
+    <object class="faqManItem" table="faqman_items" extends="xPDO\Om\xPDOSimpleObject">
         <field key="question" dbtype="text" phptype="string" null="false" default="" />
         <field key="answer" dbtype="text" phptype="string" null="false" default="" />
+        <field key="author" dbtype="tinytext" phptype="string" null="true" default="" />
+        <field key="createdAt" dbtype="timestamp" phptype="string" null="false" attributes="DEFAULT CURRENT_TIMESTAMP" />
         <field key="rank" dbtype="integer" precision="5" attributes="unsigned" phptype="integer" null="false" default="0" />
         <field key="type" dbtype="integer" precision="1" attributes="unsigned" phptype="integer" null="false" default="0" />
         <field key="published" dbtype="integer" precision="1" attributes="unsigned" phptype="integer" null="false" default="1" />
-
         <field key="set" dbtype="integer" precision="10" attributes="unsigned" phptype="integer" null="false" default="0" index="index" />
-
-        <aggregate alias="Set" class="faqManSet" local="set" foreign="id" cardinality="one" owner="foreign" />
+        <aggregate alias="Set" class="faqMan\Model\faqManSet" local="set" foreign="id" cardinality="one" owner="foreign" />
     </object>
 </model>
diff --git a/core/components/faqman/src/Model/faqManItem.php b/core/components/faqman/src/Model/faqManItem.php
new file mode 100644
index 0000000..eda90e7
--- /dev/null
+++ b/core/components/faqman/src/Model/faqManItem.php
@@ -0,0 +1,22 @@
+<?php
+namespace faqMan\Model;
+
+use xPDO\xPDO;
+
+/**
+ * Class faqManItem
+ *
+ * @property string $question
+ * @property string $answer
+ * @property string $author
+ * @property string $createdAt
+ * @property integer $rank
+ * @property integer $type
+ * @property integer $published
+ * @property integer $set
+ *
+ * @package faqMan\Model
+ */
+class faqManItem extends \xPDO\Om\xPDOSimpleObject
+{
+}
diff --git a/core/components/faqman/src/Model/faqManSet.php b/core/components/faqman/src/Model/faqManSet.php
new file mode 100644
index 0000000..44169a6
--- /dev/null
+++ b/core/components/faqman/src/Model/faqManSet.php
@@ -0,0 +1,20 @@
+<?php
+namespace faqMan\Model;
+
+use xPDO\xPDO;
+
+/**
+ * Class faqManSet
+ *
+ * @property string $name
+ * @property string $description
+ * @property integer $rank
+ * @property integer $published
+ *
+ * @property \faqMan\Model\faqManItem[] $Item
+ *
+ * @package faqMan\Model
+ */
+class faqManSet extends \xPDO\Om\xPDOSimpleObject
+{
+}
diff --git a/core/components/faqman/src/Model/metadata.mysql.php b/core/components/faqman/src/Model/metadata.mysql.php
new file mode 100644
index 0000000..929dff2
--- /dev/null
+++ b/core/components/faqman/src/Model/metadata.mysql.php
@@ -0,0 +1,14 @@
+<?php
+$xpdo_meta_map = array (
+    'version' => '3.0',
+    'namespace' => 'faqMan\\Model',
+    'namespacePrefix' => 'faqMan',
+    'class_map' => 
+    array (
+        'xPDO\\Om\\xPDOSimpleObject' => 
+        array (
+            0 => 'faqMan\\Model\\faqManSet',
+            1 => 'faqMan\\Model\\faqManItem',
+        ),
+    ),
+);
\ No newline at end of file
diff --git a/core/components/faqman/src/Model/mysql/faqManItem.php b/core/components/faqman/src/Model/mysql/faqManItem.php
new file mode 100644
index 0000000..3b1f1d3
--- /dev/null
+++ b/core/components/faqman/src/Model/mysql/faqManItem.php
@@ -0,0 +1,110 @@
+<?php
+namespace faqMan\Model\mysql;
+
+use xPDO\xPDO;
+
+class faqManItem extends \faqMan\Model\faqManItem
+{
+
+    public static $metaMap = array (
+        'package' => 'faqMan\\Model',
+        'version' => '3.0',
+        'table' => 'faqman_items',
+        'extends' => 'xPDO\\Om\\xPDOSimpleObject',
+        'tableMeta' => 
+        array (
+            'engine' => 'InnoDB',
+        ),
+        'fields' => 
+        array (
+            'question' => '',
+            'answer' => '',
+            'author' => '',
+            'createdAt' => NULL,
+            'rank' => 0,
+            'type' => 0,
+            'published' => 1,
+            'set' => 0,
+        ),
+        'fieldMeta' => 
+        array (
+            'question' => 
+            array (
+                'dbtype' => 'text',
+                'phptype' => 'string',
+                'null' => false,
+                'default' => '',
+            ),
+            'answer' => 
+            array (
+                'dbtype' => 'text',
+                'phptype' => 'string',
+                'null' => false,
+                'default' => '',
+            ),
+            'author' => 
+            array (
+                'dbtype' => 'tinytext',
+                'phptype' => 'string',
+                'null' => true,
+                'default' => '',
+            ),
+            'createdAt' => 
+            array (
+                'dbtype' => 'timestamp',
+                'phptype' => 'string',
+                'null' => false,
+                'attributes' => 'DEFAULT CURRENT_TIMESTAMP',
+            ),
+            'rank' => 
+            array (
+                'dbtype' => 'integer',
+                'precision' => '5',
+                'attributes' => 'unsigned',
+                'phptype' => 'integer',
+                'null' => false,
+                'default' => 0,
+            ),
+            'type' => 
+            array (
+                'dbtype' => 'integer',
+                'precision' => '1',
+                'attributes' => 'unsigned',
+                'phptype' => 'integer',
+                'null' => false,
+                'default' => 0,
+            ),
+            'published' => 
+            array (
+                'dbtype' => 'integer',
+                'precision' => '1',
+                'attributes' => 'unsigned',
+                'phptype' => 'integer',
+                'null' => false,
+                'default' => 1,
+            ),
+            'set' => 
+            array (
+                'dbtype' => 'integer',
+                'precision' => '10',
+                'attributes' => 'unsigned',
+                'phptype' => 'integer',
+                'null' => false,
+                'default' => 0,
+                'index' => 'index',
+            ),
+        ),
+        'aggregates' => 
+        array (
+            'Set' => 
+            array (
+                'class' => 'faqMan\\Model\\faqManSet',
+                'local' => 'set',
+                'foreign' => 'id',
+                'cardinality' => 'one',
+                'owner' => 'foreign',
+            ),
+        ),
+    );
+
+}
diff --git a/core/components/faqman/src/Model/mysql/faqManSet.php b/core/components/faqman/src/Model/mysql/faqManSet.php
new file mode 100644
index 0000000..5fc308c
--- /dev/null
+++ b/core/components/faqman/src/Model/mysql/faqManSet.php
@@ -0,0 +1,74 @@
+<?php
+namespace faqMan\Model\mysql;
+
+use xPDO\xPDO;
+
+class faqManSet extends \faqMan\Model\faqManSet
+{
+
+    public static $metaMap = array (
+        'package' => 'faqMan\\Model',
+        'version' => '3.0',
+        'table' => 'faqman_set',
+        'extends' => 'xPDO\\Om\\xPDOSimpleObject',
+        'tableMeta' => 
+        array (
+            'engine' => 'InnoDB',
+        ),
+        'fields' => 
+        array (
+            'name' => '',
+            'description' => '',
+            'rank' => 0,
+            'published' => 1,
+        ),
+        'fieldMeta' => 
+        array (
+            'name' => 
+            array (
+                'dbtype' => 'varchar',
+                'precision' => '255',
+                'phptype' => 'string',
+                'null' => false,
+                'default' => '',
+            ),
+            'description' => 
+            array (
+                'dbtype' => 'text',
+                'phptype' => 'string',
+                'null' => false,
+                'default' => '',
+            ),
+            'rank' => 
+            array (
+                'dbtype' => 'integer',
+                'precision' => '5',
+                'attributes' => 'unsigned',
+                'phptype' => 'integer',
+                'null' => false,
+                'default' => 0,
+            ),
+            'published' => 
+            array (
+                'dbtype' => 'integer',
+                'precision' => '1',
+                'attributes' => 'unsigned',
+                'phptype' => 'integer',
+                'null' => false,
+                'default' => 1,
+            ),
+        ),
+        'composites' => 
+        array (
+            'Item' => 
+            array (
+                'class' => 'faqMan\\Model\\faqManItem',
+                'local' => 'id',
+                'foreign' => 'set',
+                'cardinality' => 'many',
+                'owner' => 'local',
+            ),
+        ),
+    );
+
+}
diff --git a/core/components/faqman/processors/mgr/item/create.class.php b/core/components/faqman/src/Processors/Mgr/Item/Create.php
similarity index 86%
rename from core/components/faqman/processors/mgr/item/create.class.php
rename to core/components/faqman/src/Processors/Mgr/Item/Create.php
index bb2fdd8..1aca57e 100644
--- a/core/components/faqman/processors/mgr/item/create.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Item/Create.php
@@ -25,8 +25,11 @@
  * @package faqman
  * @subpackage processors
  */
- class FaqmanItemCreateProcessor extends modObjectCreateProcessor {
-    public $classKey = 'faqManItem';
+namespace faqMan\Processors\Mgr\Item;
+use MODX\Revolution\Processors\Model\CreateProcessor;
+
+class Create extends CreateProcessor {
+    public $classKey = 'faqMan\Model\faqManItem';
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 
@@ -42,7 +45,7 @@ public function beforeSave() {
      */
     private function setPublished() {
         // Check if set is currently mark as unpublished
-        $set = $this->modx->getObject('faqManSet', $this->getProperty('set'));
+        $set = $this->modx->getObject('faqMan\Model\faqManSet', $this->getProperty('set'));
         if ($set->get('published') == false) {
             $this->object->set('published', false);
         }
@@ -60,5 +63,3 @@ private function setRank() {
         $this->object->set('rank', $count);
     }
  }
-
- return 'FaqmanItemCreateProcessor';
diff --git a/core/components/faqman/processors/mgr/item/publish.class.php b/core/components/faqman/src/Processors/Mgr/Item/Publish.php
similarity index 84%
rename from core/components/faqman/processors/mgr/item/publish.class.php
rename to core/components/faqman/src/Processors/Mgr/Item/Publish.php
index cb0eb19..c56c057 100644
--- a/core/components/faqman/processors/mgr/item/publish.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Item/Publish.php
@@ -19,14 +19,18 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Item;
+use faqMan\Model\faqManItem;
+use MODX\Revolution\Processors\Model\UpdateProcessor;
+
 /**
  * Publish an Item
  *
  * @package faqman
  * @subpackage processors
  */
-class FaqmanItemPublishProcessor extends modObjectUpdateProcessor {
-    public $classKey = 'faqManItem';
+class Publish extends UpdateProcessor {
+    public $classKey = faqManItem::class;
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 
@@ -36,5 +40,3 @@ public function beforeSave() {
         return true;
     }
 }
-
-return 'FaqmanItemPublishProcessor';
diff --git a/core/components/faqman/processors/mgr/item/remove.class.php b/core/components/faqman/src/Processors/Mgr/Item/Remove.php
similarity index 90%
rename from core/components/faqman/processors/mgr/item/remove.class.php
rename to core/components/faqman/src/Processors/Mgr/Item/Remove.php
index e47b7f3..442cc27 100644
--- a/core/components/faqman/processors/mgr/item/remove.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Item/Remove.php
@@ -19,14 +19,19 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Item;
+
+use faqMan\Model\faqManItem;
+use MODX\Revolution\Processors\Model\RemoveProcessor;
+
 /**
  * Remove an Item.
  *
  * @package faqman
  * @subpackage processors
  */
-class FaqmanItemRemoveProcessor extends modObjectRemoveProcessor {
-    public $classKey = 'faqManItem';
+class Remove extends RemoveProcessor {
+    public $classKey = faqManItem::class;
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 
@@ -66,5 +71,3 @@ public function afterRemove() {
         return true;
     }
 }
-
-return 'FaqmanItemRemoveProcessor';
diff --git a/core/components/faqman/processors/mgr/item/sort.class.php b/core/components/faqman/src/Processors/Mgr/Item/Sort.php
similarity index 95%
rename from core/components/faqman/processors/mgr/item/sort.class.php
rename to core/components/faqman/src/Processors/Mgr/Item/Sort.php
index 4b1d8d0..ead1490 100644
--- a/core/components/faqman/processors/mgr/item/sort.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Item/Sort.php
@@ -17,6 +17,10 @@
  * faqMan; if not, write to the Free Software Foundation, Inc., 59 Temple
  * Place, Suite 330, Boston, MA 02111-1307 USA
  */
+namespace faqMan\Processors\Mgr\Item;
+
+use MODX\Revolution\Processors\Model\UpdateProcessor;
+
 /**
  * Sort two items. This was taken from the DD sort used by splittingred
  * in Gallery (https://github.com/splittingred/Gallery)
@@ -24,8 +28,8 @@
  * @package faqman
  * @subpackage processors
  */
-class FaqmanItemSortProcessor extends modObjectUpdateProcessor {
-    public $classKey = 'faqManItem';
+class Sort extends UpdateProcessor {
+    public $classKey = faqManItem::class;
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 
@@ -107,5 +111,3 @@ public function process() {
         return $this->cleanup();
     }
 }
-
-return 'FaqmanItemSortProcessor';
diff --git a/core/components/faqman/processors/mgr/item/unpublish.class.php b/core/components/faqman/src/Processors/Mgr/Item/Unpublish.php
similarity index 86%
rename from core/components/faqman/processors/mgr/item/unpublish.class.php
rename to core/components/faqman/src/Processors/Mgr/Item/Unpublish.php
index 45db7a2..ba07467 100644
--- a/core/components/faqman/processors/mgr/item/unpublish.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Item/Unpublish.php
@@ -19,14 +19,18 @@
  *
  * @package faqman
  */
+
+use faqMan\Model\faqManItem;
+use MODX\Revolution\Processors\Model\UpdateProcessor;
+
 /**
  * Publish an Item
  *
  * @package faqman
  * @subpackage processors
  */
-class FaqmanItemUnpublishProcessor extends modObjectUpdateProcessor {
-    public $classKey = 'faqManItem';
+class Unpublish extends UpdateProcessor {
+    public $classKey = faqManItem::class;
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 
@@ -36,5 +40,3 @@ public function beforeSave() {
         return true;
     }
 }
-
-return 'FaqmanItemUnpublishProcessor';
diff --git a/core/components/faqman/processors/mgr/item/update.class.php b/core/components/faqman/src/Processors/Mgr/Item/Update.php
similarity index 83%
rename from core/components/faqman/processors/mgr/item/update.class.php
rename to core/components/faqman/src/Processors/Mgr/Item/Update.php
index ef29da5..e115c50 100644
--- a/core/components/faqman/processors/mgr/item/update.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Item/Update.php
@@ -19,14 +19,19 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Item;
+
+use faqMan\Model\faqManItem;
+use MODX\Revolution\Processors\Model\UpdateProcessor;
+
 /**
  * Update an Item
  *
  * @package faqman
  * @subpackage processors
  */
- class FaqmanItemUpdateProcessor extends modObjectUpdateProcessor {
-    public $classKey = 'faqManItem';
+ class Update extends UpdateProcessor {
+    public $classKey = faqManItem::class;
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 }
diff --git a/core/components/faqman/processors/mgr/item/getlist.class.php b/core/components/faqman/src/Processors/Mgr/Item/getList.php
similarity index 86%
rename from core/components/faqman/processors/mgr/item/getlist.class.php
rename to core/components/faqman/src/Processors/Mgr/Item/getList.php
index e9fa2a6..80b83ea 100644
--- a/core/components/faqman/processors/mgr/item/getlist.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Item/getList.php
@@ -19,19 +19,24 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Item;
+
+use faqMan\Model\faqManItem;
+use MODX\Revolution\Processors\Model\GetListProcessor;
+
 /**
  * Get a list of Items *
  * @package faqman
  * @subpackage processors
  */
-class FaqmanItemGetListProcessor extends modObjectGetListProcessor {
-    public $classKey = 'faqManItem';
+class getList extends GetListProcessor {
+    public $classKey = faqManItem::class;
     public $languageTopic = array('faqman:default');
     public $defaultSortField = 'rank';
     public $defaultSortDirection = 'ASC';
     public $objectType = 'faqman.faqman';
 
-    public function prepareQueryBeforeCount(xPDOQuery $c) {
+    public function prepareQueryBeforeCount(\xPDO\Om\xPDOQuery $c) {
         $set   = $this->getProperty('set');
         $query = $this->getProperty('query');
 
@@ -50,7 +55,7 @@ public function prepareQueryBeforeCount(xPDOQuery $c) {
      * @param xPDOObject $object
      * @return array
      */
-    public function prepareRow(xPDOObject $object) {
+    public function prepareRow(\xPDO\Om\xPDOObject $object) {
         $itemArray = $object->toArray();
 
         return array_merge(
@@ -72,5 +77,3 @@ public function prepareRow(xPDOObject $object) {
         );
     }
 }
-
-return 'FaqmanItemGetListProcessor';
diff --git a/core/components/faqman/processors/mgr/set/create.class.php b/core/components/faqman/src/Processors/Mgr/Set/Create.php
similarity index 87%
rename from core/components/faqman/processors/mgr/set/create.class.php
rename to core/components/faqman/src/Processors/Mgr/Set/Create.php
index 91323fc..d9a3ff3 100644
--- a/core/components/faqman/processors/mgr/set/create.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Set/Create.php
@@ -19,14 +19,19 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Set;
+
+use faqMan\Model\faqManSet;
+use MODX\Revolution\Processors\Model\CreateProcessor;
+
 /**
  * Create an FAQ set
  *
  * @package faqman
  * @subpackage processors
  */
- class FaqmanSetCreateProcessor extends modObjectCreateProcessor {
-    public $classKey = 'faqManSet';
+ class Create extends CreateProcessor {
+    public $classKey = faqManSet::class;
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 
diff --git a/core/components/faqman/processors/mgr/set/publish.class.php b/core/components/faqman/src/Processors/Mgr/Set/Publish.php
similarity index 84%
rename from core/components/faqman/processors/mgr/set/publish.class.php
rename to core/components/faqman/src/Processors/Mgr/Set/Publish.php
index 3d8f0aa..29052db 100644
--- a/core/components/faqman/processors/mgr/set/publish.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Set/Publish.php
@@ -19,14 +19,18 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Set;
+use faqMan\Model\faqManSet;
+use MODX\Revolution\Processors\Model\UpdateProcessor;
+
 /**
  * Publish an FAQ Set
  *
  * @package faqman
  * @subpackage processors
  */
-class FaqmanSetPublishProcessor extends modObjectUpdateProcessor {
-    public $classKey = 'faqManSet';
+class Publish extends UpdateProcessor {
+    public $classKey = faqManSet::class;
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 
@@ -36,5 +40,3 @@ public function beforeSave() {
         return true;
     }
 }
-
-return 'FaqmanSetPublishProcessor';
diff --git a/core/components/faqman/processors/mgr/set/remove.class.php b/core/components/faqman/src/Processors/Mgr/Set/Remove.php
similarity index 83%
rename from core/components/faqman/processors/mgr/set/remove.class.php
rename to core/components/faqman/src/Processors/Mgr/Set/Remove.php
index ce316ba..1908a5a 100644
--- a/core/components/faqman/processors/mgr/set/remove.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Set/Remove.php
@@ -19,16 +19,19 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Set;
+
+use faqMan\Model\faqManSet;
+use MODX\Revolution\Processors\Model\RemoveProcessor;
+
 /**
  * Remove an FAQ set.
  *
  * @package faqman
  * @subpackage processors
  */
-class FaqmanSetRemoveProcessor extends modObjectRemoveProcessor {
-    public $classKey = 'faqManSet';
+class Remove extends RemoveProcessor {
+    public $classKey = faqManSet::class;
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 }
-
-return 'FaqmanSetRemoveProcessor';
diff --git a/core/components/faqman/processors/mgr/set/sort.class.php b/core/components/faqman/src/Processors/Mgr/Set/Sort.php
similarity index 93%
rename from core/components/faqman/processors/mgr/set/sort.class.php
rename to core/components/faqman/src/Processors/Mgr/Set/Sort.php
index 5cb0969..b04b1d9 100644
--- a/core/components/faqman/processors/mgr/set/sort.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Set/Sort.php
@@ -19,6 +19,12 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Set;
+
+use faqMan\Model\faqManSet;
+use MODX\Revolution\modAccessibleObject;
+use MODX\Revolution\Processors\Model\UpdateProcessor;
+
 /**
  * Sort two items. This was taken from the DD sort used by splittingred
  * in Gallery (https://github.com/splittingred/Gallery)
@@ -26,8 +32,8 @@
  * @package faqman
  * @subpackage processors
  */
-class FaqmanSetSortProcessor extends modObjectUpdateProcessor {
-    public $classKey = 'faqManSet';
+class Sort extends UpdateProcessor {
+    public $classKey = faqManSet::class;
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 
@@ -98,5 +104,3 @@ public function process() {
         return $this->cleanup();
     }
 }
-
-return 'FaqmanSetSortProcessor';
diff --git a/core/components/faqman/processors/mgr/set/unpublish.class.php b/core/components/faqman/src/Processors/Mgr/Set/Unpublish.php
similarity index 84%
rename from core/components/faqman/processors/mgr/set/unpublish.class.php
rename to core/components/faqman/src/Processors/Mgr/Set/Unpublish.php
index 4b93966..44468d3 100644
--- a/core/components/faqman/processors/mgr/set/unpublish.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Set/Unpublish.php
@@ -19,14 +19,18 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Set;
+use faqMan\Model\faqManSet;
+use MODX\Revolution\Processors\Model\UpdateProcessor;
+
 /**
  * Publish an FAQ Set
  *
  * @package faqman
  * @subpackage processors
  */
-class FaqmanSetPublishProcessor extends modObjectUpdateProcessor {
-    public $classKey = 'faqManSet';
+class Unpublish extends UpdateProcessor {
+    public $classKey = faqManSet::class;
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 
@@ -36,5 +40,3 @@ public function beforeSave() {
         return true;
     }
 }
-
-return 'FaqmanSetPublishProcessor';
diff --git a/core/components/faqman/processors/mgr/set/update.class.php b/core/components/faqman/src/Processors/Mgr/Set/Update.php
similarity index 82%
rename from core/components/faqman/processors/mgr/set/update.class.php
rename to core/components/faqman/src/Processors/Mgr/Set/Update.php
index 91b63b9..fdc76ab 100644
--- a/core/components/faqman/processors/mgr/set/update.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Set/Update.php
@@ -19,16 +19,19 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Set;
+
+use faqMan\Model\faqManSet;
+use MODX\Revolution\Processors\Model\UpdateProcessor;
+
 /**
  * Update an Item
  *
  * @package faqman
  * @subpackage processors
  */
- class FaqmanSetUpdateProcessor extends modObjectUpdateProcessor {
-    public $classKey = 'faqManSet';
+ class Update extends UpdateProcessor {
+    public $classKey = faqManSet::class;
     public $languageTopic = array('faqman:default');
     public $objectType = 'faqman.faqman';
 }
-
-return 'FaqmanSetUpdateProcessor';
diff --git a/core/components/faqman/processors/mgr/set/updatefromgrid.class.php b/core/components/faqman/src/Processors/Mgr/Set/UpdateFromGrid.php
similarity index 88%
rename from core/components/faqman/processors/mgr/set/updatefromgrid.class.php
rename to core/components/faqman/src/Processors/Mgr/Set/UpdateFromGrid.php
index 62a7230..eb54d3e 100644
--- a/core/components/faqman/processors/mgr/set/updatefromgrid.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Set/UpdateFromGrid.php
@@ -19,15 +19,16 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Set;
+
 /**
  * Update an Item
  *
  * @package faqman
  * @subpackage processors
  */
-require_once dirname(__FILE__) . '/update.class.php';
 
-class FaqmanSetUpdateFromGridProcessor extends FaqmanSetUpdateProcessor {
+class UpdateFromGrid extends Update {
     public function initialize() {
         $data = $this->getProperty('data');
         if (empty($data)) return $this->modx->lexicon('invalid_data');
@@ -38,5 +39,3 @@ public function initialize() {
         return parent::initialize();
     }
 }
-
-return 'FaqmanSetUpdateFromGridProcessor';
diff --git a/core/components/faqman/processors/mgr/set/getlist.class.php b/core/components/faqman/src/Processors/Mgr/Set/getList.php
similarity index 84%
rename from core/components/faqman/processors/mgr/set/getlist.class.php
rename to core/components/faqman/src/Processors/Mgr/Set/getList.php
index 2570dd6..bb4b779 100644
--- a/core/components/faqman/processors/mgr/set/getlist.class.php
+++ b/core/components/faqman/src/Processors/Mgr/Set/getList.php
@@ -19,18 +19,20 @@
  *
  * @package faqman
  */
+namespace faqMan\Processors\Mgr\Set;
+use faqMan\Model\faqManSet;
+use MODX\Revolution\Processors\Model\GetListProcessor;
+
 /**
  * Get a list of FAQ sets
  *
  * @package faqman
  * @subpackage processors
  */
-class faqManSetGetListProcessor extends modObjectGetListProcessor {
-    public $classKey = 'faqManSet';
+class getList extends GetListProcessor {
+    public $classKey = faqManSet::class;
     public $languageTopic = array('faqman:default');
     public $defaultSortField = 'rank';
     public $defaultSortDirection = 'ASC';
     public $objectType = 'faqman.faqman';
 }
-
-return 'faqManSetGetListProcessor';
diff --git a/core/components/faqman/src/faqMan.php b/core/components/faqman/src/faqMan.php
new file mode 100644
index 0000000..4a46afa
--- /dev/null
+++ b/core/components/faqman/src/faqMan.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * faqMan
+ *
+ * Copyright 2010 by Josh Tambunga <josh+faqman@joshsmind.com>
+ *
+ * faqMan is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * faqMan 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * faqMan; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+namespace faqMan;
+use MODX\Revolution\modChunk;
+use modX;
+
+/**
+ * The base class for faqMan.
+ *
+ * @package faqman
+ */
+class faqMan
+{
+    public $modx;
+    public $config = [];
+
+    /* Establish constants to for type column in database */
+    const FAQ_TYPE_Q = 0;
+    const FAQ_TYPE_C = 1;
+
+    public function __construct(modX &$modx, array $config = array())
+    {
+        $this->modx =& $modx;
+
+        $corePath = $this->modx->getOption('faqman.core_path', $config, $this->modx->getOption('core_path') . 'components/faqman/');
+        $assetsUrl = $this->modx->getOption('faqman.assets_url', $config, $this->modx->getOption('assets_url') . 'components/faqman/');
+        $connectorUrl = $assetsUrl . 'connector.php';
+
+        $this->config = array_merge(array(
+            'assetsUrl' => $assetsUrl,
+            'cssUrl' => $assetsUrl . 'css/',
+            'jsUrl' => $assetsUrl . 'js/',
+            'imagesUrl' => $assetsUrl . 'images/',
+
+            'connectorUrl' => $connectorUrl,
+
+            'corePath' => $corePath,
+            'modelPath' => $corePath . 'src/Model/',
+            'chunksPath' => $corePath . 'elements/chunks/',
+            'chunkSuffix' => '.chunk.tpl',
+            'snippetsPath' => $corePath . 'elements/snippets/',
+            'processorsPath' => $corePath . 'src/Processors/',
+            'templatesPath' => $corePath . 'templates/',
+        ), $config);
+
+        $this->modx->addPackage('faqman', $this->config['modelPath']);
+        $this->modx->lexicon->load('faqman:default');
+    }
+
+    /**
+     * Gets a Chunk and caches it; also falls back to file-based templates
+     * for easier debugging.
+     *
+     * @access public
+     * @param string $name The name of the Chunk
+     * @param array $properties The properties for the Chunk
+     * @return string The processed content of the Chunk
+     */
+    public function getChunk($name, array $properties = array())
+    {
+        $chunk = null;
+        if (!isset($this->chunks[$name])) {
+            $chunk = $this->modx->getObject('modChunk', array('name' => $name), true);
+            if (empty($chunk)) {
+                $chunk = $this->_getTplChunk($name, $this->config['chunkSuffix']);
+                if ($chunk == false) return false;
+            }
+            $this->chunks[$name] = $chunk->getContent();
+        } else {
+            $o = $this->chunks[$name];
+            $chunk = $this->modx->newObject('modChunk');
+            $chunk->setContent($o);
+        }
+        $chunk->setCacheable(false);
+        return $chunk->process($properties);
+    }
+
+    /**
+     * Returns a modChunk object from a template file.
+     *
+     * @access private
+     * @param string $name The name of the Chunk. Will parse to name.chunk.tpl by default.
+     * @param string $suffix The suffix to add to the chunk filename.
+     * @return modChunk/boolean Returns the modChunk object if found, otherwise
+     * false.
+     */
+    private function _getTplChunk($name, $suffix = '.chunk.tpl')
+    {
+        $chunk = false;
+        $f = $this->config['chunksPath'] . strtolower($name) . $suffix;
+        if (file_exists($f)) {
+            $o = file_get_contents($f);
+            $chunk = $this->modx->newObject('modChunk');
+            $chunk->set('name', $name);
+            $chunk->setContent($o);
+        }
+        return $chunk;
+    }
+}
diff --git a/core/components/faqman/vendor/autoload.php b/core/components/faqman/vendor/autoload.php
new file mode 100644
index 0000000..172f1b9
--- /dev/null
+++ b/core/components/faqman/vendor/autoload.php
@@ -0,0 +1,25 @@
+<?php
+
+// autoload.php @generated by Composer
+
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInitd751713988987e9331980363e24189ce::getLoader();
diff --git a/core/components/faqman/vendor/composer/ClassLoader.php b/core/components/faqman/vendor/composer/ClassLoader.php
new file mode 100644
index 0000000..7824d8f
--- /dev/null
+++ b/core/components/faqman/vendor/composer/ClassLoader.php
@@ -0,0 +1,579 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
+ */
+class ClassLoader
+{
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
+    /** @var string|null */
+    private $vendorDir;
+
+    // PSR-4
+    /**
+     * @var array<string, array<string, int>>
+     */
+    private $prefixLengthsPsr4 = array();
+    /**
+     * @var array<string, list<string>>
+     */
+    private $prefixDirsPsr4 = array();
+    /**
+     * @var list<string>
+     */
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    /**
+     * List of PSR-0 prefixes
+     *
+     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+     *
+     * @var array<string, array<string, list<string>>>
+     */
+    private $prefixesPsr0 = array();
+    /**
+     * @var list<string>
+     */
+    private $fallbackDirsPsr0 = array();
+
+    /** @var bool */
+    private $useIncludePath = false;
+
+    /**
+     * @var array<string, string>
+     */
+    private $classMap = array();
+
+    /** @var bool */
+    private $classMapAuthoritative = false;
+
+    /**
+     * @var array<string, bool>
+     */
+    private $missingClasses = array();
+
+    /** @var string|null */
+    private $apcuPrefix;
+
+    /**
+     * @var array<string, self>
+     */
+    private static $registeredLoaders = array();
+
+    /**
+     * @param string|null $vendorDir
+     */
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
+    }
+
+    /**
+     * @return array<string, list<string>>
+     */
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+        }
+
+        return array();
+    }
+
+    /**
+     * @return array<string, list<string>>
+     */
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    /**
+     * @return list<string>
+     */
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    /**
+     * @return list<string>
+     */
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    /**
+     * @return array<string, string> Array of classname => path
+     */
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array<string, string> $classMap Class to filename map
+     *
+     * @return void
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string              $prefix  The prefix
+     * @param list<string>|string $paths   The PSR-0 root directories
+     * @param bool                $prepend Whether to prepend the directories
+     *
+     * @return void
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        $paths = (array) $paths;
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string              $prefix  The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths   The PSR-4 base directories
+     * @param bool                $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return void
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        $paths = (array) $paths;
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
+     *
+     * @return void
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return void
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     *
+     * @return void
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     *
+     * @return void
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     *
+     * @return void
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     *
+     * @return void
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return true|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            $includeFile = self::$includeFile;
+            $includeFile($file);
+
+            return true;
+        }
+
+        return null;
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+            return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if (false === $file && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
+            // Remember that this class does not exist.
+            $this->missingClasses[$class] = true;
+        }
+
+        return $file;
+    }
+
+    /**
+     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     *
+     * @return array<string, self>
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath . '\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
+}
diff --git a/core/components/faqman/vendor/composer/InstalledVersions.php b/core/components/faqman/vendor/composer/InstalledVersions.php
new file mode 100644
index 0000000..51e734a
--- /dev/null
+++ b/core/components/faqman/vendor/composer/InstalledVersions.php
@@ -0,0 +1,359 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer;
+
+use Composer\Autoload\ClassLoader;
+use Composer\Semver\VersionParser;
+
+/**
+ * This class is copied in every Composer installed project and available to all
+ *
+ * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
+ *
+ * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
+ */
+class InstalledVersions
+{
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+     */
+    private static $installed;
+
+    /**
+     * @var bool|null
+     */
+    private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    private static $installedByVendor = array();
+
+    /**
+     * Returns a list of all package names which are present, either by being installed, replaced or provided
+     *
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackages()
+    {
+        $packages = array();
+        foreach (self::getInstalled() as $installed) {
+            $packages[] = array_keys($installed['versions']);
+        }
+
+        if (1 === \count($packages)) {
+            return $packages[0];
+        }
+
+        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+    }
+
+    /**
+     * Returns a list of all package names with a specific type e.g. 'library'
+     *
+     * @param  string   $type
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackagesByType($type)
+    {
+        $packagesByType = array();
+
+        foreach (self::getInstalled() as $installed) {
+            foreach ($installed['versions'] as $name => $package) {
+                if (isset($package['type']) && $package['type'] === $type) {
+                    $packagesByType[] = $name;
+                }
+            }
+        }
+
+        return $packagesByType;
+    }
+
+    /**
+     * Checks whether the given package is installed
+     *
+     * This also returns true if the package name is provided or replaced by another package
+     *
+     * @param  string $packageName
+     * @param  bool   $includeDevRequirements
+     * @return bool
+     */
+    public static function isInstalled($packageName, $includeDevRequirements = true)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (isset($installed['versions'][$packageName])) {
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether the given package satisfies a version constraint
+     *
+     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
+     *
+     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
+     *
+     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
+     * @param  string        $packageName
+     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
+     * @return bool
+     */
+    public static function satisfies(VersionParser $parser, $packageName, $constraint)
+    {
+        $constraint = $parser->parseConstraints((string) $constraint);
+        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+        return $provided->matches($constraint);
+    }
+
+    /**
+     * Returns a version constraint representing all the range(s) which are installed for a given package
+     *
+     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
+     * whether a given version of a package is installed, and not just whether it exists
+     *
+     * @param  string $packageName
+     * @return string Version constraint usable with composer/semver
+     */
+    public static function getVersionRanges($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            $ranges = array();
+            if (isset($installed['versions'][$packageName]['pretty_version'])) {
+                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
+            }
+            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
+            }
+            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
+            }
+            if (array_key_exists('provided', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
+            }
+
+            return implode(' || ', $ranges);
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getPrettyVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['pretty_version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
+     */
+    public static function getReference($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['reference'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['reference'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+     */
+    public static function getInstallPath($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @return array
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+     */
+    public static function getRootPackage()
+    {
+        $installed = self::getInstalled();
+
+        return $installed[0]['root'];
+    }
+
+    /**
+     * Returns the raw installed.php data for custom implementations
+     *
+     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
+     * @return array[]
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+     */
+    public static function getRawData()
+    {
+        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = include __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        return self::$installed;
+    }
+
+    /**
+     * Returns the raw data of all installed.php which are currently loaded for custom implementations
+     *
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    public static function getAllRawData()
+    {
+        return self::getInstalled();
+    }
+
+    /**
+     * Lets you reload the static array from another file
+     *
+     * This is only useful for complex integrations in which a project needs to use
+     * this class but then also needs to execute another project's autoloader in process,
+     * and wants to ensure both projects have access to their version of installed.php.
+     *
+     * A typical case would be PHPUnit, where it would need to make sure it reads all
+     * the data it needs from this class, then call reload() with
+     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
+     * the project in which it runs can then also use this class safely, without
+     * interference between PHPUnit's dependencies and the project's dependencies.
+     *
+     * @param  array[] $data A vendor/composer/installed.php data set
+     * @return void
+     *
+     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+     */
+    public static function reload($data)
+    {
+        self::$installed = $data;
+        self::$installedByVendor = array();
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    private static function getInstalled()
+    {
+        if (null === self::$canGetVendors) {
+            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+        }
+
+        $installed = array();
+
+        if (self::$canGetVendors) {
+            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                if (isset(self::$installedByVendor[$vendorDir])) {
+                    $installed[] = self::$installedByVendor[$vendorDir];
+                } elseif (is_file($vendorDir.'/composer/installed.php')) {
+                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
+                    }
+                }
+            }
+        }
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
+
+        return $installed;
+    }
+}
diff --git a/core/components/faqman/vendor/composer/LICENSE b/core/components/faqman/vendor/composer/LICENSE
new file mode 100644
index 0000000..f27399a
--- /dev/null
+++ b/core/components/faqman/vendor/composer/LICENSE
@@ -0,0 +1,21 @@
+
+Copyright (c) Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/core/components/faqman/vendor/composer/autoload_classmap.php b/core/components/faqman/vendor/composer/autoload_classmap.php
new file mode 100644
index 0000000..0fb0a2c
--- /dev/null
+++ b/core/components/faqman/vendor/composer/autoload_classmap.php
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
+);
diff --git a/core/components/faqman/vendor/composer/autoload_namespaces.php b/core/components/faqman/vendor/composer/autoload_namespaces.php
new file mode 100644
index 0000000..15a2ff3
--- /dev/null
+++ b/core/components/faqman/vendor/composer/autoload_namespaces.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/core/components/faqman/vendor/composer/autoload_psr4.php b/core/components/faqman/vendor/composer/autoload_psr4.php
new file mode 100644
index 0000000..7f54699
--- /dev/null
+++ b/core/components/faqman/vendor/composer/autoload_psr4.php
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'faqMan\\' => array($baseDir . '/src'),
+);
diff --git a/core/components/faqman/vendor/composer/autoload_real.php b/core/components/faqman/vendor/composer/autoload_real.php
new file mode 100644
index 0000000..4f0c8d5
--- /dev/null
+++ b/core/components/faqman/vendor/composer/autoload_real.php
@@ -0,0 +1,36 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInitd751713988987e9331980363e24189ce
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInitd751713988987e9331980363e24189ce', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        spl_autoload_unregister(array('ComposerAutoloaderInitd751713988987e9331980363e24189ce', 'loadClassLoader'));
+
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInitd751713988987e9331980363e24189ce::getInitializer($loader));
+
+        $loader->register(true);
+
+        return $loader;
+    }
+}
diff --git a/core/components/faqman/vendor/composer/autoload_static.php b/core/components/faqman/vendor/composer/autoload_static.php
new file mode 100644
index 0000000..bb7a379
--- /dev/null
+++ b/core/components/faqman/vendor/composer/autoload_static.php
@@ -0,0 +1,36 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInitd751713988987e9331980363e24189ce
+{
+    public static $prefixLengthsPsr4 = array (
+        'f' => 
+        array (
+            'faqMan\\' => 7,
+        ),
+    );
+
+    public static $prefixDirsPsr4 = array (
+        'faqMan\\' => 
+        array (
+            0 => __DIR__ . '/../..' . '/src',
+        ),
+    );
+
+    public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->prefixLengthsPsr4 = ComposerStaticInitd751713988987e9331980363e24189ce::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitd751713988987e9331980363e24189ce::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitd751713988987e9331980363e24189ce::$classMap;
+
+        }, null, ClassLoader::class);
+    }
+}
diff --git a/core/components/faqman/vendor/composer/installed.json b/core/components/faqman/vendor/composer/installed.json
new file mode 100644
index 0000000..87fda74
--- /dev/null
+++ b/core/components/faqman/vendor/composer/installed.json
@@ -0,0 +1,5 @@
+{
+    "packages": [],
+    "dev": true,
+    "dev-package-names": []
+}
diff --git a/core/components/faqman/vendor/composer/installed.php b/core/components/faqman/vendor/composer/installed.php
new file mode 100644
index 0000000..87d0968
--- /dev/null
+++ b/core/components/faqman/vendor/composer/installed.php
@@ -0,0 +1,23 @@
+<?php return array(
+    'root' => array(
+        'name' => '__root__',
+        'pretty_version' => 'dev-develop',
+        'version' => 'dev-develop',
+        'reference' => '7b8f0257e127248e359194071ffbe73b0b490893',
+        'type' => 'library',
+        'install_path' => __DIR__ . '/../../',
+        'aliases' => array(),
+        'dev' => true,
+    ),
+    'versions' => array(
+        '__root__' => array(
+            'pretty_version' => 'dev-develop',
+            'version' => 'dev-develop',
+            'reference' => '7b8f0257e127248e359194071ffbe73b0b490893',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+    ),
+);