diff --git a/root/.gitignore b/root/.gitignore
index d3e4283..a5338ab 100644
--- a/root/.gitignore
+++ b/root/.gitignore
@@ -5,3 +5,4 @@ src/media/
 src/fontello/scss
 docs/_book
 /vendor/
+/craft/
diff --git a/root/Gruntfile.coffee b/root/Gruntfile.coffee
index 4a9a0eb..30ad5a2 100644
--- a/root/Gruntfile.coffee
+++ b/root/Gruntfile.coffee
@@ -2,7 +2,7 @@ module.exports = (grunt) ->
 
   global['craftMajor'] = 2
   global['craftMinor'] = 6
-  global['craftBuild'] = 2986
+  global['craftBuild'] = 2987
 
   # Automatically loads all Grunt tasks
   require('load-grunt-tasks')(grunt)
diff --git a/root/README.md b/root/README.md
index cf63e4d..72d6171 100644
--- a/root/README.md
+++ b/root/README.md
@@ -1,6 +1,6 @@
 # {%= name %}
 ---
-### Currently running craft version 2.6 (2986)
+### Currently running craft version 2.6 (2987)
 
 ### Prerequisites:
 
@@ -13,7 +13,7 @@
 1. `npm install`  
 1. `cd dist && valet link {%= domain_name %} && cd ..`  
 1. `brew update && brew install bash` for OSX to upgrade to Bash 4.x  
-1. `addSubmodules.sh --force` to install submodules. If you want to cherry pick specific submodules, run the command without `--force`  
+1. `composer update`  
 1. `grunt`  
 1. Import DB via [Dev DB Restore](#dev-db-restore)  
 
diff --git a/root/addSubmodules.sh b/root/addSubmodules.sh
deleted file mode 100644
index e9be6ad..0000000
--- a/root/addSubmodules.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/local/bin/bash
-
-if ((BASH_VERSINFO[0] < 4))
-then
-  echo "Sorry, you need at least bash-4.x to run this script."
-  exit 1
-fi
-
-declare -A plugins
-plugins=(
-    ["craft_plugins/ContactForm"]=https://github.com/pixelandtonic/ContactForm.git
-    ["craft_plugins/cookies"]=https://github.com/nystudio107/cookies.git
-    ["craft_plugins/CpFieldLinks-Craft"]=https://github.com/mmikkel/CpFieldLinks-Craft.git
-    ["craft_plugins/Craft-FocusPoint"]=https://github.com/smcyr/Craft-FocusPoint.git
-    ["craft_plugins/craft-neo"]=https://github.com/benjamminf/craft-neo.git
-    ["craft_plugins/craft-quick-field"]=https://github.com/benjamminf/craft-quick-field.git
-    ["craft_plugins/craft-relabel"]=https://github.com/benjamminf/craft-relabel.git
-    ["craft_plugins/craftcms-blueprint"]=https://github.com/bjerenec/craftcms-blueprint.git
-    ["craft_plugins/craftcms-thearchitect"]=https://github.com/Pennebaker/craftcms-thearchitect.git
-    ["craft_plugins/CraftFieldNotes"]=https://github.com/Pennebaker/craftfieldnotes.git
-    ["craft_plugins/ExpandedSingles"]=https://github.com/engram-design/ExpandedSingles.git
-    ["craft_plugins/Imager-Craft"]=https://github.com/aelvan/Imager-Craft.git
-    ["craft_plugins/instantanalytics"]=https://github.com/nystudio107/instantanalytics
-    ["craft_plugins/LinkIt"]=https://github.com/fruitstudios/LinkIt.git
-    ["craft_plugins/minify"]=https://github.com/nystudio107/minify.git
-    ["craft_plugins/navee"]=https://github.com/fromtheoutfit/navee.git
-    ["craft_plugins/Reasons-Craft"]=https://github.com/mmikkel/Reasons-Craft.git
-    ["craft_plugins/Redactor-Extras"]=https://github.com/elliotlewis/Redactor-Extras.git
-    ["craft_plugins/seomatic"]=https://github.com/nystudio107/seomatic.git
-    ["craft_plugins/SimpleMap"]=https://github.com/ethercreative/simplemap.git
-    ["craft_plugins/SuperTable"]=https://github.com/engram-design/SuperTable.git
-    ["craft_plugins/craft-typogrify"]=https://github.com/jamiepittock/craft-typogrify
-    ["craft_plugins/craft-safedelete"]=https://github.com/christianruhstaller/craft-safedelete.git
-    ["craft_plugins/craft-nocache"]=https://github.com/benjamminf/craft-nocache.git
-)
-
-for i in "${!plugins[@]}"
-do
-    if [[ $1 != "--force" ]]; then
-        read -p " Add $i? Y/n " r
-    fi
-    if [[ ! $r =~ ^(n|no|N|No|NO)$ ]]; then
-        git submodule add ${plugins[$i]} ${i}
-        echo ""
-    fi
-done
diff --git a/root/composer.json b/root/composer.json
index 28c06dc..41064e9 100644
--- a/root/composer.json
+++ b/root/composer.json
@@ -1,27 +1,255 @@
 {
-    "name": "pennebaker/strathmoreproducts.com",
-    "type": "project",
-    "authors": [
-        {
-            "name": "Pennebaker",
-            "email": "design@pennebaker.com"
-        }
-    ],
-    "repositories": [
-        {
-            "type":"package",
-            "package": {
-              "name": "nystudio107/cookies",
-              "version":"1.0.4",
-              "source": {
-                  "url": "https://github.com/nystudio107/cookies.git",
-                  "type": "git",
-                  "reference":"1.0.4"
-                }
-            }
-        }
-    ],
-    "require": {
-        "nystudio107/cookies": "1.0.4"
+  "name": "pennebaker/thepreservehouston.com",
+  "minimum-stability": "dev",
+  "type": "project",
+  "authors": [
+    {
+      "name": "Pennebaker",
+      "email": "design@pennebaker.com"
     }
+  ],
+  "repositories": [
+    {
+      "type":"package",
+      "package": {
+      "name": "nystudio107/cookies",
+      "version":"1.0.4",
+      "source": {
+        "url": "https://github.com/nystudio107/cookies.git",
+        "type": "git",
+        "reference":"1.0.4"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "craftcms/contact-form",
+        "version":"1.9.0",
+        "source": {
+          "url": "https://github.com/craftcms/contact-form.git",
+          "type": "git",
+          "reference":"1.9.0"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "mmikkel/CpFieldLinks-Craft",
+        "version":"1.2.2",
+        "source": {
+          "url": "https://github.com/mmikkel/CpFieldLinks-Craft.git",
+          "type": "git",
+          "reference":"v.1.2.2"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "mmikkel/Reasons-Craft",
+        "version":"1.0.10",
+        "source": {
+          "url": "https://github.com/mmikkel/Reasons-Craft.git",
+          "type": "git",
+          "reference":"v.1.0.10"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "smcyr/Craft-FocusPoint",
+        "version":"1.1.3",
+        "source": {
+          "url": "https://github.com/smcyr/Craft-FocusPoint.git",
+          "type": "git",
+          "reference":"1.1.3"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "benjamminf/craft-neo",
+        "version":"1.4.1",
+        "source": {
+          "url": "https://github.com/benjamminf/craft-neo.git",
+          "type": "git",
+          "reference":"1.4.1"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "benjamminf/craft-quick-field",
+        "version":"0.3.4",
+        "source": {
+          "url": "https://github.com/benjamminf/craft-quick-field.git",
+          "type": "git",
+          "reference":"0.3.4"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "benjamminf/craft-nocache",
+        "version":"1.0.1",
+        "source": {
+          "url": "https://github.com/benjamminf/craft-nocache.git",
+          "type": "git",
+          "reference":"1.0.1"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "benjamminf/craft-relabel",
+        "version":"0.1.3",
+        "source": {
+          "url": "https://github.com/benjamminf/craft-relabel.git",
+          "type": "git",
+          "reference":"0.1.3"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "christianruhstaller/craft-safedelete",
+        "version":"0.3.0",
+        "source": {
+          "url": "https://github.com/christianruhstaller/craft-safedelete.git",
+          "type": "git",
+          "reference":"0.3.0"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "jamiepittock/craft-typogrify",
+        "version":"1.0.1",
+        "source": {
+          "url": "https://github.com/jamiepittock/craft-typogrify.git",
+          "type": "git",
+          "reference":"master"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "michaelrog/craftfieldnotes",
+        "version":"0.1",
+        "source": {
+          "url": "https://bitbucket.org/michaelrog/craftfieldnotes.git",
+          "type": "git",
+          "reference":"0.1"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "engram-design/ExpandedSingles",
+        "version":"0.2.4",
+        "source": {
+          "url": "https://github.com/engram-design/ExpandedSingles.git",
+          "type": "git",
+          "reference":"0.2.4"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "aelvan/Imager-Craft",
+        "version":"1.6.1",
+        "source": {
+          "url": "https://github.com/aelvan/Imager-Craft.git",
+          "type": "git",
+          "reference":"v1.6.1"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "fruitstudios/LinkIt",
+        "version":"2.3.4",
+        "source": {
+          "url": "https://github.com/fruitstudios/LinkIt.git",
+          "type": "git",
+          "reference":"2.3.4"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "fromtheoutfit/navee",
+        "version":"1.3.0",
+        "source": {
+          "url": "https://github.com/fromtheoutfit/navee.git",
+          "type": "git",
+          "reference":"v1.3.0"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "elliotlewis/Redactor-Extras",
+        "version":"1.3.2",
+        "source": {
+          "url": "https://github.com/elliotlewis/Redactor-Extras.git",
+          "type": "git",
+          "reference":"v1.3.2"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "engram-design/SuperTable",
+        "version":"1.0.5",
+        "source": {
+          "url": "https://github.com/engram-design/SuperTable.git",
+          "type": "git",
+          "reference":"1.0.5"
+        }
+      }
+    }
+  ],
+  "require": {
+    "pennebaker/craftcms-thearchitect": "1.6.0-beta.5",
+    "nystudio107/cookies": "1.0.4",
+    "nystudio107/instantanalytics": "1.1.8",
+    "nystudio107/minify": "1.1.2",
+    "nystudio107/richvariables": "1.0.5",
+    "nystudio107/seomatic": "1.1.47",
+    "nystudio107/transcoder": "1.1.1",
+    "craftcms/contact-form": "1.9.0",
+    "mmikkel/CpFieldLinks-Craft": "1.2.2",
+    "mmikkel/Reasons-Craft": "1.0.10",
+    "smcyr/Craft-FocusPoint": "1.1.3",
+    "benjamminf/craft-neo": "1.4.1",
+    "benjamminf/craft-quick-field": "0.3.4",
+    "benjamminf/craft-nocache": "1.0.1",
+    "benjamminf/craft-relabel": "0.1.3",
+    "christianruhstaller/craft-safedelete": "0.3.0",
+    "jamiepittock/craft-typogrify": "1.0.1",
+    "michaelrog/craftfieldnotes": "0.1",
+    "engram-design/ExpandedSingles": "0.2.4",
+    "aelvan/Imager-Craft": "1.6.1",
+    "fruitstudios/LinkIt": "2.3.4",
+    "fromtheoutfit/navee": "v1.3.0",
+    "elliotlewis/Redactor-Extras": "1.3.2",
+    "engram-design/SuperTable": "1.0.5"
+  }
 }
diff --git a/root/composer.lock b/root/composer.lock
new file mode 100644
index 0000000..36fb080
--- /dev/null
+++ b/root/composer.lock
@@ -0,0 +1,995 @@
+{
+    "_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#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "e6150c0b7a2fa8acfbd6e3a7bb319a8b",
+    "packages": [
+        {
+            "name": "aelvan/Imager-Craft",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/aelvan/Imager-Craft.git",
+                "reference": "v1.6.1"
+            },
+            "type": "library"
+        },
+        {
+            "name": "benjamminf/craft-neo",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/benjamminf/craft-neo.git",
+                "reference": "1.4.1"
+            },
+            "type": "library"
+        },
+        {
+            "name": "benjamminf/craft-nocache",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/benjamminf/craft-nocache.git",
+                "reference": "1.0.1"
+            },
+            "type": "library"
+        },
+        {
+            "name": "benjamminf/craft-quick-field",
+            "version": "0.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/benjamminf/craft-quick-field.git",
+                "reference": "0.3.4"
+            },
+            "type": "library"
+        },
+        {
+            "name": "benjamminf/craft-relabel",
+            "version": "0.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/benjamminf/craft-relabel.git",
+                "reference": "0.1.3"
+            },
+            "type": "library"
+        },
+        {
+            "name": "christianruhstaller/craft-safedelete",
+            "version": "0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/christianruhstaller/craft-safedelete.git",
+                "reference": "0.3.0"
+            },
+            "type": "library"
+        },
+        {
+            "name": "composer/installers",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/installers.git",
+                "reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/installers/zipball/79ad876c7498c0bbfe7eed065b8651c93bfd6045",
+                "reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0"
+            },
+            "replace": {
+                "roundcube/plugin-installer": "*",
+                "shama/baton": "*"
+            },
+            "require-dev": {
+                "composer/composer": "1.0.*@dev",
+                "phpunit/phpunit": "4.1.*"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Composer\\Installers\\Plugin",
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Installers\\": "src/Composer/Installers"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kyle Robinson Young",
+                    "email": "kyle@dontkry.com",
+                    "homepage": "https://github.com/shama"
+                }
+            ],
+            "description": "A multi-framework Composer library installer",
+            "homepage": "https://composer.github.io/installers/",
+            "keywords": [
+                "Craft",
+                "Dolibarr",
+                "Eliasis",
+                "Hurad",
+                "ImageCMS",
+                "Kanboard",
+                "MODX Evo",
+                "Mautic",
+                "Maya",
+                "OXID",
+                "Plentymarkets",
+                "Porto",
+                "RadPHP",
+                "SMF",
+                "Thelia",
+                "WolfCMS",
+                "agl",
+                "aimeos",
+                "annotatecms",
+                "attogram",
+                "bitrix",
+                "cakephp",
+                "chef",
+                "cockpit",
+                "codeigniter",
+                "concrete5",
+                "croogo",
+                "dokuwiki",
+                "drupal",
+                "elgg",
+                "expressionengine",
+                "fuelphp",
+                "grav",
+                "installer",
+                "itop",
+                "joomla",
+                "kohana",
+                "laravel",
+                "lavalite",
+                "lithium",
+                "magento",
+                "mako",
+                "mediawiki",
+                "modulework",
+                "moodle",
+                "phpbb",
+                "piwik",
+                "ppi",
+                "puppet",
+                "reindex",
+                "roundcube",
+                "shopware",
+                "silverstripe",
+                "sydes",
+                "symfony",
+                "typo3",
+                "wordpress",
+                "yawik",
+                "zend",
+                "zikula"
+            ],
+            "time": "2017-04-24T06:37:16+00:00"
+        },
+        {
+            "name": "craftcms/contact-form",
+            "version": "1.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/craftcms/contact-form.git",
+                "reference": "1.9.0"
+            },
+            "type": "library"
+        },
+        {
+            "name": "crodas/languagedetector",
+            "version": "v0.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/crodas/LanguageDetector.git",
+                "reference": "07aa8bb806cb71fe4e4352c12232a5c74bf416ed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/crodas/LanguageDetector/zipball/07aa8bb806cb71fe4e4352c12232a5c74bf416ed",
+                "reference": "07aa8bb806cb71fe4e4352c12232a5c74bf416ed",
+                "shasum": ""
+            },
+            "require-dev": {
+                "crodas/autoloader": "~0.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "LanguageDetector": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-4-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "César D. Rodas",
+                    "email": "crodas@php.net"
+                }
+            ],
+            "description": "simple library to classify texts",
+            "time": "2013-11-06T01:26:03+00:00"
+        },
+        {
+            "name": "crodas/text-rank",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/crodas/TextRank.git",
+                "reference": "8c113c5b0cae3eeb853891ef5afdf27d678a5940"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/crodas/TextRank/zipball/8c113c5b0cae3eeb853891ef5afdf27d678a5940",
+                "reference": "8c113c5b0cae3eeb853891ef5afdf27d678a5940",
+                "shasum": ""
+            },
+            "require": {
+                "crodas/languagedetector": "~0.1",
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-stem": "Improves keywords selection"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "lib/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "authors": [
+                {
+                    "name": "César D. Rodas",
+                    "email": "crodas@php.net"
+                }
+            ],
+            "description": "Extract relevant keywords from a given text",
+            "time": "2013-12-08 07:56:52"
+        },
+        {
+            "name": "davechild/textstatistics",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/DaveChild/Text-Statistics.git",
+                "reference": "6196462b4fe730a8ff0019036baf362295c161b3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/DaveChild/Text-Statistics/zipball/6196462b4fe730a8ff0019036baf362295c161b3",
+                "reference": "6196462b4fe730a8ff0019036baf362295c161b3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.2.*"
+            },
+            "suggest": {
+                "ext-bcmath": "More accurate floating point calculations.",
+                "ext-mbstring": "Handle multi-byte text properly."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "DaveChild\\TextStatistics": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Dave Child",
+                    "email": "dave@addedbytes.com",
+                    "homepage": "https://www.addedbytes.com/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP package to measure the readability of text according to various algorithms.",
+            "homepage": "https://github.com/DaveChild/Text-Statistics",
+            "time": "2015-04-22T14:55:55+00:00"
+        },
+        {
+            "name": "elliotlewis/Redactor-Extras",
+            "version": "1.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/elliotlewis/Redactor-Extras.git",
+                "reference": "v1.3.2"
+            },
+            "type": "library"
+        },
+        {
+            "name": "engram-design/ExpandedSingles",
+            "version": "0.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/engram-design/ExpandedSingles.git",
+                "reference": "0.2.4"
+            },
+            "type": "library"
+        },
+        {
+            "name": "engram-design/SuperTable",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/engram-design/SuperTable.git",
+                "reference": "1.0.5"
+            },
+            "type": "library"
+        },
+        {
+            "name": "fromtheoutfit/navee",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fromtheoutfit/navee.git",
+                "reference": "v1.3.0"
+            },
+            "type": "library"
+        },
+        {
+            "name": "fruitstudios/LinkIt",
+            "version": "2.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruitstudios/LinkIt.git",
+                "reference": "2.3.4"
+            },
+            "type": "library"
+        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "6.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699",
+                "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.4",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.0 || ^5.0",
+                "psr/log": "^1.0"
+            },
+            "suggest": {
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.2-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2017-06-22T18:50:49+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "09e549f5534380c68761260a71f847644d8f65aa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/09e549f5534380c68761260a71f847644d8f65aa",
+                "reference": "09e549f5534380c68761260a71f847644d8f65aa",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2017-05-20 23:14:18"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "811b676fbab9c99e359885032e5ebc70e442f5b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/811b676fbab9c99e359885032e5ebc70e442f5b8",
+                "reference": "811b676fbab9c99e359885032e5ebc70e442f5b8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "time": "2017-07-17 09:11:21"
+        },
+        {
+            "name": "jamiepittock/craft-typogrify",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jamiepittock/craft-typogrify.git",
+                "reference": "master"
+            },
+            "type": "library"
+        },
+        {
+            "name": "jaybizzle/crawler-detect",
+            "version": "v1.2.50",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/JayBizzle/Crawler-Detect.git",
+                "reference": "c9638a5d7d6fc4ecfb35f32a9cc6d05bc4f5a914"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/c9638a5d7d6fc4ecfb35f32a9cc6d05bc4f5a914",
+                "reference": "c9638a5d7d6fc4ecfb35f32a9cc6d05bc4f5a914",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.8.*",
+                "satooshi/php-coveralls": "1.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Jaybizzle\\CrawlerDetect\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Beech",
+                    "email": "m@rkbee.ch",
+                    "role": "Developer"
+                }
+            ],
+            "description": "CrawlerDetect is a PHP class for detecting bots/crawlers/spiders via the user agent",
+            "homepage": "https://github.com/JayBizzle/Crawler-Detect/",
+            "keywords": [
+                "crawler",
+                "crawler detect",
+                "crawler detector",
+                "crawlerdetect",
+                "php crawler detect"
+            ],
+            "time": "2017-07-03T20:56:40+00:00"
+        },
+        {
+            "name": "michaelrog/craftfieldnotes",
+            "version": "0.1",
+            "source": {
+                "type": "git",
+                "url": "https://bitbucket.org/michaelrog/craftfieldnotes.git",
+                "reference": "0.1"
+            },
+            "type": "library"
+        },
+        {
+            "name": "mmikkel/CpFieldLinks-Craft",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mmikkel/CpFieldLinks-Craft.git",
+                "reference": "v.1.2.2"
+            },
+            "type": "library"
+        },
+        {
+            "name": "mmikkel/Reasons-Craft",
+            "version": "1.0.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mmikkel/Reasons-Craft.git",
+                "reference": "v.1.0.10"
+            },
+            "type": "library"
+        },
+        {
+            "name": "mrclay/minify",
+            "version": "2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mrclay/minify.git",
+                "reference": "2c83b82bfa894180335f19141794a4de1ccd06e6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mrclay/minify/zipball/2c83b82bfa894180335f19141794a4de1ccd06e6",
+                "reference": "2c83b82bfa894180335f19141794a4de1ccd06e6",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcre": "*",
+                "php": ">=5.2.1"
+            },
+            "require-dev": {
+                "tubalmartin/cssmin": "~2.4.8"
+            },
+            "suggest": {
+                "tubalmartin/cssmin": "Support minify with CSSMin (YUI PHP port)"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "min/lib/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Stephen Clay",
+                    "email": "steve@mrclay.org",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Minify is a PHP5 app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers",
+            "homepage": "http://code.google.com/p/minify/",
+            "time": "2017-06-08 17:49:34"
+        },
+        {
+            "name": "nystudio107/cookies",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nystudio107/cookies.git",
+                "reference": "1.0.4"
+            },
+            "type": "library"
+        },
+        {
+            "name": "nystudio107/instantanalytics",
+            "version": "1.1.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nystudio107/instantanalytics.git",
+                "reference": "0dc969c8e19421aa0cf8c776f378d678d35c77f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nystudio107/instantanalytics/zipball/0dc969c8e19421aa0cf8c776f378d678d35c77f5",
+                "reference": "0dc969c8e19421aa0cf8c776f378d678d35c77f5",
+                "shasum": ""
+            },
+            "require": {
+                "composer/installers": "~1.0",
+                "jaybizzle/crawler-detect": "^1.2.26",
+                "theiconic/php-ga-measurement-protocol": "^2.4.0"
+            },
+            "type": "craft-plugin",
+            "notification-url": "https://packagist.org/downloads/",
+            "description": "Instant Analytics lets you track otherwise untrackable assets & events with Google Analytics, and eliminates the need for Javascript tracking",
+            "time": "2017-06-24T12:18:18+00:00"
+        },
+        {
+            "name": "nystudio107/minify",
+            "version": "1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nystudio107/minify.git",
+                "reference": "585c41e7415f5ae11d0cb3a7798bd16478553c37"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nystudio107/minify/zipball/585c41e7415f5ae11d0cb3a7798bd16478553c37",
+                "reference": "585c41e7415f5ae11d0cb3a7798bd16478553c37",
+                "shasum": ""
+            },
+            "require": {
+                "composer/installers": "~1.0",
+                "mrclay/minify": "^2.3.0"
+            },
+            "type": "craft-plugin",
+            "notification-url": "https://packagist.org/downloads/",
+            "description": "A simple plugin that allows you to minify blocks of HTML, CSS, and JS inline in Craft CMS templates.",
+            "time": "2017-03-22T20:18:10+00:00"
+        },
+        {
+            "name": "nystudio107/richvariables",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nystudio107/richvariables.git",
+                "reference": "c44c0267c7e7d14cec54dd2d9b9212d515d63965"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nystudio107/richvariables/zipball/c44c0267c7e7d14cec54dd2d9b9212d515d63965",
+                "reference": "c44c0267c7e7d14cec54dd2d9b9212d515d63965",
+                "shasum": ""
+            },
+            "require": {
+                "composer/installers": "~1.0"
+            },
+            "type": "craft-plugin",
+            "notification-url": "https://packagist.org/downloads/",
+            "authors": [
+                {
+                    "name": "nystudio107",
+                    "homepage": "https://nystudio107.com"
+                }
+            ],
+            "description": "Allows you to easily use Craft Globals as variables in Rich Text fields",
+            "time": "2017-02-24T21:21:32+00:00"
+        },
+        {
+            "name": "nystudio107/seomatic",
+            "version": "1.1.47",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nystudio107/seomatic.git",
+                "reference": "84ca4e1c01c108533c1060e73f5d3a9b9bebc78e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nystudio107/seomatic/zipball/84ca4e1c01c108533c1060e73f5d3a9b9bebc78e",
+                "reference": "84ca4e1c01c108533c1060e73f5d3a9b9bebc78e",
+                "shasum": ""
+            },
+            "require": {
+                "composer/installers": "~1.0",
+                "crodas/text-rank": "dev-master",
+                "davechild/textstatistics": "1.0.1",
+                "sunra/php-simple-html-dom-parser": "1.5.1"
+            },
+            "type": "craft-plugin",
+            "notification-url": "https://packagist.org/downloads/",
+            "description": "A turnkey SEO implementation for Craft CMS that is comprehensive, powerful, and flexible",
+            "time": "2017-06-09T04:38:14+00:00"
+        },
+        {
+            "name": "nystudio107/transcoder",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nystudio107/transcoder.git",
+                "reference": "7545301144cc1b6ba0cb78cbec769c1d680b17dc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nystudio107/transcoder/zipball/7545301144cc1b6ba0cb78cbec769c1d680b17dc",
+                "reference": "7545301144cc1b6ba0cb78cbec769c1d680b17dc",
+                "shasum": ""
+            },
+            "require": {
+                "composer/installers": "~1.0"
+            },
+            "type": "craft-plugin",
+            "notification-url": "https://packagist.org/downloads/",
+            "description": "Transcode videos to various formats, and provide thumbnails of the video",
+            "time": "2017-03-05T06:21:41+00:00"
+        },
+        {
+            "name": "pennebaker/craftcms-thearchitect",
+            "version": "v1.6.0-beta.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Pennebaker/craftcms-thearchitect.git",
+                "reference": "8fbe180d911829171c642965c9b95d9cb9bcccaf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Pennebaker/craftcms-thearchitect/zipball/8fbe180d911829171c642965c9b95d9cb9bcccaf",
+                "reference": "8fbe180d911829171c642965c9b95d9cb9bcccaf",
+                "shasum": ""
+            },
+            "type": "craft-plugin",
+            "autoload": {
+                "psr-4": {
+                    "": "thearchitect/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "CraftCMS plugin to generate content models from JSON data.",
+            "homepage": "https://github.com/pennebaker/craftcms-thearchitect",
+            "time": "2017-05-05T15:34:01+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06 14:39:51"
+        },
+        {
+            "name": "smcyr/Craft-FocusPoint",
+            "version": "1.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smcyr/Craft-FocusPoint.git",
+                "reference": "1.1.3"
+            },
+            "type": "library"
+        },
+        {
+            "name": "sunra/php-simple-html-dom-parser",
+            "version": "v1.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sunra/php-simple-html-dom-parser.git",
+                "reference": "f910346ce47513a49ed5b8de197cde26c3f0b193"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sunra/php-simple-html-dom-parser/zipball/f910346ce47513a49ed5b8de197cde26c3f0b193",
+                "reference": "f910346ce47513a49ed5b8de197cde26c3f0b193",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Sunra\\PhpSimple\\HtmlDomParser": "Src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sunra",
+                    "email": "sunra@yandex.ru",
+                    "homepage": "https://github.com/sunra"
+                }
+            ],
+            "description": "Composer adaptation of: A HTML DOM parser written in PHP5+ let you manipulate HTML in a very easy way! Require PHP 5+. Supports invalid HTML. Find tags on an HTML page with selectors just like jQuery. Extract contents from HTML in a single line.",
+            "homepage": "https://github.com/sunra/php-simple-html-dom-parser",
+            "keywords": [
+                "dom",
+                "html",
+                "parser"
+            ],
+            "time": "2016-05-20T11:21:15+00:00"
+        },
+        {
+            "name": "theiconic/php-ga-measurement-protocol",
+            "version": "v2.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theiconic/php-ga-measurement-protocol.git",
+                "reference": "26c09a43a25235da85131c0fa060ec1fe2b2f16f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theiconic/php-ga-measurement-protocol/zipball/26c09a43a25235da85131c0fa060ec1fe2b2f16f",
+                "reference": "26c09a43a25235da85131c0fa060ec1fe2b2f16f",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.0",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.7.*",
+                "satooshi/php-coveralls": "1.0.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "TheIconic\\Tracking\\GoogleAnalytics\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "THE ICONIC ENGINEERING TEAM",
+                    "email": "engineering@theiconic.com.au"
+                }
+            ],
+            "description": "Send data to Google Analytics from the server using PHP. This library fully implements GA measurement protocol.",
+            "time": "2017-06-30T02:41:52+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "dev",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}
diff --git a/root/grunt/copy.coffee b/root/grunt/copy.coffee
index 2b195ad..1df3fc0 100644
--- a/root/grunt/copy.coffee
+++ b/root/grunt/copy.coffee
@@ -322,51 +322,43 @@ module.exports = (grunt) ->
       ]
     craft_plugins:
       files: [
-        {
-          # Blueprint Plugin
-          expand: true
-          cwd: 'craft_plugins/craftcms-blueprint'
-          src: '**'
-          dest: 'dist/craft/plugins/blueprint'
-          filter: 'isFile'
-        }
         {
           # The Architect Plugin
           expand: true
-          cwd: 'craft_plugins/craftcms-thearchitect'
+          cwd: 'craft/plugins/craftcms-thearchitect'
           src: 'thearchitect/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # CPFieldLinks Plugin
+          # Cookies Plugin
           expand: true
-          cwd: 'craft_plugins/CpFieldLinks-Craft'
-          src: 'cpfieldlinks/**'
-          dest: 'dist/craft/plugins'
+          cwd: 'vendor/nystudio107/cookies'
+          src: '**'
+          dest: 'dist/craft/plugins/cookies'
           filter: 'isFile'
         }
         {
-          # Neo Plugin
+          # InstantAnalytics Plugin
           expand: true
-          cwd: 'craft_plugins/craft-neo'
-          src: 'neo/**'
+          cwd: 'craft_plugins'
+          src: 'instantanalytics/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Super Table Plugin
+          # Minify Plugin
           expand: true
-          cwd: 'craft_plugins/SuperTable'
-          src: 'supertable/**'
+          cwd: 'craft/plugins'
+          src: 'minify/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Fruit LinkIt
+          # Minify Plugin
           expand: true
-          cwd: 'craft_plugins/LinkIt'
-          src: 'fruitlinkit/**'
+          cwd: 'craft/plugins'
+          src: 'richvaraibles/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
@@ -379,164 +371,173 @@ module.exports = (grunt) ->
           filter: 'isFile'
         }
         {
-          # InstantAnalytics Plugin
+          # Transcoder Plugin
           expand: true
           cwd: 'craft_plugins'
-          src: 'instantanalytics/**'
+          src: 'transcoder/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Field Notes Plugin
+          # Contact Form Plugin
           expand: true
-          cwd: 'craft_plugins/CraftFieldNotes'
-          src: 'fieldnotes/**'
+          cwd: 'vendor/craftcms/contact-form'
+          src: 'contactform/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Imager Plugin
+          # CPFieldLinks Plugin
           expand: true
-          cwd: 'craft_plugins/Imager-Craft'
-          src: 'imager/**'
+          cwd: 'vendor/mmikkel/CpFieldLinks-Craft'
+          src: 'cpfieldlinks/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Control Panel CSS Plugin
+          # Reasons Plugin
           expand: true
-          cwd: 'craft_plugins/craft-cpcss'
-          src: 'cpcss/**'
+          cwd: 'vendor/mmikkel/Reasons-Craft'
+          src: 'reasons/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Expanded Singles Plugin
+          # FocusPoint Plugin
           expand: true
-          cwd: 'craft_plugins/ExpandedSingles'
-          src: 'expandedsingles/**'
+          cwd: 'vendor/smcyr/Craft-FocusPoint'
+          src: 'focuspoint/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Redactor Extras Plugin
+          # Neo Plugin
           expand: true
-          cwd: 'craft_plugins/Redactor-Extras'
-          src: 'redactorextras/**'
+          cwd: 'vendor/benjamminf/craft-neo'
+          src: 'neo/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Contact Form Plugin
+          # Quick Field Plugin
           expand: true
-          cwd: 'craft_plugins/ContactForm'
-          src: 'contactform/**'
+          cwd: 'vendor/benjamminf/craft-quick-field'
+          src: 'quickfield/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Sitemap Plugin
+          # Relabel Plugin
           expand: true
-          cwd: 'craft_plugins/craft-sitemap'
-          src: 'sitemap/**'
+          cwd: 'vendor/benjamminf/craft-relabel'
+          src: 'relabel/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Cache Clear Plugin
+          # No-Cache Plugin
           expand: true
-          cwd: 'craft_plugins/craft.cache-clear'
-          src: '**'
-          dest: 'dist/craft/plugins/cacheclear'
+          cwd: 'vendor/benjamminf/craft-nocache'
+          src: 'nocache/**'
+          dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Relabel Plugin
+          # Safe Delete Plugin
           expand: true
-          cwd: 'craft_plugins/craft-relabel'
-          src: 'relabel/**'
+          cwd: 'vendor/christianruhstaller/craft-safedelete'
+          src: 'safedelete/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Reasons Plugin
+          # Typogrify Plugin
           expand: true
-          cwd: 'craft_plugins/Reasons-Craft'
-          src: 'reasons/**'
+          cwd: 'vendor/jamiepittock/craft-typogrify'
+          src: 'typogrify/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Navee Plugin
+          # Field Notes Plugin
           expand: true
-          cwd: 'craft_plugins/navee'
-          src: '**'
-          dest: 'dist/craft/plugins/navee'
+          cwd: 'vendor/michaelrog/craftfieldnotes'
+          src: 'fieldnotes/**'
+          dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # FocusPoint Plugin
+          # Expanded Singles Plugin
           expand: true
-          cwd: 'craft_plugins/Craft-FocusPoint'
-          src: 'focuspoint/**'
+          cwd: 'vendor/engram-design/ExpandedSingles'
+          src: 'expandedsingles/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Instant Analytics Plugin
+          # Imager Plugin
           expand: true
-          cwd: 'craft_plugins/instantanalytics'
-          src: '**'
-          dest: 'dist/craft/plugins/instantanalytics'
+          cwd: 'vendor/aelvan/Imager-Craft'
+          src: 'imager/**'
+          dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Minify Plugin
+          # Fruit LinkIt
           expand: true
-          cwd: 'craft_plugins/minify'
-          src: '**'
-          dest: 'dist/craft/plugins/minify'
+          cwd: 'vendor/fruitstudios/LinkIt'
+          src: 'fruitlinkit/**'
+          dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Cookies Plugin
+          # Navee Plugin
           expand: true
-          cwd: 'craft_plugins/cookies'
-          src: '**'
-          dest: 'dist/craft/plugins/cookies'
+          cwd: 'fromtheoutfit'
+          src: 'navee/**'
+          dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
+====================================
         {
-          # SimpleMap Plugin
+          # Super Table Plugin
           expand: true
-          cwd: 'craft_plugins/SimpleMap'
-          src: 'simplemap/**'
+          cwd: 'craft_plugins/SuperTable'
+          src: 'supertable/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Typogrify Plugin
+          # Redactor Extras Plugin
           expand: true
-          cwd: 'craft_plugins/craft-typogrify'
-          src: 'typogrify/**'
+          cwd: 'craft_plugins/Redactor-Extras'
+          src: 'redactorextras/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # Import Plugin
+          # Sitemap Plugin
           expand: true
-          cwd: 'craft_plugins/import'
-          src: '**'
-          dest: 'dist/craft/plugins/import'
+          cwd: 'craft_plugins/craft-sitemap'
+          src: 'sitemap/**'
+          dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
         {
-          # No-Cache Plugin
+          # SimpleMap Plugin
           expand: true
-          cwd: 'craft_plugins/craft-nocache'
-          src: 'nocache/**'
+          cwd: 'craft_plugins/SimpleMap'
+          src: 'simplemap/**'
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
+        {
+          # Import Plugin
+          expand: true
+          cwd: 'craft_plugins/import'
+          src: '**'
+          dest: 'dist/craft/plugins/import'
+          filter: 'isFile'
+        }
       ]
   return