From 070ec5f32df8819bd58f391c2113cbadb62eb0c1 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 4 May 2016 15:24:04 -0400
Subject: [PATCH] Begin rewrite

---
 .bowerrc                                    |    3 +
 .editorconfig                               |   21 +
 .gitignore                                  |   82 ++
 .jshintrc                                   |   20 +
 Gruntfile.js                                |   31 +
 assets/css/readme.md                        |    3 +
 assets/css/sass/gathercontent-importer.scss |    7 +
 assets/js/src/gathercontent-importer.js     |   13 +
 bootstrap.php.dist                          |   31 +
 bower.json                                  |   23 +
 composer.json                               |   27 +
 css/bootstrap.min.css                       |  150 ---
 css/items.css                               |   70 --
 css/main.css                                |   47 -
 curl.php                                    | 1011 -------------------
 functions.php                               |  328 ------
 gathercontent-importer.php                  |   53 +
 gathercontent.php                           |  741 --------------
 {img => images}/logo-big.png                |  Bin
 images/readme.md                            |    3 +
 images/src/readme.md                        |    3 +
 img/ajax-loader-grey.gif                    |  Bin 847 -> 0 bytes
 img/ajax-loader.gif                         |  Bin 847 -> 0 bytes
 img/ajax_loader_blue.gif                    |  Bin 2670 -> 0 bytes
 img/glyphicons-halflings-white.png          |  Bin 8777 -> 0 bytes
 img/glyphicons-halflings.png                |  Bin 12799 -> 0 bytes
 img/help.png                                |  Bin 1345 -> 0 bytes
 img/sort_field.png                          |  Bin 1030 -> 0 bytes
 includes/functions/core.php                 |   74 ++
 includes/readme.md                          |    3 +
 js/bootstrap.min.js                         |    7 -
 js/item_import.js                           |  499 ---------
 js/main.js                                  |   73 --
 js/media.js                                 |   64 --
 package.json                                |   38 +
 phpunit.xml.dist                            |   21 +
 readme.txt                                  |   21 +-
 tasks/_template.js                          |    3 +
 tasks/build.js                              |    3 +
 tasks/css.js                                |    3 +
 tasks/default.js                            |    3 +
 tasks/js.js                                 |    3 +
 tasks/options/_template.js                  |    3 +
 tasks/options/clean.js                      |    3 +
 tasks/options/compress.js                   |   12 +
 tasks/options/concat.js                     |   16 +
 tasks/options/copy.js                       |   28 +
 tasks/options/cssmin.js                     |   18 +
 tasks/options/jshint.js                     |    7 +
 tasks/options/mocha.js                      |   11 +
 tasks/options/phpunit.js                    |   11 +
 tasks/options/postcss.js                    |   12 +
 tasks/options/sass.js                       |   11 +
 tasks/options/uglify.js                     |   17 +
 tasks/options/watch.js                      |   22 +
 tasks/test.js                               |    3 +
 tests/mocha/gathercontent-importer.html     |   27 +
 tests/mocha/tests/gathercontent-importer.js |    9 +
 tests/phpunit/Core_Tests.php                |  113 +++
 tests/phpunit/test-tools/TestCase.php       |   75 ++
 view/curl-error.php                         |   11 -
 view/finished.php                           |   15 -
 view/item-import.php                        |   64 --
 view/items.php                              |   43 -
 view/login.php                              |   23 -
 view/media.php                              |   27 -
 view/projects.php                           |   36 -
 67 files changed, 881 insertions(+), 3218 deletions(-)
 create mode 100644 .bowerrc
 create mode 100644 .editorconfig
 create mode 100644 .gitignore
 create mode 100644 .jshintrc
 create mode 100644 Gruntfile.js
 create mode 100644 assets/css/readme.md
 create mode 100644 assets/css/sass/gathercontent-importer.scss
 create mode 100644 assets/js/src/gathercontent-importer.js
 create mode 100644 bootstrap.php.dist
 create mode 100644 bower.json
 create mode 100644 composer.json
 delete mode 100644 css/bootstrap.min.css
 delete mode 100644 css/items.css
 delete mode 100644 css/main.css
 delete mode 100644 curl.php
 delete mode 100644 functions.php
 create mode 100644 gathercontent-importer.php
 delete mode 100644 gathercontent.php
 rename {img => images}/logo-big.png (100%)
 create mode 100644 images/readme.md
 create mode 100644 images/src/readme.md
 delete mode 100644 img/ajax-loader-grey.gif
 delete mode 100644 img/ajax-loader.gif
 delete mode 100644 img/ajax_loader_blue.gif
 delete mode 100644 img/glyphicons-halflings-white.png
 delete mode 100644 img/glyphicons-halflings.png
 delete mode 100644 img/help.png
 delete mode 100644 img/sort_field.png
 create mode 100644 includes/functions/core.php
 create mode 100644 includes/readme.md
 delete mode 100644 js/bootstrap.min.js
 delete mode 100644 js/item_import.js
 delete mode 100644 js/main.js
 delete mode 100644 js/media.js
 create mode 100644 package.json
 create mode 100644 phpunit.xml.dist
 create mode 100644 tasks/_template.js
 create mode 100644 tasks/build.js
 create mode 100644 tasks/css.js
 create mode 100644 tasks/default.js
 create mode 100644 tasks/js.js
 create mode 100644 tasks/options/_template.js
 create mode 100644 tasks/options/clean.js
 create mode 100644 tasks/options/compress.js
 create mode 100644 tasks/options/concat.js
 create mode 100644 tasks/options/copy.js
 create mode 100644 tasks/options/cssmin.js
 create mode 100644 tasks/options/jshint.js
 create mode 100644 tasks/options/mocha.js
 create mode 100644 tasks/options/phpunit.js
 create mode 100644 tasks/options/postcss.js
 create mode 100644 tasks/options/sass.js
 create mode 100644 tasks/options/uglify.js
 create mode 100644 tasks/options/watch.js
 create mode 100644 tasks/test.js
 create mode 100644 tests/mocha/gathercontent-importer.html
 create mode 100644 tests/mocha/tests/gathercontent-importer.js
 create mode 100644 tests/phpunit/Core_Tests.php
 create mode 100644 tests/phpunit/test-tools/TestCase.php
 delete mode 100644 view/curl-error.php
 delete mode 100644 view/finished.php
 delete mode 100644 view/item-import.php
 delete mode 100644 view/items.php
 delete mode 100644 view/login.php
 delete mode 100644 view/media.php
 delete mode 100644 view/projects.php

diff --git a/.bowerrc b/.bowerrc
new file mode 100644
index 00000000..69fad358
--- /dev/null
+++ b/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory": "bower_components"
+}
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..e4c2c706
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+# WordPress Coding Standards
+# http://make.wordpress.org/core/handbook/coding-standards/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[*.txt,wp-config-sample.php]
+end_of_line = crlf
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..86e45e42
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,82 @@
+node_modules
+release
+vendor
+composer.lock
+phpunit.xml
+.idea
+# Created by https://www.gitignore.io/api/osx,node,grunt
+
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon

+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
+
+
+### grunt ###
+# Grunt usually compiles files inside this directory
+dist/
+
+# Grunt usually preprocesses files such as coffeescript, compass... inside the .tmp directory
+.tmp/
+
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 00000000..bb3ff632
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,20 @@
+{
+	"curly":     true,
+	"eqeqeq":    true,
+	"immed":     true,
+	"latedef":   true,
+	"newcap":    true,
+	"noarg":     true,
+	"sub":       true,
+	"undef":     true,
+	"boss":      true,
+	"eqnull":    true,
+	"validthis": true,
+	"globals": {
+		"exports":  true,
+		"module":   false,
+		"console":  true,
+		"document": true,
+		"window":   true,
+	}
+}
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 00000000..51216e10
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,31 @@
+module.exports = function (grunt) {
+
+	// require `load-grunt-tasks`, which loads all grunt tasks defined in package.json
+	require('load-grunt-tasks')(grunt);
+	// load tasks defined in the `/tasks` folder
+	grunt.loadTasks('tasks');
+
+	// Function to load the options for each grunt module
+	var loadConfig = function (path) {
+		var glob = require('glob');
+		var object = {};
+		var key;
+
+		glob.sync('*', {cwd: path}).forEach(function(option) {
+			key = option.replace(/\.js$/,'');
+			object[key] = require(path + option);
+		});
+
+		return object;
+	};
+
+	var config = {
+		pkg: grunt.file.readJSON('package.json'),
+		env: process.env
+	};
+
+	grunt.util._.extend(config, loadConfig('./tasks/options/'));
+
+	grunt.initConfig(config);
+
+};
diff --git a/assets/css/readme.md b/assets/css/readme.md
new file mode 100644
index 00000000..1c34ddda
--- /dev/null
+++ b/assets/css/readme.md
@@ -0,0 +1,3 @@
+# Styles
+
+Only final CSS styles should exist in this folder.  If you are using SASS, LESS, autoprefixer, or some other pre-processor, please place your raw source files in a subdirectory.
diff --git a/assets/css/sass/gathercontent-importer.scss b/assets/css/sass/gathercontent-importer.scss
new file mode 100644
index 00000000..77b39fb2
--- /dev/null
+++ b/assets/css/sass/gathercontent-importer.scss
@@ -0,0 +1,7 @@
+/**
+ * GatherContent Importer
+ * http://www.gathercontent.com
+ *
+ * Copyright (c) 2016 GatherContent
+ * Licensed under the GPL-2.0+ license.
+ */
diff --git a/assets/js/src/gathercontent-importer.js b/assets/js/src/gathercontent-importer.js
new file mode 100644
index 00000000..c0848836
--- /dev/null
+++ b/assets/js/src/gathercontent-importer.js
@@ -0,0 +1,13 @@
+/**
+ * GatherContent Importer
+ * http://www.gathercontent.com
+ *
+ * Copyright (c) 2016 GatherContent
+ * }Licensed under the GPL-2.0+ license.
+ */
+
+( function( window, undefined ) {
+	'use strict';
+
+
+} )( this );
diff --git a/bootstrap.php.dist b/bootstrap.php.dist
new file mode 100644
index 00000000..53068ca4
--- /dev/null
+++ b/bootstrap.php.dist
@@ -0,0 +1,31 @@
+<?php
+if ( ! defined( 'PROJECT' ) ) {
+	define( 'PROJECT', __DIR__ . '/includes/' );
+}
+
+if ( ! defined( 'GATHERCONTENT_DIR' ) ) {
+	define( 'GATHERCONTENT_DIR', __DIR__ . '/' );
+}
+
+// Place any additional bootstrapping requirements here for PHP Unit.
+if ( ! defined( 'WP_LANG_DIR' ) ) {
+	define( 'WP_LANG_DIR', 'lang_dir' );
+}
+if ( ! defined( 'GATHERCONTENT_PATH' ) ) {
+	define( 'GATHERCONTENT_PATH', 'path' );
+}
+
+if ( ! file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+	throw new PHPUnit_Framework_Exception(
+		'ERROR' . PHP_EOL . PHP_EOL .
+		'You must use Composer to install the test suite\'s dependencies!' . PHP_EOL
+	);
+}
+
+require_once __DIR__ . '/vendor/autoload.php';
+
+require_once __DIR__ . '/tests/phpunit/test-tools/TestCase.php';
+
+WP_Mock::setUsePatchwork( true );
+WP_Mock::bootstrap();
+WP_Mock::tearDown();
diff --git a/bower.json b/bower.json
new file mode 100644
index 00000000..d85f0e5b
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,23 @@
+{
+  "name": "gathercontent-importer",
+  "version": "3.0.0",
+  "main": "/",
+  "license": "GPL-2.0+",
+  "ignore": [
+    "**/.*",
+    "*.md",
+    "assets/css/sass/*",
+    "assets/css/src/*",
+    "assets/js/src/*",
+    "assets/js/vendor/*",
+    "images/src/*",
+    "tests",
+    "bootstrap.php",
+    "Gruntfile.js",
+    "package.json",
+    "composer.json",
+    "phpunit.xml.dist"
+  ],
+  "devDependencies": {},
+  "keywords": []
+}
diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000..f8df8939
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,27 @@
+{
+	"name": "gathercontent-importer",
+	"description": "Imports items from GatherContent to your wordpress site",
+	"version": "3.0.0",
+	"type": "wordpress-plugin",
+	"keywords": [],
+	"homepage": "http://www.gathercontent.com",
+	"license": "GPL-2.0+",
+	"authors": [
+		{
+			"name": "GatherContent",
+			"email": "support@gathercontent.com",
+		"homepage": "http://www.gathercontent.com",
+			"role": "Developer"
+		}
+	],
+    "minimum-stability": "dev",
+	"require": {
+		"php": ">=5.6"
+	},
+    "require-dev": {
+	    "antecedent/patchwork": "1.2.*",
+        "phpunit/phpunit"     : "*@stable",
+	    "brianium/paratest"   : "dev-master",
+        "10up/wp_mock"        : "dev-master"
+    }
+}
diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css
deleted file mode 100644
index 99778d9b..00000000
--- a/css/bootstrap.min.css
+++ /dev/null
@@ -1,150 +0,0 @@
-/*!
- * Bootstrap v2.3.2
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-.gc_cf{*zoom:1;}.gc_cf:before,.gc_cf:after{display:table;content:"";line-height:0;}
-.gc_cf:after{clear:both;}
-.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;}
-.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
-.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #cccccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;}
-.btn:active,.btn.active{background-color:#cccccc \9;}
-.btn:first-child{*margin-left:0;}
-.btn:hover,.btn:focus{color:#333333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
-.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
-.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);}
-.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
-.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px;}
-.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0;}
-.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px;}
-.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-.btn-block{display:block;width:100%;padding-left:0;padding-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
-.btn-block+.btn-block{margin-top:5px;}
-input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%;}
-.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);}
-.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top, #0088cc, #0044cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));background-image:-webkit-linear-gradient(top, #0088cc, #0044cc);background-image:-o-linear-gradient(top, #0088cc, #0044cc);background-image:linear-gradient(to bottom, #0088cc, #0044cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);border-color:#0044cc #0044cc #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#0044cc;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#0044cc;*background-color:#003bb3;}
-.btn-primary:active,.btn-primary.active{background-color:#003399 \9;}
-.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(to bottom, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#f89406;*background-color:#df8505;}
-.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;}
-.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(to bottom, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#bd362f;*background-color:#a9302a;}
-.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;}
-.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(to bottom, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249;}
-.btn-success:active,.btn-success.active{background-color:#408140 \9;}
-.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(to bottom, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0;}
-.btn-info:active,.btn-info.active{background-color:#24748c \9;}
-.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#363636;background-image:-moz-linear-gradient(top, #444444, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));background-image:-webkit-linear-gradient(top, #444444, #222222);background-image:-o-linear-gradient(top, #444444, #222222);background-image:linear-gradient(to bottom, #444444, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#222222;*background-color:#151515;}
-.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;}
-button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;}
-button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;}
-button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;}
-button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;}
-.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.btn-link{border-color:transparent;cursor:pointer;color:#0088cc;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent;}
-.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333333;text-decoration:none;}
-.btn-group{position:relative;display:inline-block;*display:inline;*zoom:1;font-size:0;vertical-align:middle;white-space:nowrap;*margin-left:.3em;}.btn-group:first-child{*margin-left:0;}
-.btn-group+.btn-group{margin-left:5px;}
-.btn-toolbar{font-size:0;margin-top:10px;margin-bottom:10px;}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px;}
-.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.btn-group>.btn+.btn{margin-left:-1px;}
-.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px;}
-.btn-group>.btn-mini{font-size:10.5px;}
-.btn-group>.btn-small{font-size:11.9px;}
-.btn-group>.btn-large{font-size:17.5px;}
-.btn-group>.btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
-.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;padding:2px 8px 3px; position: relative; top: -1px}
-.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
-.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
-.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2;}
-.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;}
-.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);*padding-top:5px;*padding-bottom:5px;}
-.btn-group>.btn-mini+.dropdown-toggle{padding-left:5px;padding-right:5px;*padding-top:2px;*padding-bottom:2px;}
-.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px;}
-.btn-group>.btn-large+.dropdown-toggle{padding-left:12px;padding-right:12px;*padding-top:7px;*padding-bottom:7px;}
-.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);}
-.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6;}
-.btn-group.open .btn-primary.dropdown-toggle{background-color:#0044cc;}
-.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406;}
-.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f;}
-.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351;}
-.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4;}
-.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222222;}
-.btn .caret{margin-top:8px;margin-left:0;}
-.btn-large .caret{margin-top:6px;}
-.btn-large .caret{border-left-width:5px;border-right-width:5px;border-top-width:5px;}
-.btn-mini .caret,.btn-small .caret{margin-top:8px;}
-.dropup .btn-large .caret{border-bottom-width:5px;}
-.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;}
-.btn-group-vertical{display:inline-block;*display:inline;*zoom:1;}
-.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.btn-group-vertical>.btn+.btn{margin-left:0;margin-top:-1px;}
-.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
-.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
-.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0;}
-.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;}
-.tooltip{position:absolute;z-index:1030;display:block;visibility:visible;font-size:11px;line-height:1.4;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);}
-.tooltip.top{margin-top:-3px;padding:5px 0;}
-.tooltip.right{margin-left:3px;padding:0 5px;}
-.tooltip.bottom{margin-top:3px;padding:5px 0;}
-.tooltip.left{margin-left:-3px;padding:0 5px;}
-.tooltip-inner{max-width:200px;padding:8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid;}
-.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000000;}
-.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000000;}
-.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000000;}
-.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000000;}
-.dropup,.dropdown{position:relative;}
-.dropdown-toggle{*margin-bottom:-3px;}
-.dropdown-toggle:active,.open .dropdown-toggle{outline:0;}
-.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";opacity: 0.3;filter: alpha(opacity=30);}
-.dropdown-toggle:hover .caret,.open .caret {opacity:1;filter:alpha(opacity=100);}
-.dropdown .caret{margin-top:8px;margin-left:2px;}
-.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;}
-.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
-.dropdown-menu>li>a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:20px;color:#333333;white-space:nowrap;text-align:left;}
-.dropdown-menu>li>a:hover,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);}
-.dropdown-menu>li a.active,.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#ffffff;text-decoration:none;outline:0;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);}
-.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999999;}
-.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:default;}
-.open{*z-index:1000;}.open>.dropdown-menu{display:block;}
-.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990;}
-.pull-right>.dropdown-menu{right:0;left:auto;}
-.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"";}
-.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;}
-.dropdown-submenu{position:relative;}
-.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;}
-.dropdown-submenu:hover>.dropdown-menu{display:block;}
-.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0;}
-.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#cccccc;margin-top:5px;margin-right:-10px;}
-.dropdown-submenu:hover>a:after{border-left-color:#ffffff;}
-.dropdown-submenu.pull-left{float:none;}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;}
-.dropdown .dropdown-menu .nav-header{padding-left:20px;padding-right:20px;}
-.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
-[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;}
-.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png");}
-.icon-ok{background-position:-288px 0;}
-.icon-filter{background-position:-408px -144px;}
-.btn img { display: none; }
-.btn-wait,.btn-wait:hover,.btn-wait:focus{background:#fff;border-color:#ccc;color:#aaa;box-shadow:none;text-shadow:none;cursor:default;font-style:italic;}
-.btn-wait i{opacity:0.3;filter:alpha(opacity=30);}
-.btn-wait img{opacity:0.3;filter:alpha(opacity=30);margin-right:2px;position:relative;top:3px;width:16px;height:16px;display:inline-block}
-.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;text-align:left;}
-.alert,.alert h4{color:#c09853;}
-.alert h4{margin:0;}
-.alert .close{position:relative;top:-2px;right:-21px;line-height:20px;}
-.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;}
-.alert-success h4{color:#468847;}
-.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;}
-.alert-danger h4,.alert-error h4{color:#b94a48;}
-.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;}
-.alert-info h4{color:#3a87ad;}
-.alert-block{padding-top:14px;padding-bottom:14px;}
-.alert-block>p,.alert-block>ul{margin-bottom:0;}
-.alert-block p+p{margin-top:5px;}
diff --git a/css/items.css b/css/items.css
deleted file mode 100644
index 3ea8122b..00000000
--- a/css/items.css
+++ /dev/null
@@ -1,70 +0,0 @@
-.item-status{display:inline-block;width:15px;height:15px;position:relative;-webkit-border-radius: 2px;-moz-border-radius: 2px;border-radius: 2px;}.item-state-color-1{background-color:#C5C5C5;background-image:-moz-linear-gradient(top,#DBDBDB,#C5C5C5);background-image:-ms-linear-gradient(top,#DBDBDB,#C5C5C5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#DBDBDB),to(#C5C5C5));background-image:-webkit-linear-gradient(top,#DBDBDB,#C5C5C5);background-image:-o-linear-gradient(top,#DBDBDB,#C5C5C5);background-image:linear-gradient(top,#DBDBDB,#C5C5C5);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#DBDBDB', endColorstr='#C5C5C5', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.item-state-color-2{background-color:#FAA732;background-image:-moz-linear-gradient(top,#FBB450,#F89406);background-image:-ms-linear-gradient(top,#FBB450,#F89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#FBB450),to(#F89406));background-image:-webkit-linear-gradient(top,#FBB450,#F89406);background-image:-o-linear-gradient(top,#FBB450,#F89406);background-image:linear-gradient(top,#FBB450,#F89406);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0)}.item-state-color-3{background-color:#5EB95E;background-image:-moz-linear-gradient(top,#62C462,#57A957);background-image:-ms-linear-gradient(top,#62C462,#57A957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62C462),to(#57A957));background-image:-webkit-linear-gradient(top,#62C462,#57A957);background-image:-o-linear-gradient(top,#62C462,#57A957);background-image:linear-gradient(top,#62C462,#57A957);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0)}.item-state-color-4{background-color:#0E90D2;background-image:-moz-linear-gradient(top,#149BDF,#0480BE);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149BDF),to(#0480BE));background-image:-webkit-linear-gradient(top,#149BDF,#0480BE);background-image:-o-linear-gradient(top,#149BDF,#0480BE);background-image:linear-gradient(to bottom,#149BDF,#0480BE);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0)}.item-state-color-5{background-color:#ECD815;background-image:-moz-linear-gradient(top,#ECD815,#D8C616);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ECD815),to(#D8C616));background-image:-webkit-linear-gradient(top,#ECD815,#D8C616);background-image:-o-linear-gradient(top,#ECD815,#D8C616);background-image:linear-gradient(to bottom,#ECD815,#D8C616);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffecd815', endColorstr='#ffd8c616', GradientType=0)}.item-state-color-6{background-color:#DD4398;background-image:-moz-linear-gradient(top,#DD4398,#C93D8A);background-image:-webkit-gradient(linear,0 0,0 100%,from(#DD4398),to(#C93D8A));background-image:-webkit-linear-gradient(top,#DD4398,#C93D8A);background-image:-o-linear-gradient(top,#DD4398,#C93D8A);background-image:linear-gradient(to bottom,#DD4398,#C93D8A);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffdd4398', endColorstr='#ffc93d8a', GradientType=0)}.item-state-color-7{background-color:#954F99;background-image:-moz-linear-gradient(top,#954F99,#7A387E);background-image:-webkit-gradient(linear,0 0,0 100%,from(#954F99),to(#7A387E));background-image:-webkit-linear-gradient(top,#954F99,#7A387E);background-image:-o-linear-gradient(top,#954F99,#7A387E);background-image:linear-gradient(to bottom,#954F99,#7A387E);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff954f99', endColorstr='#ff7a387e', GradientType=0)}.item-state-color-2,.item-state-color-3,.item-state-color-4,.item-state-color-5,.item-state-color-6,.item-state-color-7{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}
-.gc_wide{width: 932px;}
-.gc_wide .gc_container-header{text-align: left; padding-left: 20px;}
-table{margin-top: 20px; -webkit-border-radius: 6px;-moz-border-radius: 6px;border-radius: 6px;}
-th:first-child{-webkit-border-radius: 6px 0 0 0;-moz-border-radius: 6px 0 0 0;border-radius: 6px 0 0 0; border-left:none}
-th:last-child{-webkit-border-radius: 0 6px 0 0;-moz-border-radius: 0 6px 0 0;border-radius: 0 6px 0 0;border-right:none}
-
-th{width: 40px; padding: 12px 0; background-color: #f5f5f5}
-th.gc_th_item_name{width: 912px; text-align: left;}
-td{text-align: center; border-top: 1px solid #ddd}
-td.gc_status{padding: 12px 0 8px;}
-td.gc_itemname{text-align: left;}
-
-.gc_wide form{padding: 0}
-.gc_main_content{padding: 20px; border-bottom: 1px solid #ddd; margin-bottom: 1px;}
-
-.gc_subfooter{background-color: #f5f5f5; padding: 20px}
-
-.gc_search_items{display: block; padding: 20px 20px 14px; background-color: #f5f5f5; border: 1px solid #e9e9e9; -webkit-border-radius: 6px;-moz-border-radius: 6px;border-radius: 6px;}
-#gc_importer_step_items_import .gc_search_items{padding-bottom: 19px;}
-.gc_search_items input{display: inline-block; padding: 5px; width: 208px;}
-#gc_itemlist_container .gc_search_items button{display: none; margin-left: 16px; white-space: nowrap; margin-top: -2px;}
-#gc_itemlist_container .gc_subfooter{display: none;}
-#gc_itemlist_container .gc_main_content{border-bottom: 0 none}
-#gc_itemlist_container.checked .gc_main_content{border-bottom: 1px solid #DDD;}
-
-.gc_search_items .gc_right .dropdown-menu a{padding-left: 8px;}
-.gc_search_items .gc_right .dropdown-menu .item-status{height: 13px; margin-right: 2px; position: relative; top: 1px; width: 13px;}
-
-
-.gc_search_items .gc_left .btn-group > .btn:last-child, .gc_search_items .gc_left .btn-group > .dropdown-toggle{top: -7px;}
-
-#gc_importer_step_items_import .gc_table_title{width: 712px;}
-.gc_settings_container{border-top: 0 none;}
-.gc_settings_container > div{background-color: #555;padding: 10px;color: #fff;-webkit-border-radius: 6px;-moz-border-radius: 6px;border-radius: 6px;}
-
-.gc_settings_col a span.caret{position: relative;top: 7px;border-bottom: 0 none;}
-.gc_settings_col a span.caret{border-top: 4px solid #000000;}
-.gc_settings_col a span.caret-up{border-bottom: 4px solid #000000;border-top: 0 none;top: 6px;}
-
-
-.gc_settings_header .gc_setting{float: left; display: inline-block; margin-right: 20px; margin-top: 5px;}
-.gc_settings_header{padding: 10px}
-.gc_setting label{font-weight: bold; font-size: 14px; margin-right: 5px}
-.hidden-item{display: none;}
-.gc_settings_header .repeat_config{padding-top: 4px;float: right;margin-right: 0;margin: 0;}
-.repeat_config input{margin-left: 5px;position: relative;top: 1px;}
-
-
-.gc_settings_field{font-size: 14px;font-weight: bold;margin-top: 5px;background-color: #474747;-webkit-border-radius: 6px;-moz-border-radius: 6px;border-radius: 6px;padding: 7px 10px 7px 30px;position: relative;}
-.gc_move_field{height: 14px;width: 6px;background: url('../img/sort_field.png') no-repeat scroll left top transparent;position: absolute;top: 12px;left: 14px;cursor: pointer;}
-.gc_settings_field .gc_left{padding-top: 4px;font-style: italic;}
-.gc_settings_field .btn-group{font-weight: normal;margin-left: 20px;}
-.gc_settings_field > div, .not-moved > div, .moved:hover > div{color: #fff;}
-.moved > div{color: #b3b3b3;}
-.moved .gc_move_field{background-position: left bottom;}
-.moved:hover .gc_move_field{background-position: left top;}
-.gc_settings_field .btn, .not-moved .btn, .moved:hover .btn{opacity:1;filter:alpha(opacity=100);background-color: #f5f5f5;background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);*background-color: #e6e6e6;filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}
-.moved .btn{background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.dropdown-menu > li.inputting, .dropdown-menu > li.live_filter{padding: 3px 15px}
-.dropdown-menu > li input{width: 100%;}
-.gc_settings_container .open > .dropdown-menu, .gc_search_items .open > .dropdown-menu{max-height: 300px;overflow-x: hidden;overflow-y: auto;}
-.gc_search_items .gc_left .open > .dropdown-menu{top: 80%;}
-.gc_itemlist tr.checked td{background-color: #FFFDBF;}
-.gc_itemlist tr:hover td{background-color: #BFD9F5;}
-
-.gc_modal{text-align: center;padding: 0 20px 20px;position: fixed;z-index: 100;background-color: #fff;left: 50%;margin-left:-148px;top:50%;margin-top:-40px;display: none;}
-.gc_overlay{display: none;bottom: 0;left: 0;position: fixed;right: 0;top: 0;background-color: #000;z-index: 90;opacity:0.65;filter:alpha(opacity=65);}
-
-#gc_items .gc_tab_name{display: inline-block; font-size: 12px; background: #000; padding: 1px 5px; margin-right: 5px; -webkit-border-radius: 6px;-moz-border-radius: 6px;border-radius: 6px}
diff --git a/css/main.css b/css/main.css
deleted file mode 100644
index d1595bca..00000000
--- a/css/main.css
+++ /dev/null
@@ -1,47 +0,0 @@
-@import url('bootstrap.min.css');
-.gc_container h2{font-size: 20px; margin: 16px 0;}
-.gc_container a{text-decoration: none; position: relative;}
-.gc_left{float: left; padding-top: 8px;}
-
-.gc_right{float: right;}
-
-.gc_center{text-align: center;}
-.gc_logo{background: url('../img/logo-big.png') 50% 50% no-repeat; height: 29px; width: 215px; margin: 30px auto;}
-.gc_logo span{display: none}
-
-.gc_container{width: 414px; background-color: #fff; border: 1px solid #d5d5d5;-webkit-border-radius: 6px;-moz-border-radius: 6px;border-radius: 6px;margin:0 auto;box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.4);}
-.gc_container-header{text-align: center; border-bottom: 1px solid #eee}
-.gc_container form, .gc_finished{padding: 0 20px 20px; position: relative;}
-.gc_container .curl_error{padding: 0 20px;}
-#gc_media{padding:20px; position: relative;}
-.gc_finished{text-align: center;}
-.gc_container .gc_message{font-size: 14px; padding: 20px 0; margin: 0;}
-#gc_importer_step_auth > div{margin-top: 20px;}
-#gc_importer_step_auth label, #gc_media label, .gc_modal label{color: #a97d13; font-weight: bold; font-size: 14px; display: block;}
-#gc_media label, .gc_modal label{padding-bottom: 6px; text-align: left;}
-#gc_importer_step_auth .gc_domain, #gc_importer_step_auth .gc_domainprefix{position: absolute; top: 31px; right: 32px; font-size: 12px;}
-#gc_importer_step_auth .gc_domainprefix{left: 32px; right: 0; width: 35px;}
-
-#gc_importer_step_auth input[type="text"]{margin-top: 7px; border: 1px solid #BBB; border-bottom: 1px solid #EAEAEA; border-right: 1px solid #EAEAEA; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1) inset; -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1) inset; box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1) inset; display: block; font-size: 12px; padding: 5px 10px; width: 374px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; border-radius: 0;}
-
-#gc_importer_step_auth #gc_api_url{padding-right: 120px; padding-left: 50px;}
-#gc_importer_step_auth .btn{float: right;}
-
-.gc-ajax-tooltip{display: inline-block; width: 16px; height: 16px; background: url('../img/help.png') no-repeat; position: relative; top: 2px; left: 10px;}
-
-.gc_error{text-align: center; color: #d90000; font-size: 16px;}
-.gc_left a.gc_option, .gc_error a, .gc_blue_link{border-bottom: 1px dotted #2591c3; color: #2591c3; text-decoration: none;}
-
-
-.progress{background-color: #e9e9e9; height: 10px; margin-bottom: 20px;}
-.progress .bar{height: 10px; background-color: #5ab800;}
-.progress, .progress .bar{-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;}
-
-.gc_list{margin: 13px 0; padding: 0;}
-.gc_list span{color: #999;}
-
-.gc_container-header h2 a.gc_blue_link{font-size: 12px; font-weight: normal; margin-right: 20px;}
-#gc_item_title{font-weight: normal; color: #999;}
-#gc_media img, .gc_importing_modal img{float: right; display: none}
-
-.dropdown-menu>li>a{margin: 0;}
diff --git a/curl.php b/curl.php
deleted file mode 100644
index 9e50b25b..00000000
--- a/curl.php
+++ /dev/null
@@ -1,1011 +0,0 @@
-<?php
-require_once 'functions.php';
-class GatherContent_Curl extends GatherContent_Functions {
-
-	var $has_acf = false;
-	var $acf_pro = false;
-	var $item_count = 0;
-	var $item_ids = array();
-	var $taxonomies = array();
-	var $allows_tags = array();
-	var $error = '';
-	var $ids_used = array();
-	var $files = array();
-	var $hierarchical = array();
-
-	function get_field_config( $obj, $files = array() ) {
-		if ( $obj->config != '' ) {
-			$config = json_decode( base64_decode( $obj->config ) );
-			$new_config = array();
-			$total_fields = 0;
-			if ( $this->foreach_safe( $config ) ) {
-				foreach ( $config as $tab_pane ) {
-					$new_fields = array();
-
-					if ( $this->foreach_safe( $tab_pane->elements ) ) {
-						foreach ( $tab_pane->elements as $element ) {
-							switch ( $element->type ) {
-								case 'text':
-									$val = $element->value;
-									$val = trim(str_replace("\xE2\x80\x8B", '', $val));
-									if ( !$element->plain_text ) {
-										$val = preg_replace_callback(
-											'#\<p\>(.+?)\<\/p\>#s',
-											create_function(
-												'$matches',
-												'return "<p>".str_replace(array("\n","\r\n","\r"), " ", $matches[1])."</p>";'
-											),
-											$val
-										);
-										$val = str_replace( '</ul><', "</ul>\n<", $val );
-										$val = preg_replace( '/<\/p>\s*<p>/m', "</p>\n<p>", $val );
-										$val = preg_replace( '/<\/p>\s*</m', "</p>\n<", $val );
-										$val = preg_replace( '/<p>\s*<\/p>/m','<p>&nbsp;</p>',$val );
-										$val = str_replace( array('<ul><li', '</li><li>', '</li></ul>'), array("<ul>\n\t<li", "</li>\n\t<li>", "</li>\n</ul>"), $val );
-
-										$val = preg_replace( '/<mark[^>]*>/i', '', $val );
-										$val = preg_replace( '/<\/mark>/i', '', $val );
-									}
-									break;
-
-								case 'choice_radio':
-									$val = '';
-									foreach ( $element->options as $idx => $option ) {
-										if ( $option->selected ) {
-											if ( isset( $option->value ) ) {
-												$val = $option->value;
-											}
-											else {
-												$val = $option->label;
-											}
-										}
-									}
-									break;
-
-								case 'choice_checkbox':
-									$val = array();
-									foreach ( $element->options as $option ) {
-										if ( $option->selected ) {
-											$val[] = $option->label;
-										}
-									}
-									break;
-
-								case 'files':
-									$val = $this->val( $files, $element->name, array() );
-									break;
-
-								default:
-									continue 2;
-									break;
-							}
-							$new_fields[$element->name] = array(
-								'name' => $element->name,
-								'label' => $element->label,
-								'type' => $element->type,
-								'value' => $val,
-							);
-						}
-					}
-
-					$total_fields += count($new_fields);
-
-					$new_config[strtolower( $tab_pane->name )] = array(
-						'label' => $tab_pane->label,
-						'elements' => $new_fields,
-					);
-				}
-			}
-
-			$new_config['field_count'] = $total_fields;
-
-			return $new_config;
-		}
-		return array();
-	}
-
-	function get_files( $item_id ) {
-		$files = $this->get( 'get_files_by_page', array('id' => $item_id) );
-		if ( $files && isset( $files->files ) && $this->foreach_safe( $files->files ) ) {
-			foreach ( $files->files as $file ) {
-				if ( !isset($this->files[$file->page_id]))
-					$this->files[$file->page_id] = array();
-				if ( !isset($this->files[$file->page_id][$file->field]))
-					$this->files[$file->page_id][$file->field] = array();
-				$file->item_id = $file->page_id;
-				$this->files[$file->page_id][$file->field][] = $file;
-			}
-		}
-	}
-
-	function get_projects() {
-		$projects = $this->get( 'get_projects' );
-
-		$newprojects = array();
-		if ( $projects && is_object( $projects ) && is_array( $projects->projects ) ) {
-			foreach ( $projects->projects as $project ) {
-				$newprojects[$project->id] = array(
-					'name'       => $project->name,
-					'item_count' => $project->page_count,
-				);
-			}
-			asort( $newprojects );
-		}
-		$this->data['projects'] = $newprojects;
-	}
-
-	function get_states() {
-		$states = $this->get( 'get_custom_states_by_project', array('id' => $this->option( 'project_id' ) ) );
-		$new_states = array();
-		$count = 5;
-		if ( $states && $this->foreach_safe( $states->custom_states ) ) {
-			foreach ( $states->custom_states as $state ) {
-				$new_states[$state->id] = (object) array(
-					'name'     => $state->name,
-					'color'    => $this->custom_state_color($state->color_id, $state->color_custom),
-					'position' => $state->position,
-				);
-				$count--;
-			}
-			uasort( $new_states, array(&$this, 'sort_items') );
-		}
-		$this->data['states'] = $new_states;
-	}
-
-	function get_projects_dropdown() {
-		$html = '';
-		$url = $this->url( 'projects', false );
-		$nonce = wp_create_nonce( $this->base_name );
-		$project_id = $this->option( 'project_id' );
-		$title = '';
-		if ( $this->foreach_safe( $this->data['projects'] ) ) {
-			foreach ( $this->data['projects'] as $id => $info ) {
-				if ( $id == $project_id ) {
-					$title = $info['name'];
-				} else {
-					$html .= '
-					<li>
-						<a href="' . $url . '&set_project_id=' . $id . '&_wpnonce=' . $nonce . '">' . $info['name'] . '</a>
-					</li>';
-				}
-			}
-			if ( $html != '' ) {
-				$html = $this->dropdown_html( '<span>' . $title . '</span>', $html );
-			}
-		}
-		$this->data['projects_dropdown'] = $html;
-	}
-
-	function get_state_dropdown() {
-		$html = '
-			<li>
-				<a data-custom-state-name="All" href="#change-state"><span class="item-status"></span>  ' . $this->__( 'All' ) . '</a>
-			</li>';
-		if ( $this->foreach_safe( $this->data['states'] ) ) {
-			foreach ( $this->data['states'] as $id => $state ) {
-				$html .= '
-				<li>
-					<a data-custom-state-name="' . $state->name . '" data-custom-state-id="' . $id . '" href="#change-state"><span class="item-status item-state-color-9999" style="background-color:' . $state->color . '"></span> ' . $state->name . '</a>
-				</li>';
-			}
-		}
-		$this->data['state_dropdown'] = $this->dropdown_html( '<i class="icon-filter"></i> <span>' . $this->__( 'All' ) . '</span>', $html );
-	}
-
-	function get_post_types() {
-		$post_types = get_post_types( array( 'public' => true ), 'objects' );
-
-		$this->_is_acf_enabled();
-
-		$html = '';
-		$new_post_types = array();
-		$default = '';
-		foreach ( $post_types as $type => $obj ) {
-			$taxonomies = get_object_taxonomies( $type );
-			if ( ( $id = array_search( 'post_tag', $taxonomies ) ) !== false ) {
-				unset($taxonomies[$id]);
-				$this->allows_tags[$type] = true;
-			}
-			if ( ( $id = array_search( 'post_format', $taxonomies ) ) !== false ) {
-				unset($taxonomies[$id]);
-			}
-			$this->taxonomies[$type] = $taxonomies;
-			if ( $default == '' ) {
-				$default = $type;
-			}
-
-			if ( $obj->hierarchical ) {
-				$this->hierarchical[$type] = true;
-			}
-
-			$html .= '
-			<li>
-				<a data-value="' . $type . '" href="#">' . $obj->labels->singular_name . '</a>
-			</li>';
-			$new_post_types[$type] = $obj->labels->singular_name;
-		}
-		$this->post_types = $new_post_types;
-		$this->data['post_types_dropdown'] = $html;
-		$this->default_post_type = $default;
-	}
-
-	function get_items( $save_items = false ) {
-		$project_id = $this->option( 'project_id' );
-		$items = $this->get( 'get_pages_by_project', array('id' => $project_id ) );
-		$original = array();
-		$new_items = array();
-		$parent_array = array();
-		if ( $items && is_array( $items->pages ) ) {
-			foreach ( $items->pages as $item ) {
-				$original[$item->id] = $item;
-				$parent_id = $item->parent_id;
-				if ( ! isset( $parent_array[$parent_id] ) ) {
-					$parent_array[$parent_id] = array();
-				}
-				$parent_array[$parent_id][$item->id] = $item;
-
-				$this->item_count++;
-			}
-			foreach ( $parent_array as $parent_id => $item_array ) {
-				$array = $item_array;
-				uasort( $array, array(&$this, 'sort_items') );
-				$parent_array[$parent_id] = $array;
-			}
-			if ( isset( $parent_array[0] ) ) {
-				foreach ( $parent_array[0] as $id => $item ) {
-					$new_items[$id] = $item;
-					$new_items[$id]->children = $this->sort_recursive( $parent_array, $id );
-				}
-			}
-			else {
-				foreach ( $parent_array as $parent => $items ) {
-					$new_items += $items;
-				}
-			}
-		}
-		$this->items = $new_items;
-		$this->original_array = $original;
-
-		if ( $save_items ) {
-			$selected = $this->option( 'selected_items' );
-			if ( ! $this->foreach_safe( $selected ) ) {
-				$selected = array();
-			}
-
-			foreach ( $selected as $id ) {
-				if ( isset( $original[$id] ) ) {
-					$this->save_gc_item( $id, $project_id, $original[$id] );
-				}
-			}
-		}
-	}
-
-	function item_overwrite_dropdown() {
-		$html = $this->_get_tree_list();
-
-		if ( $html != '' ) {
-			$html = '
-			<li class="divider"></li>' . $html;
-		}
-
-		$html = '
-			<li>
-				<a href="#" data-value="0">' . $this->__( 'New entry' ) . '</a>
-			</li>' . $html;
-		$this->data['overwrite_select'] = $html;
-	}
-
-	function parent_dropdown() {
-		$html = '<li>
-			<a href="#" data-value="0">' . $this->__( 'NONE' ) . '</a>
-		</li>
-		<li class="imported-item">
-			<a href="#" data-value="_imported_item_">' . $this->__( 'Parent Being Imported' ) . '</a>
-		</li>
-		<li class="divider"></li>' . $this->_get_tree_list();
-		$this->data['parent_select'] = $html;
-	}
-
-	function _get_tree_list() {
-		if ( isset( $this->data['tree_list'] ) ) {
-			return $this->data['tree_list'];
-		}
-
-		$html = '';
-		$walker = new GC_Walker_ItemDropdown();
-		foreach ( $this->post_types as $name => $title ) {
-			$args = array(
-				'posts_per_page'  => -1,
-				'offset'          => 0,
-				'orderby'         => 'title',
-				'order'           => 'ASC',
-				'post_type'       => $name,
-				'post_status'     => 'any',
-			);
-			$this->item_ids[$name] = array();
-			$items = get_posts( $args );
-			if ( ! empty( $items ) ) {
-				$html .= call_user_func_array( array($walker, 'walk'), array($items, 0, $args, 0, $this->base_name) );
-				foreach ( $items as $item ) {
-					$this->item_ids[$name][] = $item->ID;
-				}
-			}
-		}
-
-		$this->data['tree_list'] = $html;
-
-		return $this->data['tree_list'];
-	}
-
-	function _initialize_yoast() {
-		wpseo_init();
-
-		wpseo_admin_init();
-
-		wpseo_load_textdomain();
-
-		$options = WPSEO_Options::get_all();
-
-		new WPSEO_Metabox;
-		WPSEO_Metabox::translate_meta_boxes();
-
-		if ( $options['opengraph'] === true || $options['twitter'] === true || $options['googleplus'] === true ) {
-			new WPSEO_Social_Admin;
-			WPSEO_Social_Admin::translate_meta_boxes();
-		}
-	}
-
-	function _is_acf_enabled() {
-
-		if( function_exists( 'acf_get_field_groups') ) {
-			$this->has_acf = true;
-			$this->acf_pro = true;
-		}
-		elseif( function_exists( 'api_acf_get_field_groups' ) ) {
-			$this->has_acf = true;
-		}
-	}
-
-	function _acf_get_field_groups($params) {
-		if( $this->acf_pro ) {
-			$acf = acf_get_field_groups( $params );
-
-			$post_ids = array();
-
-			foreach($acf as $post) {
-				$post_ids[] = $post['ID'];
-			}
-
-			return $post_ids;
-		}
-		else {
-			return apply_filters( 'acf/location/match_field_groups', array(), $params );
-		}
-	}
-
-	function map_to_dropdown() {
-		global $wpdb;
-		$dont_allow = array('_wp_attachment_image_alt', '_wp_attachment_metadata', '_wp_attached_file', '_edit_lock', '_edit_last', '_wp_page_template');
-		$html = '
-			<li data-post-type="all" class="live_filter">
-				<input type="text" class="live_filter" placeholder="' . esc_attr( $this->__( 'Search... ' ) ) . '" />
-			</li>';
-		$field_groups = array();
-		$supports_custom = array();
-
-		$yoast_field_type_array = array('text', 'textarea', 'select', 'upload', 'radio', 'multiselect');
-
-		$yoast = false;
-		if( function_exists( 'wpseo_admin_init' ) ) {
-			$this->_initialize_yoast();
-			$yoast = true;
-		}
-
-		$yoast_prefix = '_yoast_wpseo_';
-		$yoast_fields = array();
-
-		foreach ( $this->post_types as $name => $title ) {
-			$supports = get_all_post_type_supports( $name );
-			if ( isset( $supports['custom-fields'] ) ) {
-				$supports_custom[] = $name;
-			}
-			if ( $name == 'attachment' ) {
-				$html .= '
-			<li data-post-type="|attachment|" data-search="' . esc_attr( $this->__( 'Title' ) ) . '">
-				<a href="#" data-value="post_title">' . $this->__( 'Title' ) . '</a>
-			</li>
-			<li data-post-type="|attachment|" data-search="' . esc_attr( $this->__( 'Caption' ) ) . '">
-				<a href="#" data-value="post_excerpt">' . $this->__( 'Caption' ) . '</a>
-			</li>
-			<li data-post-type="|attachment|" data-search="' . esc_attr( $this->__( 'Description' ) ) . '">
-				<a href="#" data-value="post_content">' . $this->__( 'Description' ) . '</a>
-			</li>
-			<li data-post-type="|attachment|" data-search="' . esc_attr( $this->__( 'Alt Text' ) ) . '">
-				<a href="#" data-value="_wp_attachment_image_alt">' . $this->__( 'Alt Text' ) . '</a>
-			</li>';
-			} else {
-				$labels = array(
-					'title'     => sprintf( $this->__( '%s Title' ), $title ),
-					'editor'    => sprintf( $this->__( '%s Content' ), $title ),
-					'excerpt'   => sprintf( $this->__( '%s Excerpt' ), $title ),
-					'thumbnail' => $this->__( 'Featured Image' ),
-					'tags'      => $this->__( 'Tags' ),
-					'cats'      => $this->__( 'Category' ),
-					'author'	=> $this->__( 'Author' ),
-				);
-				$fields = array(
-					'editor'    => 'post_content',
-					'title'     => 'post_title',
-					'excerpt'   => 'post_excerpt',
-					'thumbnail' => 'gc_featured_image_',
-					'author'	=> 'post_author',
-				);
-				foreach ( $fields as $type => $fieldname ) {
-					if ( isset( $supports[$type] ) ) {
-						$html .= '
-			<li data-post-type="|' . $name . '|" data-search="' . esc_attr( $labels[$type] ) . '">
-				<a href="#" data-value="' . $fieldname . '">' . esc_html( $labels[$type] ) . '</a>
-			</li>';
-					}
-				}
-				if ( count( $this->taxonomies[$name] ) > 0 ) {
-					$html .= '
-			<li data-post-type="|' . $name . '|" data-search="' . esc_attr( $labels['cats'] ) . '">
-				<a href="#" data-value="gc_post_cat_">' . esc_html( $labels['cats'] ) . '</a>
-			</li>';
-				}
-				if ( isset( $this->allows_tags[$name] ) ) {
-					$html .= '
-			<li data-post-type="|' . $name . '|" data-search="' . esc_attr( $labels['tags'] ) . '">
-				<a href="#" data-value="gc_post_tags_">' . esc_html( $labels['tags'] ) . '</a>
-			</li>';
-				}
-			}
-
-			if ( $this->has_acf ) {
-
-				$acf = $this->_acf_get_field_groups( array( 'post_type' => $name ) );
-
-				foreach ( $acf as $post_id ) {
-					if ( ! isset( $field_groups[$post_id] ) ) {
-						$field_groups[$post_id] = array('types' => array(), 'posts' => array());
-					}
-					$field_groups[$post_id]['types'][] = $name;
-					$field_groups[$post_id]['posts'][] = 0;
-				}
-
-				foreach ( $this->item_ids[$name] as $item_id ) {
-
-					$acf = $this->_acf_get_field_groups( array( 'post_id' => $item_id ) );
-
-					foreach ( $acf as $post_id ) {
-						if ( ! isset( $field_groups[$post_id] ) ) {
-							$field_groups[$post_id] = array( 'posts' => array() );
-						} elseif ( ! isset( $field_groups[$post_id]['posts'] ) ) {
-							$field_groups[$post_id]['posts'] = array();
-						}
-						$field_groups[$post_id]['posts'][] = $item_id;
-					}
-				}
-			}
-
-			if( $yoast ) {
-				$meta_boxes = array_merge( WPSEO_Meta::get_meta_field_defs( 'general', $name ), WPSEO_Meta::get_meta_field_defs( 'advanced' ), apply_filters( 'wpseo_save_metaboxes', array() ) );
-				foreach ( $meta_boxes as $field_name => $meta_box ) {
-					if(($field_name == 'title' || $field_name == 'metadesc') || (in_array($meta_box['type'], $yoast_field_type_array) && !empty($meta_box['title']))) {
-						$yoast_fields[$yoast_prefix . $field_name] = true;
-
-						$html .= '
-			<li data-post-type="|' . $name . '|" data-search="' . esc_attr( $meta_box['title'] ) . '">
-				<a href="#" data-value="' . $yoast_prefix . esc_attr( $field_name ) . '">' . esc_html( $meta_box['title'] ) . '</a>
-			</li>';
-
-					}
-				}
-
-			}
-		}
-
-
-		foreach ( $field_groups as $id => $options ) {
-			$options['posts'] = array_unique( $options['posts'] );
-
-			if( $this->acf_pro ) {
-				$fields = acf_get_fields( $id );
-			}
-			else {
-				$fields = apply_filters( 'acf/field_group/get_fields', array(), $id );
-			}
-
-			if(is_array($fields) && count($fields) > 0) {
-
-				foreach ( $fields as $field ) {
-					$dont_allow[] = $field['key'];
-					$text = $field['label'];
-					if ( strlen( $text ) > 30 ) {
-						$text = substr( $text, 0, 30 ) . '...';
-					}
-					$ext = '';
-					if ( isset( $options['types'] ) && count( $options['types'] ) > 0 ) {
-						$ext .= ' data-acf-post-types="|' . implode( '|', $options['types'] ) . '|"';
-					}
-					if ( isset( $options['posts'] ) && count( $options['posts'] ) > 0 ) {
-						$ext .= ' data-acf-post-ids="|' . implode( '|', $options['posts'] ) . '|"';
-					}
-					$html .= '
-				<li data-post-type="all" class="acf-row" data-search="' . esc_attr( $field['label'] ) . '"' . $ext . '>
-					<a href="#" data-value="' . esc_attr( $field['name'] ) . '" data-acf-post="' . esc_attr( $id ) . '" data-acf-field="' . esc_attr( $field['key'] ) . '" title="' . esc_attr( $field['label'] ) . '" class="acf-field">' . esc_html( $text ) . '</a>
-				</li>';
-				}
-			}
-		}
-
-
-		if( $yoast ) {
-			$yoast_fields[$yoast_prefix . 'linkdex'] = true;
-			$dont_allow = array_merge( $dont_allow, array_keys( $yoast_fields ) );
-		}
-
-
-		$dont_allow = "'".implode( "','", $dont_allow )."'";
-		$keys = $wpdb->get_col(
-			"SELECT meta_key FROM $wpdb->postmeta WHERE meta_key NOT IN($dont_allow) GROUP BY meta_key ORDER BY meta_key"
-		);
-		$supports_custom = '|' . implode( '|', $supports_custom ) . '|';
-		if ( $keys ) {
-			natcasesort( $keys );
-			foreach ( $keys as $key ) {
-				$text = $key;
-				if ( strlen( $key ) > 30 ) {
-					$text = substr( $key, 0, 30 ) . '...';
-				}
-				$html .= '
-			<li data-post-type="' . $supports_custom . '" class="custom-field" data-search="' . esc_attr( $key ) . '">
-				<a href="#" data-value="' . esc_attr( $key ) . '" title="' . esc_attr( $key ) . '">' . esc_html( $text ) . '</a>
-			</li>';
-			}
-		}
-		$html .= '
-			<li data-post-type="' . $supports_custom . '" data-search="' . $this->__( 'New Custom Field' ) . '">
-				<a href="#" data-value="_new_custom_field_">' . $this->__( 'New Custom Field' ) . '</a>
-			</li>
-			<li class="divider" data-post-type="all"></li>
-			<li data-post-type="all" data-search="' . $this->__( 'Do Not Import' ) . '">
-				<a href="#" data-value="_dont_import_">' . $this->__( 'Do Not Import' ) . '</a>
-			</li>';
-		$this->data['map_to_select'] = $html;
-	}
-
-	function categories_dropdown() {
-		$html = '';
-		foreach ( $this->post_types as $name => $title ) {
-			$r = array('hide_empty' => false);
-
-			if ( $name != 'post' ) {
-				$taxonomies = $this->taxonomies[$name];
-				if ( count( $taxonomies ) > 0 )
-				{
-					$r['taxonomy'] = $taxonomies;
-				} else {
-					continue;
-				}
-			}
-
-			$categories = get_categories( $r );
-			if ( $categories ) {
-				$html .= '';
-				$r['post_type'] = $name;
-				$walker = new GC_Walker_CategoryDropdown;
-				$html .= call_user_func_array( array(&$walker, 'walk'), array($categories, 0, $r) );
-			}
-		}
-		$this->data['category_select'] = $html;
-	}
-
-	function publish_dropdown() {
-		$stati = get_post_stati( array('internal' => false), 'objects' );
-
-		unset( $stati['future'], $stati['private'] );
-
-		$html = '';
-
-		foreach ( $stati as $status => $object ) {
-			$html .= '
-			<li>
-				<a href="#" data-value="' . $status . '">' . $object->label . '</a>
-			</li>';
-		}
-		$this->data['publish_select'] = $html;
-	}
-
-	function format_dropdown() {
-		$html = '';
-
-		$supported = array();
-
-		if ( current_theme_supports( 'post-formats' ) ) {
-
-			foreach ( $this->post_types as $name => $title ) {
-
-				if( post_type_supports( $name, 'post-formats' ) ) {
-
-					$supported[] = $name;
-
-				}
-			}
-		}
-
-		$supported_str = implode( '|', $supported );
-
-		if( count( $supported ) > 0 ) {
-
-			$post_formats = get_theme_support( 'post-formats' );
-
-			foreach ( $post_formats[0] as $format ) {
-				$html .= '
-			<li data-post-type="|' . $supported_str . '|">
-				<a href="#" data-value="' . esc_attr( $format ) . '">' . esc_html( get_post_format_string( $format ) ) . '</a>
-			</li>';
-			}
-		}
-
-		if( !empty( $html ) ) {
-				$html = '
-			<li data-post-type="|' . $supported_str . '|">
-				<a href="#" data-value="0">' . get_post_format_string( 'standard' ) . '</a>
-			</li>'.$html;
-		}
-
-		$this->data['post_format'] = $html;
-	}
-
-	function dropdown_html( $val, $html, $input = false, $real_val = '' ) {
-		return '
-		<div class="btn-group has_input">
-			<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-				' . $val . '
-				<span class="caret"></span>' . ( $input !== false ? '<input type="hidden" name="' . $input . '" value="' . esc_attr( $real_val ) . '" />' : '' ) . '
-			</a>
-			<ul class="dropdown-menu">
-				' . $html . '
-			</ul>
-		</div>';
-	}
-
-	function get_parent_item_id( $parent_id, $selected_items, $cur_settings ) {
-		$new_parent_id = 0;
-		if ( isset( $cur_settings['parent_id'] ) ) {
-			$new_parent_id = $cur_settings['parent_id'];
-		} else {
-			if ( $parent_id > 0 ) {
-				if ( in_array( $parent_id, $selected_items ) ) {
-					$new_parent_id = '_imported_item_';
-				} else {
-					$project_id = $this->option( 'project_id' );
-					$cur_settings = $this->option( 'saved_settings', array() );
-					if ( isset( $cur_settings[$project_id] ) &&
-						isset( $cur_settings[$project_id][$parent_id] ) ) {
-						$new_parent_id = $cur_settings[$project_id][$parent_id]['overwrite'];
-					}
-				}
-			}
-		}
-
-		return $new_parent_id;
-	}
-
-	function generate_settings( $array, $index = -1, $show_settings = false ) {
-		$out = '';
-		$index++;
-		$selected = $this->option( 'selected_items' );
-		if ( ! $this->foreach_safe( $selected ) ) {
-			$selected = array();
-		}
-		foreach ( $array as $id => $item ) {
-			if ( $show_settings && ! in_array( $id, $selected ) ) {
-				if ( isset( $item->children ) && count( $item->children ) > 0 ) {
-					$out .= $this->generate_settings( $item->children, $index, $show_settings );
-				}
-				continue;
-			}
-			$checked = $show_settings;
-			$cur_settings = array();
-			if ( isset( $this->data['saved_settings'][$id] ) ) {
-				$cur_settings = $this->data['saved_settings'][$id];
-			}
-			$add = '';
-
-			$parent_id = $item->parent_id;
-
-			$config = $this->get_field_config( $item );
-
-			$field_count = $this->val($config, 'field_count', 0);
-
-			$show_fields = true;
-			if ( $show_settings && $field_count == 0 ) {
-				$show_fields = false;
-			}
-			$out .= '
-				<tr class="gc_item' . ($checked?' checked':'') . '" data-item-state="' . $item->custom_state_id . '">
-					<td class="gc_status"><span class="item-status item-state-color-9999" style="background-color:' . $this->data['states'][$item->custom_state_id]->color . '"></span></td>
-					<td class="gc_itemname">';
-
-
-			if ( $index > 0 ) {
-				for ( $i = 0; $i < $index; $i++ ) {
-					$out .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-				}
-				$out .= '↳';
-			}
-
-			$out .= ' <label for="import_' . $id . '">' . $item->name . '</label></td>
-					<td class="gc_checkbox">' . ($show_fields?'<input type="checkbox" name="gc[import_' . $id . ']" id="import_' . $id . '" value="' . $id . '"' . ($checked?' checked="checked"':'') . ' />':'') . '</td>
-				</tr>';
-
-			if ( $show_settings ) {
-				if ( $show_fields ) {
-					$parent_id_value = $this->get_parent_item_id( $parent_id, $selected, $cur_settings );
-					$add = '
-					<tr class="gc_table_row" data-item-id="' . $id . '" data-parent-id="' . $parent_id . '">
-						<td colspan="3" class="gc_settings_container">
-							<div>
-								<div class="gc_settings_header gc_cf">
-									<div class="gc_cf">
-										<div class="gc_setting gc_import_as" id="gc_import_as_' . $id . '">
-											<label>' . $this->__( 'Import as' ) . ' </label>
-											' . $this->dropdown_html( '<span></span>', $this->data['post_types_dropdown'], 'gc[post_type][]', $this->val( $cur_settings, 'post_type' ) ) . '
-										</div>
-										<div class="gc_setting gc_import_to" id="gc_import_to_' . $id . '">
-											<label>' . $this->__( 'Import to' ) . ' </label>
-											' . $this->dropdown_html( '<span></span>', $this->data['overwrite_select'], 'gc[overwrite][]', $this->val( $cur_settings, 'overwrite' ) ) . '
-										</div>
-										<div class="gc_setting gc_category" id="gc_category_' . $id . '">
-											<label>' . $this->__( 'Category' ) . ' </label>
-											' . $this->dropdown_html( '<span>' . esc_html( $this->__( 'Choose category' ) ) . '</span>', $this->data['category_select'], 'gc[category][]', $this->val( $cur_settings, 'category', '-1' ) ) . '
-										</div>
-										<div class="gc_setting gc_parent" id="gc_parent_' . $id . '">
-											<label>' . $this->__( 'Parent' ) . ' </label>
-											' . $this->dropdown_html( '<span></span>', $this->data['parent_select'], 'gc[parent][]', $parent_id_value ) . '
-										</div>
-										<div class="gc_setting gc_state" id="gc_state_' . $id . '">
-											<label>' . $this->__( 'Status' ) . ' </label>
-											' . $this->dropdown_html( '<span></span>', $this->data['publish_select'], 'gc[state][]', $this->val( $cur_settings, 'state', 'draft' ) ) . '
-										</div>
-										<div class="gc_setting gc_format" id="gc_format_' . $id . '">
-											<label>' . $this->__( 'Format' ) . ' </label>
-											' . $this->dropdown_html( '<span></span>', $this->data['post_format'], 'gc[format][]', $this->val( $cur_settings, 'format', '0' ) ) . '
-										</div>
-										<div class="gc_setting repeat_config">
-											<label>' . $this->__( 'Repeat this configuration' ) . ' <input type="checkbox" id="gc_repeat_' . $id . '" name="gc[repeat_' . $id . ']" value="Y" /></label>
-										</div>
-									</div>
-								</div>
-								<div class="gc_settings_fields" id="gc_fields_' . $id . '">';
-
-					$field_settings = $this->val( $cur_settings, 'fields', array() );
-
-					if ( count( $field_settings ) > 0 ) {
-						foreach ( $field_settings as $name => $value ) {
-							list( $tab, $field_name ) = explode( '_', $name, 2 );
-							$val = $acf = $acf_post = '';
-							if ( is_array( $value ) )
-							{
-								$val = $value[0];
-								$acf = $value[1];
-								$acf_post = $value[2];
-							} else {
-								$val = $value;
-							}
-							if(isset( $config[$tab] ) && isset( $config[$tab]['elements'][$field_name] ) ) {
-								$add .= $this->field_settings( $id, $config[$tab]['elements'][$field_name], $tab, $config[$tab]['label'], $val, $acf, $acf_post );
-								unset( $config[$tab]['elements'][$field_name] );
-							}
-						}
-					}
-
-					unset( $config['field_count'] );
-
-					foreach( $config as $tab_name => $tab ) {
-
-						foreach ( $tab['elements'] as $field ) {
-							$val = $acf = $acf_post = '';
-							$cur = $this->val( $field_settings, $tab_name . '_' . $field['name'] );
-							if ( is_array( $cur ) ) {
-								$val = $cur[0];
-								$acf = $cur[1];
-								$acf_post = $cur[2];
-							} else {
-								$val = $cur;
-							}
-							$add .= $this->field_settings( $id, $field, $tab_name, $tab['label'], $val, $acf, $acf_post );
-						}
-					}
-
-					$add .= '
-								</div>
-							</div>
-						</td>
-					</tr>';
-				} else {
-					$message = $this->__( 'This item is empty. You can %sadd some content to this item in GatherContent%s.' );
-					$message = sprintf(
-						$message,
-						'<a href="https://' . $this->option( 'api_url' ) . ' . gathercontent.com/page/' . $id . '" target="_blank">',
-						'</a>'
-					);
-					$add = '
-					<tr class="gc_table_row">
-						<td colspan="4">
-							<div class="alert alert-info">' . $message . '</div>
-						</td>
-					</tr>';
-				}
-			}
-			$out .= $add;
-			if ( isset( $item->children ) && count( $item->children ) > 0 )
-			{
-				$out .= $this->generate_settings( $item->children, $index, $show_settings );
-			}
-		}
-
-		return $out;
-	}
-
-	function field_settings( $id, $field, $tab = 'content', $tab_label = '', $val = '', $acf_val = '', $acf_post = '' ) {
-		if ( $field['type'] == 'section' )
-		{
-			return '';
-		}
-		$fieldid = $id . '_' . md5( $tab . '_' . $field['label'] );
-		$counter = 0;
-		while ( isset( $this->ids_used[$fieldid] ) )
-		{
-			$fieldid = $fieldid.$counter++;
-		}
-		$this->ids_used[$fieldid] = true;
-		$html = '
-		<div class="gc_settings_field gc_cf" id="field_' . $fieldid . '">
-			<div class="gc_move_field"></div>
-			<div class="gc_field_name gc_left"><div class="gc_tab_name gc_tooltip" title="' . esc_attr( $this->__('Tab') ) . '">' . $tab_label . '</div>' . $field['label'] . '</div>
-			<div class="gc_field_map gc_right" id="gc_field_map_' . $fieldid . '">
-				<span>' . $this->__( 'Map to' ) . '</span>
-				' . $this->dropdown_html( '<span></span>', $this->data['map_to_select'], 'gc[map_to][' . $id . '][]', $val ) . '
-				<input type="hidden" name="gc[acf][' . $id . '][]" value="' . esc_attr( $acf_val ) . '" class="acf-field" />
-				<input type="hidden" name="gc[acf_post][' . $id . '][]" value="' . esc_attr( $acf_post ) . '" class="acf-post" />
-			</div>
-			<input type="hidden" name="gc[field_tab][' . $id . '][]" value="' . $tab . '" />
-			<input type="hidden" name="gc[field_name][' . $id . '][]" value="' . $field['name'] . '" />
-		</div>
-		';
-		return $html;
-	}
-
-	function _curl( $url, $curl_opts = array() ) {
-		@set_time_limit( 60 );
-		$session = curl_init();
-
-		curl_setopt( $session, CURLOPT_URL, $url );
-		curl_setopt( $session, CURLOPT_HEADER, false );
-		curl_setopt( $session, CURLOPT_RETURNTRANSFER, true );
-		curl_setopt( $session, CURLOPT_SSL_VERIFYPEER, true );
-		curl_setopt( $session, CURLOPT_CAINFO, $this->plugin_path . 'cacert.pem' );
-
-		// proxy support
-		$proxy = new WP_HTTP_Proxy();
-
-		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
-
-			curl_setopt( $session, CURLOPT_PROXYTYPE, CURLPROXY_HTTP );
-			curl_setopt( $session, CURLOPT_PROXY, $proxy->host() );
-			curl_setopt( $session, CURLOPT_PROXYPORT, $proxy->port() );
-
-			if ( $proxy->use_authentication() ) {
-				curl_setopt( $session, CURLOPT_PROXYAUTH, CURLAUTH_ANY );
-				curl_setopt( $session, CURLOPT_PROXYUSERPWD, $proxy->authentication() );
-			}
-		}
-
-		$curl_opts = apply_filters( 'gathercontent_curl_opts', $curl_opts );
-		curl_setopt_array( $session, $curl_opts );
-		$session = apply_filters( 'gathercontent_curl_session', $session, $curl_opts );
-
-		$response = curl_exec( $session );
-		$httpcode = curl_getinfo( $session, CURLINFO_HTTP_CODE );
-		curl_close( $session );
-		return array('response' => $response, 'httpcode' => $httpcode);
-	}
-
-	function get( $command = '', $postfields = array() ) {
-		$api_url = 'https://' . $this->option( 'api_url' ) . '.gathercontent.com/api/0.4/' . $command;
-		$curl_opts = array(
-			CURLOPT_HTTPAUTH   => CURLAUTH_DIGEST,
-			CURLOPT_HTTPHEADER => array('Accept: application/json', 'Content-Type: application/x-www-form-urlencoded'),
-			CURLOPT_USERPWD    => $this->option( 'api_key' ) . ':x',
-			CURLOPT_POST       => true,
-			CURLOPT_POSTFIELDS => http_build_query( $postfields ),
-		);
-
-		extract( $this->_curl( $api_url, $curl_opts ) );
-
-		try {
-			$resp = json_decode( $response );
-
-			if ( isset( $resp->success ) && $resp->success === true ) {
-				return $resp;
-			} elseif ( isset($resp->error) ) {
-				$error = $resp->error;
-				if ( $error == 'You have to log in.' )
-				{
-					$error = $this->auth_error();
-				}
-				$this->error = $this->__( $error );
-			} else {
-				$this->error = $this->auth_error();
-			}
-		} catch(Exception $e) {
-			$this->error = $this->__( 'There was a problem contacting the API. Please check your server allows it.' );
-		}
-
-		return false;
-	}
-
-	function auth_error() {
-		return sprintf( $this->__( 'There was a problem contacting the API. Please check your API credentials. %sAuth Settings%s' ), '<a href="' . $this->url( 'login', false ) . '">','</a>' );
-	}
-
-	function sort_recursive( $items, $current = 0 ) {
-		$children = array();
-		if ( isset( $items[$current] ) ) {
-			$children = $items[$current];
-			foreach ( $children as $id => $item ) {
-				$children[$id]->children = $this->sort_recursive( $items, $id );
-			}
-		}
-		return $children;
-	}
-
-	function sort_items( $a, $b ) {
-		if ( $a->position == $b->position ) {
-			if ( $a->id == $b->id ) {
-				return 0;
-			} else {
-				return ($a->id < $b->id) ? -1 : 1;
-			}
-		}
-		return ($a->position < $b->position) ? -1 : 1;
-	}
-}
-
-class GC_Walker_ItemDropdown extends Walker {
-	var $tree_type = 'item';
-	var $db_fields = array('parent' => 'post_parent', 'id' => 'ID');
-
-	function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0, $base_name = 'default' ) {
-		$pad = str_repeat( '&nbsp;', $depth * 3 );
-
-		$title = apply_filters( 'list_items', $item->post_title, $item );
-		if ( empty( $title ) ) {
-			$title = __( '(no title)', $base_name );
-		}
-		$title_text = $title;
-		if ( strlen( $title_text ) > 30 ) {
-			$title_text = substr( $title_text, 0, 30 ) . '...';
-		}
-
-		$output .= '<li class="level-' . $depth . '" data-post-type="' . $item->post_type . '"><a href="#" title="' . esc_attr( $title ) . '" data-value="' . $item->ID . '">';
-		$output .= $pad . esc_html( $title_text );
-		$output .= "</a></li>\n";
-	}
-}
-class GC_Walker_CategoryDropdown extends Walker {
-	var $tree_type = 'category';
-	var $db_fields = array('parent' => 'parent', 'id' => 'term_id');
-
-	function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
-		$pad = str_repeat( '&nbsp;', $depth * 3 );
-
-		$output .= '<li class="level-' . $depth . '" data-post-type="' . $args['post_type'] . '"><a href="#" data-value="' . $category->cat_ID . '">';
-		$output .= $pad . esc_html( $category->name );
-		$output .= "</a></li>\n";
-	}
-}
diff --git a/functions.php b/functions.php
deleted file mode 100644
index 730d5684..00000000
--- a/functions.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-class GatherContent_Functions {
-
-	var $base_name;
-	var $plugin_path;
-	var $plugin_url;
-	var $step_error = false;
-	var $step;
-	var $data = array();
-
-	function __construct() {
-		$base_name = plugin_basename( __FILE__ );
-		$this->base_name = dirname( $base_name );
-		$this->plugin_url = plugin_dir_url( __FILE__ );
-		$this->plugin_path = plugin_dir_path( __FILE__ );
-	}
-
-	function get_author_id( $display_name ) {
-		global $wpdb;
-
-		$user = $wpdb->get_row( $wpdb->prepare(
-			"SELECT `ID` FROM $wpdb->users WHERE `display_name` = %s",
-			$display_name
-		) );
-
-		if ( ! $user ) {
-			return 0;
-		}
-
-		return $user->ID;
-	}
-
-	function save_gc_item( $id, $project_id, $config ) {
-		global $wpdb;
-		$config = base64_encode( serialize( $config ) );
-		$table_name = $wpdb->prefix . 'gathercontent_items';
-		if ( $this->get_gc_item( $id ) !== false ) {
-			return $wpdb->update( $table_name, array('project_id' => $project_id, 'config' => $config), array('item_id' => $id) );
-		}
-		return $wpdb->insert( $table_name, array('item_id' => $id, 'project_id' => $project_id, 'config' => $config) );
-	}
-
-	function get_gc_item( $id ) {
-		global $wpdb;
-
-		$table_name = $wpdb->prefix . 'gathercontent_items';
-
-		$row = $wpdb->get_row(
-			$wpdb->prepare(
-				"SELECT * FROM $table_name WHERE item_id = %d",
-				$id
-			)
-		);
-
-		if ( $row === null ) {
-			return false;
-		}
-
-		$row->config = unserialize( base64_decode( $row->config ) );
-
-		return $row;
-	}
-
-	function delete_gc_item( $id ) {
-		global $wpdb;
-
-		$table_name = $wpdb->prefix . 'gathercontent_items';
-
-		$row = $wpdb->query(
-			$wpdb->prepare(
-				"DELETE FROM $table_name WHERE item_id = %d",
-				$id
-			)
-		);
-
-	}
-
-	function delete_gc_items( $project_id ) {
-		global $wpdb;
-
-		$table_name = $wpdb->prefix . 'gathercontent_items';
-
-		$row = $wpdb->query(
-			$wpdb->prepare(
-				"DELETE FROM $table_name WHERE project_id = %d",
-				$project_id
-			)
-		);
-
-	}
-
-	function get_submit_button( $text, $tag = 'button', $ext = '' ) {
-		$html = '<' . $tag;
-		if ( $tag == 'button' ) {
-			$html .= ' type="submit"';
-		}
-		echo $html . ' class="btn btn-success gc_ajax_submit_button"' . $ext . '><img src="' . $this->plugin_url . 'img/ajax-loader.gif" /> <span>' . $text . '</span></' . $tag . '>';
-	}
-
-	function get_item_title_array( $post_id ) {
-		$data = array();
-		$post = get_post( $post_id );
-		$title = isset($post->post_title) ? $post->post_title : '';
-		$title = empty($title) ? '(no title)' : $title;
-		$data['original_title'] = esc_attr( strip_tags( apply_filters( 'the_title', $title, $post_id ) ) );
-		if ( strlen( $title ) > 30 ) {
-			$title = substr( $title, 0, 27 ) . '...';
-		}
-		$data['item_title'] = apply_filters( 'the_title', $title, $post_id );
-		return $data;
-	}
-
-	function percent( $num, $total ) {
-		return number_format( ( ( $num / $total ) * 100 ),2 );
-	}
-
-	function foreach_safe( $arr ) {
-		if ( is_array( $arr ) && count( $arr ) > 0 ) {
-			return true;
-		}
-		return false;
-	}
-
-	function url( $key = '', $echo = true ) {
-		$url = menu_page_url( $this->base_name, false );
-		if ( $key != '' ) {
-			if ( strpos( $url, '?' ) === false ) {
-				$url .= '?';
-			} else {
-				$url .= '&';
-			}
-			$url .= 'step=' . $key;
-		}
-		if ( ! $echo ) {
-			return $url;
-		}
-		echo $url;
-	}
-
-	function enqueue( $handle, $type = 'script' ) {
-		if ( $type == 'script' ) {
-			wp_enqueue_script( $this->base_name . '-' . $handle );
-		} else {
-			wp_enqueue_style( $this->base_name . '-' . $handle );
-		}
-	}
-
-	function admin_print_scripts() {
-		$this->enqueue( 'main' );
-		$this->enqueue( $this->step() );
-	}
-
-	function admin_print_styles() {
-		$this->enqueue( 'main', 'style' );
-		$step = $this->step();
-		if ( $step == 'items' || $step == 'item_import' )
-		{
-			$this->enqueue( 'items', 'style' );
-		}
-	}
-
-	function option( $key ) {
-		return get_option( $this->base_name . '_' . $key );
-	}
-
-	function update( $key, $val ) {
-		update_option( $this->base_name . '_' . $key, $val );
-	}
-
-	function _e( $text ) {
-		_e( $text, $this->base_name );
-	}
-
-	function __( $text ) {
-		return __( $text, $this->base_name );
-	}
-
-	function val( $array, $field, $default = '' ) {
-		if ( is_array( $array ) && isset( $array[$field] ) ) {
-			return $array[$field];
-		}
-		return $default;
-	}
-
-	function step() {
-		if ( isset( $this->step ) ) {
-			return $this->step;
-		}
-		$steps = array( 'login', 'projects', 'items', 'item_import', 'media', 'finished' );
-		if ( !( isset( $_GET['step'] ) && in_array( $_GET['step'], $steps ) ) ) {
-			$step = 'login';
-			if ( $this->option( 'api_key' ) != '' && $this->option( 'api_url' ) != '' ) {
-				$step = 'projects';
-			}
-		} else {
-			$step = $_GET['step'];
-		}
-		$checks = array(
-			'projects'     => array('fields' => array('api_key', 'api_url'), 'prev' => 'login'),
-			'items'        => array('fields' => array('project_id'), 'prev' => 'projects'),
-			'item_import'  => array('fields' => array('project_id'), 'prev' => 'projects'),
-			'media'        => array('fields' => array('project_id'), 'prev' => 'projects'),
-		);
-		if ( isset( $checks[$step] ) ) {
-			$error = false;
-			foreach ( $checks[$step]['fields'] as $chk ) {
-				if ( $this->option( $chk ) == '' ) {
-					$error = $this->step_error = true;
-					break;
-				}
-			}
-			if ( $error ) {
-				$_GET['step'] = $checks[$step]['prev'];
-				return $this->step();
-			}
-		}
-		$this->step = $step;
-		return $step;
-	}
-
-	function view( $file, $vars = array() ) {
-		extract( $this->data );
-		extract( $vars );
-		include $this->plugin_path . 'view/' . $file . '.php';
-	}
-
-    function custom_state_color( $color_id, $color_custom ) {
-        $colors = array(
-            1 => '#C5C5C5',
-            2 => '#FAA732',
-            3 => '#5EB95E',
-            4 => '#0E90D2',
-            5 => '#ECD815',
-            6 => '#DD4398',
-            7 => '#954F99',
-            9999 => $this->custom_color_hex( $color_custom )
-        );
-        return $colors[$color_id];
-    }
-
-    function custom_color_hex( $color_custom ) {
-
-        if(empty( $color_custom )) {
-            $color_custom = '#999999';
-        }
-
-        return $color_custom;
-    }
-
-	function add_media_to_content( $post_id, $file, $more_than_1 = false ) {
-		$post_fields = array('post_title', 'post_content', 'post_excerpt');
-		$image_file = file_is_displayable_image( $file['new_file'] );
-		$html = $file['url'];
-		if ( isset( $file['acf'] ) ) {
-			update_field( $file['acf']['field_id'], $file['new_id'], $post_id );
-		} elseif ( in_array( $file['field'], $post_fields ) ) {
-			$tag = '#_gc_file_name_' . $file['counter'] . '#';
-			$post = get_post( $post_id );
-			if ( $image_file ) {
-				$html = '<a href="' . $file['url'] . '"><img src="' . $file['url'] . '" alt="' . esc_attr( $file['title'] ) . '" /></a>' . "\n";
-			} else {
-				$html = '<a href="' . $file['url'] . '">' . $file['title'] . '</a>' . "\n";
-			}
-			if ( $more_than_1 ) {
-				$html .= $tag;
-			}
-			$post = (array) $post;
-			$new_post = array(
-				'ID' => $post_id,
-				$file['field'] => str_replace( $tag, $html, $post[$file['field']] )
-			);
-			wp_update_post( $new_post );
-		} elseif ( $file['field'] == 'gc_featured_image_' ) {
-			update_post_meta( $post_id, '_thumbnail_id', $file['new_id'] );
-		} else {
-			add_post_meta( $post_id, $file['field'], $html );
-		}
-
-	}
-
-	function get_media_ajax_output( $post_id, $media, $cur_post, $item_total, $total, $state = 'draft' ) {
-		$cur_num = $_GET['cur_num'];
-		$cur_total = $_GET['cur_total'];
-
-		$next_id = $post_id;
-		if ( $cur_num == $item_total ) {
-			$item_percent = 100;
-			$cur_num = 1;
-			unset($media[$post_id]);
-			$next_id = key( $media );
-            wp_update_post(
-            	array(
-	                'ID'          => $post_id,
-	                'post_status' => $state,
-            	)
-            );
-		} else {
-			$item_percent = $this->percent( $cur_num, $item_total );
-			$cur_num++;
-			$media[$post_id] = $cur_post;
-		}
-		$media['total_files'] = $total;
-		$this->update( 'media_files', $media );
-		if ( $cur_total == $total ) {
-			$next_id = $post_id;
-			$item_percent = $overall_percent = '100';
-		} else {
-			$overall_percent = $this->percent( $cur_total, $total );
-		}
-		$cur_total++;
-
-		$data = $this->get_item_title_array( $next_id );
-
-		if ( $overall_percent == 100 ) {
-			$this->update( 'media_files', array() );
-		}
-
-		$out = array(
-			'item_percent' => $item_percent,
-			'overall_percent' => $overall_percent,
-			'cur_num' => $cur_num,
-			'cur_total' => $cur_total,
-			'item_title' => $data['item_title'],
-			'original_title' => $data['original_title'],
-		);
-		return $out;
-	}
-}
diff --git a/gathercontent-importer.php b/gathercontent-importer.php
new file mode 100644
index 00000000..5ae95ff5
--- /dev/null
+++ b/gathercontent-importer.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Plugin Name: GatherContent Importer
+ * Plugin URI:  http://www.gathercontent.com
+ * Description: Imports items from GatherContent to your wordpress site
+ * Version:     3.0.0
+ * Author:      GatherContent
+ * Author URI:  http://www.gathercontent.com
+ * Text Domain: gathercontent-import
+ * Domain Path: /languages
+ * License:     GPL-2.0+
+ */
+
+/**
+ * Copyright (c) 2016 GatherContent (email : support@gathercontent.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 or, at
+ * your discretion, any later version, as published by the Free
+ * Software Foundation.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/**
+ * Built using yo wp-make:plugin
+ * Copyright (c) 2016 10up, LLC
+ * https://github.com/10up/generator-wp-make
+ */
+
+// Useful global constants
+define( 'GATHERCONTENT_VERSION', '3.0.0' );
+define( 'GATHERCONTENT_URL',     plugin_dir_url( __FILE__ ) );
+define( 'GATHERCONTENT_PATH',    dirname( __FILE__ ) . '/' );
+define( 'GATHERCONTENT_INC',     GATHERCONTENT_PATH . 'includes/' );
+
+// Include files
+require_once GATHERCONTENT_INC . 'functions/core.php';
+
+
+// Activation/Deactivation
+register_activation_hook( __FILE__, '\TenUp\GatherContentImporter\Core\activate' );
+register_deactivation_hook( __FILE__, '\TenUp\GatherContentImporter\Core\deactivate' );
+
+// Bootstrap
+TenUp\GatherContentImporter\Core\setup();
diff --git a/gathercontent.php b/gathercontent.php
deleted file mode 100644
index 545d3ea9..00000000
--- a/gathercontent.php
+++ /dev/null
@@ -1,741 +0,0 @@
-<?php
-/*
-Plugin Name: GatherContent Importer
-Plugin URI: http://www.gathercontent.com
-Description: Imports items from GatherContent to your wordpress blog
-Version: 2.6.47
-Author: Mathew Chapman
-Author URI: http://www.gathercontent.com
-License: GPL2
-*/
-require_once 'curl.php';
-class GatherContent extends GatherContent_Curl {
-
-	var $version = '2.6.43'; // used for javascript versioning
-
-	function __construct() {
-		parent::__construct();
-		add_action( 'plugins_loaded', array(&$this, 'update_db_check') );
-		add_action( 'admin_menu', array(&$this, 'admin_menu') );
-		add_action( 'init', array(&$this, 'init') );
-		add_action( 'wp_ajax_gathercontent_download_media', array(&$this, 'download_media') );
-		add_action( 'wp_ajax_gathercontent_import_item', array(&$this, 'import_item') );
-	}
-
-	function update_db_check() {
-		if ( get_option( 'gathercontent_version' ) != $this->version ) {
-			$this->install(true);
-		}
-	}
-
-	function install($networkwide) {
-		global $wpdb;
-
-		if ( $this->multisite_install() ) {
-
-			if($networkwide) {
-				$old_blog = $wpdb->blogid;
-				$blogids = $wpdb->get_col( "SELECT blog_id FROM {$wpdb->blogs}" );
-				foreach ( $blogids as $blog_id ) {
-					switch_to_blog( $blog_id );
-					$this->_install();
-				}
-				switch_to_blog( $old_blog );
-				return;
-			}
-		}
-
-		$this->_install();
-	}
-
-	function _install() {
-		global $wpdb;
-
-		$table_name = $wpdb->prefix . 'gathercontent_items';
-
-		if( $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) != $table_name ) {
-
-			$sql = "CREATE TABLE IF NOT EXISTS $table_name (
-			  `item_id` int(10) NOT NULL,
-			  `project_id` int(10) NOT NULL,
-			  `config` longblob NOT NULL,
-			  UNIQUE KEY `item_id` (`item_id`)
-			);";
-			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-			dbDelta( $sql );
-			update_option( 'gathercontent_version', $this->version );
-		}
-	}
-
-	function uninstall($networkwide) {
-		global $wpdb;
-
-		if ( $this->multisite_install() ) {
-
-			if($networkwide) {
-				$old_blog = $wpdb->blogid;
-				$blogids = $wpdb->get_col( "SELECT blog_id FROM {$wpdb->blogs}" );
-				foreach ( $blogids as $blog_id ) {
-					switch_to_blog( $blog_id );
-					$this->_uninstall();
-				}
-				switch_to_blog( $old_blog );
-				return;
-			}
-		}
-
-		$this->_uninstall();
-	}
-
-	function _uninstall() {
-		global $wpdb;
-
-		$table_name = $wpdb->prefix . 'gathercontent_items';
-
-		$wpdb->query( "DROP TABLE IF EXISTS $table_name" );
-	}
-
-	/**
-	 * Check if GatherContent should be installed all sites in a
-	 * multisite environment or not. Allows a way to override this behavior.
-	 * @return boolean true|false
-	 */
-	function multisite_install() {
-
-		$multisite = function_exists( 'is_multisite' ) && is_multisite();
-
-		return apply_filters( 'gathercontent_multisite_install', $multisite );
-	}
-
-	function init() {
-
-		load_plugin_textdomain( $this->base_name, false, $this->base_name . '/languages' );
-
-		$scripts = array(
-			'bootstrap-tooltips' => array(
-				'file' => 'bootstrap.min.js',
-				'dep' => array('jquery')
-			),
-			'main' => array(
-				'file' => 'main.js',
-				'dep' => array($this->base_name . '-bootstrap-tooltips')
-			),
-			'item_import' => array(
-				'file' => 'item_import.js',
-				'dep' => array('jquery-ui-sortable')
-			),
-			'media' => array(
-				'file' => 'media.js',
-				'dep' => array('jquery')
-			)
-		);
-		foreach ($scripts as $handle => $vars)
-			wp_register_script( $this->base_name . '-' . $handle, $this->plugin_url . 'js/' . $vars['file'], $vars['dep'], $this->version );
-
-		$styles = array(
-			'main' => 'main.css',
-			'items' => 'items.css',
-		);
-		foreach ($styles as $handle => $file)
-			wp_register_style( $this->base_name . '-' . $handle, $this->plugin_url . 'css/' . $file, false, $this->version );
-
-	}
-
-	function admin_menu() {
-		$item = add_menu_page( 'GatherContent', 'GatherContent', 'publish_pages', $this->base_name, array(&$this, 'load_screen') );
-		add_action( 'admin_print_scripts-' . $item, array($this, 'admin_print_scripts') );
-		add_action( 'admin_print_styles-' . $item, array($this, 'admin_print_styles') );
-		add_action( 'load-' . $item, array(&$this, 'save_settings') );
-	}
-
-	function save_settings() {
-		$step = $this->step();
-		if ( isset($_POST['_wpnonce']) ) {
-			if ( wp_verify_nonce( $_POST['_wpnonce'],$this->base_name ) ) {
-				$gc = isset($_POST['gc']) ? $_POST['gc'] : array();
-				switch ( $step ) {
-					case 'projects':
-						if ( isset($_POST['project_id']) ) {
-							$this->update( 'project_id', $_POST['project_id'] );
-							$step = 'items';
-						}
-						break;
-					case 'items':
-						$import = array();
-						foreach ( $gc as $key => $val ) {
-							if ( substr( $key, 0, 7 ) == 'import_' && !empty( $val ) ) {
-								$import[] = $val;
-							}
-						}
-						if ( count( $import ) > 0 ) {
-							$this->update( 'selected_items', $import );
-							$step = 'item_import';
-						}
-						break;
-					default:
-						$url = $this->val( $gc, 'api_url' );
-						$this->update( 'api_url', $url );
-						$key = $this->val( $gc, 'api_key' );
-						$this->update( 'api_key', $key );
-						if ( $url != '' && $key != '' ) {
-							$step = 'projects';
-						}
-						break;
-				}
-				wp_redirect( $this->url( $step, false ) );
-			} else {
-				$this->error = $this->__( 'Verification failed, please refreshing the item and try again .' );
-			}
-		} elseif ( $step == 'projects' && isset($_GET['_wpnonce']) && isset($_GET['set_project_id']) ) {
-			if ( wp_verify_nonce( $_GET['_wpnonce'], $this->base_name ) ) {
-				$this->update( 'project_id', $_GET['set_project_id'] );
-				wp_redirect( $this->url( 'items', false ) );
-			} else {
-				$this->error = $this->__( 'Verification failed, please refreshing the item and try again .' );
-			}
-		} elseif ( $step == 'media' ) {
-			$media = $this->option( 'media_files' );
-			if ( !( is_array( $media ) && isset($media['total_files']) && $media['total_files'] > 0 ) ) {
-				wp_redirect( $this->url( 'finished', false ) );
-				return;
-			}
-		}
-	}
-
-	function download_media() {
-		global $wpdb;
-		$out = array('error' => $this->__( 'Verification failed, please refreshing the item and try again .' ));
-		if ( isset($_GET['_wpnonce']) ) {
-			if ( wp_verify_nonce( $_GET['_wpnonce'], $this->base_name ) ) {
-				$cur_num = $_GET['cur_num'];
-				$cur_total = $_GET['cur_total'];
-				$retry = $_GET['cur_retry'];
-
-				$media = $this->option( 'media_files' );
-				$total = $media['total_files'];
-				unset($media['total_files']);
-
-				$post_id = key( $media );
-
-				$state = 'draft';
-
-				if ( $this->foreach_safe( $media[$post_id]['files'] ) ) {
-					$cur_post = $media[$post_id];
-					$item_total = $cur_post['total_files'];
-					$more_than_1 = ( count( $cur_post['files'][0] ) > 1 );
-					$file = array_shift( $cur_post['files'][0] );
-					if ( ! $more_than_1 ) {
-						array_shift( $cur_post['files'] );
-					}
-
-					$cur_settings = $this->option( 'saved_settings' );
-					if ( isset( $cur_settings[$file['project_id']] ) &&
-						isset( $cur_settings[$file['project_id']][$file['item_id']] ) ) {
-						$state = $this->val( $cur_settings[$file['project_id']][$file['item_id']], 'state', 'draft' );
-					}
-
-					$id = $wpdb->get_col(
-						$wpdb->prepare(
-							"SELECT post_id FROM $wpdb->postmeta WHERE meta_key='gc_file_id' AND meta_value=%s",
-							$file['id']
-						)
-					);
-					if ( $id ) {
-						$id = $id[0];
-						$file['new_file'] = get_attached_file( $id );
-						$file['title']    = get_the_title( $id );
-						$file['url']      = wp_get_attachment_url( $id );
-						$file['new_id']   = $id;
-						$this->add_media_to_content( $post_id, $file, $more_than_1 );
-
-						$out = $this->get_media_ajax_output( $post_id, $media, $cur_post, $item_total, $total, $state );
-						$out['success']  = true;
-						$out['new_file'] = $file['new_file'];
-					} else {
-						$uploads = wp_upload_dir();
-						$filename = wp_unique_filename( $uploads['path'], $file['original_filename'], null );
-						$new_file = $uploads['path'] . '/' . $filename;
-						$fp = fopen( $new_file, 'w' );
-						$resp = $this->_curl( 'https://gathercontent-production-uploads.s3.amazonaws.com/' . $file['filename'], array(CURLOPT_FILE => $fp) );
-						fclose( $fp );
-						if ( $resp['httpcode'] == 200 ) {
-							extract( wp_check_filetype( $new_file ) );
-
-							$name_parts = pathinfo( $filename );
-							$name = trim( substr( $filename, 0, -( 1 + strlen( $name_parts['extension'] ) ) ) );
-
-							$title = $name;
-							$content = '';
-
-							if ( $image_meta = @wp_read_image_metadata( $new_file ) ) {
-								if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
-									$title = $image_meta['title'];
-								if ( trim( $image_meta['caption'] ) )
-									$content = $image_meta['caption'];
-							}
-
-							$object = array(
-								'post_mime_type' => $type,
-								'guid' => $uploads['url'] . '/' . $filename,
-								'post_parent' => $post_id,
-								'post_title' => $title,
-								'post_content' => $content,
-								'post_status' => 'publish',
-							);
-							$id = wp_insert_attachment( $object, $new_file );
-							add_post_meta( $id, 'gc_file_id', $file['id'] );
-							if ( ! is_wp_error( $id ) ) {
-								wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $new_file ) );
-
-								$file['new_file'] = $new_file;
-								$file['title'] = $title;
-								$file['url'] = $uploads['url'] . '/' . $filename;
-								$file['new_id'] = $id;
-								$this->add_media_to_content( $post_id, $file, $more_than_1 );
-
-								$out = $this->get_media_ajax_output( $post_id, $media, $cur_post, $item_total, $total, $state );
-								$out['success'] = true;
-								$out['new_file'] = $new_file;
-							} else {
-								if ( $retry == '1' ) {
-									$out = $this->get_media_ajax_output( $post_id, $media, $cur_post, $item_total, $total );
-									$out['success'] = false;
-									$out['error'] = sprintf( $this->__( 'There was an error with the file (%s)' ), $new_file );
-								} else {
-									$out = array(
-										'success' => false,
-										'retry'   => true,
-										'msg'     => sprintf( $this->__( 'Retrying to download (%s)' ), $file['original_filename'] )
-									);
-								}
-								//retry
-							}
-						} else {
-							if ( $retry == '1' ) {
-								$out = $this->get_media_ajax_output( $post_id, $media, $cur_post, $item_total, $total );
-								$out['success'] = false;
-								$out['error'] = sprintf( $this->__( 'Failed to download the file (%s)' ), $file['original_filename'] );
-							} else {
-								$out = array(
-									'success' => false,
-									'retry'   => true,
-									'msg'     => sprintf( $this->__( 'Retrying to download (%s)' ), $file['original_filename'] )
-								);
-							}
-							//failed
-						}
-					}
-				}
-			}
-		}
-		echo json_encode( $out );
-		exit;
-	}
-
-	function load_screen() {
-		$data = array();
-		if ( ! function_exists( 'curl_init' ) ) {
-			$this->view( 'curl-error' );
-			return;
-		}
-		$template = $this->step();
-		switch ( $this->step() ) {
-			case 'projects':
-				$this->get_projects();
-				$data['current'] = $this->option( 'project_id' );
-				break;
-			case 'items':
-				$this->get_projects();
-				$this->get_states();
-				$this->get_items();
-				$this->get_state_dropdown();
-				$this->get_projects_dropdown();
-				$data['item_count'] = $this->item_count;
-				$data['item_settings'] = $this->generate_settings( $this->items );
-				break;
-			case 'item_import':
-				$this->update( 'media_files', array() );
-				$this->get_states();
-				$this->get_items( true );
-				$this->get_post_types();
-				$this->item_overwrite_dropdown();
-				$this->map_to_dropdown();
-				$this->categories_dropdown();
-				$this->parent_dropdown();
-				$this->publish_dropdown();
-				$this->format_dropdown();
-				$cur_settings = $this->option( 'saved_settings' );
-				if ( ! is_array( $cur_settings ) ) {
-					$cur_settings = array();
-				}
-				$this->data['project_id'] = $this->option( 'project_id' );
-				$data['item_count'] = $this->item_count;
-				$this->data['saved_settings'] = $this->val( $cur_settings, $this->option( 'project_id' ), array() );
-				$data['item_settings'] = $this->generate_settings( $this->items, -1, true );
-				$template = 'item-import';
-				break;
-			case 'media':
-				$media = $this->option( 'media_files' );
-				if ( ! ( is_array( $media ) && isset($media['total_files']) && $media['total_files'] > 0 ) ) {
-					wp_redirect( $this->url( 'finished', false ) );
-					return;
-				}
-				unset($media['total_files']);
-				$post_id = key( $media );
-				$data = $this->get_item_title_array( $post_id );
-				break;
-			case 'login':
-				$data = array(
-					'api_url' => $this->option( 'api_url' ),
-					'api_key' => $this->option( 'api_key' ),
-				);
-				break;
-			case 'finished':
-				$project_id = $this->option( 'project_id' );
-				$this->delete_gc_items( $project_id );
-				break;
-		}
-		$this->view( $template, $data );
-	}
-
-	function import_item() {
-		global $wpdb;
-		$out = array('error' => $this->__( 'Verification failed, please refreshing the item and try again .' ));
-		if ( isset($_POST['_wpnonce']) && wp_verify_nonce( $_POST['_wpnonce'], $this->base_name ) ) {
-			if ( isset($_POST['gc']) && isset($_POST['gc']['item_id']) ) {
-				$gc = $_POST['gc'];
-				$item_id = $gc['item_id'];
-				$this->get_post_types();
-				$project_id = $this->option( 'project_id' );
-				$item = $this->get_gc_item( $item_id );
-				$item = $item->config;
-				$post_format = '0';
-				$file_counter = 0;
-				$total_files = 0;
-				$files = array(
-					'files' => array(),
-					'total_files' => 0,
-				);
-				$save_settings = array();
-
-				if ( $_POST['cur_counter'] == 0 ) {
-					$this->update( 'media_files', array() );
-				}
-				if ( $item !== false ) {
-					$this->get_files( $item_id );
-
-					$post_fields = array( 'post_title', 'post_content', 'post_excerpt', 'post_author' );
-
-					$config = $this->get_field_config( $item, $this->val( $this->files, $item_id, array() ) );
-
-					$fields = $this->val( $gc, 'fields', array() );
-
-					$parent_id = 0;
-					if ( is_numeric( $gc['parent_id'] ) ) {
-						$parent_id = $gc['parent_id'];
-					}
-
-					$save_settings = array(
-						'post_type' => $gc['post_type'],
-						'overwrite' => $gc['overwrite'],
-						'category' => $gc['category'],
-						'format' => $gc['format'],
-						'parent_id' => $parent_id,
-						'state' => $gc['state'],
-						'fields' => array(),
-					);
-
-					$post_format = $gc['format'];
-
-					$func = 'wp_insert_post';
-					$post = array(
-						'post_title' => $item->name,
-						'post_type' => $save_settings['post_type'],
-						'post_status' => 'draft',
-						'post_category' => array(),
-						'post_parent' => $parent_id,
-					);
-
-					$old_cats = array_filter(explode(',',$save_settings['category']));
-
-					$cats = array();
-					foreach($old_cats as $cat) {
-					    if($cat > 0) {
-					        $cats[] = $cat;
-					    }
-					}
-					if(count($cats) > 0)
-					{
-					    $post['post_category'] = $cats;
-					}
-
-
-					if ( $save_settings['overwrite'] > 0 ) {
-						$func = 'wp_update_post';
-						unset($post['post_title']);
-						$post['ID'] = $save_settings['overwrite'];
-					}
-					$post['ID'] = $func($post);
-					$save_settings['overwrite'] = $post['ID'];
-
-					$new_post_fields = array();
-					$new_meta_fields = array();
-					$new_acf_fields = array();
-					$post_tags = array();
-					$post_cats = array();
-
-					$chks = array(
-						'gc_post_cat_' => 'post_cats',
-						'gc_post_tags_' => 'post_tags',
-					);
-
-					foreach ( $fields as $info ) {
-						$acf = $info['acf'];
-						$acf_post = $info['acf_post'];
-						$tab = $info['field_tab'];
-						$map_to = $info['map_to'];
-						$field_name = $info['field_name'];
-
-						if ( $map_to == '_dont_import_' ) {
-							$save_settings['fields'][$tab . '_' . $field_name] = $map_to;
-							continue;
-						} elseif ( isset( $config[$tab] ) && isset( $config[$tab]['elements'][$field_name] ) ) {
-							$field = $config[$tab]['elements'][$field_name];
-						} else {
-							continue;
-						}
-
-						$save_settings['fields'][$tab . '_' . $field_name] = $map_to;
-
-						$special = ($map_to == 'gc_featured_image_' || $map_to == 'gc_media_file_') ? true : false;
-
-						if ( isset($chks[$map_to]) ) {
-							if ( $field['type'] != 'files' ) {
-								$values = $field['value'];
-								if ( ! is_array( $values ) ) {
-									$values = array_filter( explode( ',', strip_tags( $values ) ) );
-								}
-								foreach ( $values as $val ) {
-									$val = trim( $val );
-									if ( ! empty( $val ) ) {
-										array_push( $$chks[$map_to], $val );
-									}
-								}
-							}
-							continue;
-						} elseif ( $field['type'] == 'files' ) {
-							if ( is_array( $field['value'] ) && count( $field['value'] ) > 0 ) {
-								$new_files = array();
-								foreach ( $field['value'] as $file ) {
-									$file = (array) $file;
-									$file['post_id'] = $post['ID'];
-									$file['field'] = $map_to;
-									$file['special_field'] = $special;
-									$file['counter'] = $file_counter;
-									if ( ! empty( $acf ) ) {
-										$file['acf'] = array(
-											'field_id' => $acf,
-											'post_id' => $acf_post,
-										);
-									}
-									$new_files[] = $file;
-								}
-
-								$total_files += count( $new_files );
-								$files['files'][] = $new_files;
-								$files['total_files'] = $total_files;
-
-								$field['value'] = '#_gc_file_name_' . $file_counter . '#';
-								$file_counter++;
-							} else {
-								$field['value'] = '';
-							}
-						}
-
-						if ( $special ) {
-						} elseif ( empty( $acf ) && in_array( $map_to, $post_fields ) ) {
-							if ( ! isset( $new_post_fields[$map_to] ) ) {
-								$new_post_fields[$map_to] = array();
-							}
-							if ( $field['type'] == 'choice_checkbox' && is_array( $field['value'] ) ) {
-								$tmp = '<ul>';
-								foreach ( $field['value'] as $value ) {
-									$tmp .= '<li>' . $value . '</li>';
-								}
-								$tmp .= "</ul>\n\n";
-								$field['value'] = $tmp;
-							}
-							$new_post_fields[$map_to][] = $field;
-						} else {
-							if ( ! empty( $acf ) ) {
-								$save_settings['fields'][$tab . '_' . $field_name] = array($map_to, $acf, $acf_post);
-								$acf_field = get_field_object($acf, $acf_post);
-								if(!empty($field['value'])) {
-									if($acf_field['type'] == 'date_picker') {
-										$new_acf_fields[$acf] = date('Ymd', strtotime($field['value']));
-									}
-									else {
-										$new_acf_fields[$acf] = $field['value'];
-									}
-								}
-							} else {
-								if ( ! isset( $new_meta_fields[$map_to] ) ) {
-									$new_meta_fields[$map_to] = '';
-								}
-								if ( $field['type'] != 'files' ) {
-									$new_meta_fields[$map_to][] = $field['value'];
-								}
-							}
-						}
-					}
-
-					foreach ( $new_post_fields as $name => $values ) {
-						if ( count( $values ) > 1 ) {
-							$post[$name] = '';
-							foreach ( $values as $value ) {
-								if ( $value['value'] != '' ) {
-									if ( $name == 'post_title' ) {
-										$post[$name] .= strip_tags( $value['value'] );
-									}
-									elseif ( $name == 'post_author' ) {
-										$post[$name] = $this->get_author_id( strip_tags( $value['value'] ) );
-									}
-									else {
-										$post[$name] .= $value['value']."\n\n";
-									}
-								}
-							}
-						} else {
-							if ( $name == 'post_title' ) {
-								$post[$name] = strip_tags( $values[0]['value'] );
-							}
-							elseif ( $name == 'post_author' ) {
-								$post[$name] = $this->get_author_id( strip_tags( $values[0]['value'] ) );
-							}
-							else {
-								$post[$name] = $values[0]['value'];
-							}
-						}
-					}
-
-					if ( $total_files == 0 ){
-                        $post['post_status'] = $save_settings['state'];
-                    }
-
-					$set_post_terms = false;
-
-					if ( count( $post_cats ) > 0 && count( $this->taxonomies[$post['post_type']] ) > 0 ) {
-						$taxonomy = $this->taxonomies[$post['post_type']][key( $this->taxonomies[$post['post_type']] )];
-						$set_post_terms = true;
-						foreach ( $post_cats as $cat ) {
-							$exists = term_exists( $cat, $taxonomy );
-							if ( $exists ) {
-								$post['post_category'][] = $exists['term_id'];
-							} else {
-								$term = wp_insert_term( $cat, $taxonomy );
-								$post['post_category'][] = $term['term_id'];
-							}
-						}
-					}
-
-					if ( count( $post_tags ) > 0 && isset( $this->allows_tags[$post['post_type']] ) ) {
-						$post_tag = '';
-						foreach ( $post_tags as $tag ) {
-							$post_tag .= ($post_tag == '' ? '':',').$tag;
-						}
-						$post['tax_input'] = array(
-							'post_tag' => $post_tag,
-						);
-					}
-
-					wp_update_post( $post );
-
-					if ( $set_post_terms === true ) {
-						wp_set_post_terms( $post['ID'], $post['post_category'], $taxonomy );
-					}
-
-					if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post['post_type'], 'post-formats' ) ) {
-						set_post_format( $post['ID'], $post_format );
-					}
-
-					if(isset($new_meta_fields['_yoast_wpseo_focuskw_text_input'])) {
-						$new_meta_fields['_yoast_wpseo_focuskw'] = $new_meta_fields['_yoast_wpseo_focuskw_text_input'];
-					}
-
-					foreach ( $new_meta_fields as $field => $values ) {
-						delete_post_meta( $post['ID'], $field );
-						if ( is_array( $values ) ) {
-							foreach ( $values as $value ) {
-								if ( ! empty( $value ) ) {
-									if ( is_array( $value ) ) {
-										foreach ( $value as $value2 ) {
-											add_post_meta( $post['ID'], $field, maybe_serialize( $value2 ) );
-										}
-									} else {
-										add_post_meta( $post['ID'], $field, maybe_serialize( $value ) );
-									}
-								}
-							}
-						} elseif ( ! empty( $values ) ) {
-							add_post_meta( $post['ID'], $field, maybe_serialize( $values ) );
-						}
-					}
-
-					foreach ( $new_acf_fields as $acf => $value ) {
-						update_field( $acf, $value, $post['ID'] );
-					}
-
-					$media = $this->option( 'media_files' );
-					if ( ! isset( $media['total_files'] ) ) {
-						$media['total_files'] = 0;
-					}
-
-					if ( $total_files > 0 ) {
-						$media[$post['ID']] = $files;
-						if ( ! isset( $media['total_files'] ) ) {
-							$media['total_files'] = 0;
-						}
-						$media['total_files'] += $total_files;
-						$this->update( 'media_files', $media );
-					}
-
-					$cur_settings = $this->option( 'saved_settings' );
-					if ( ! is_array( $cur_settings ) ) {
-						$cur_settings = array();
-					}
-					if ( ! isset( $cur_settings[$project_id] ) ) {
-						$cur_settings[$project_id] = array();
-					}
-
-					$cur_settings[$project_id][$item_id] = $save_settings;
-					$this->update( 'saved_settings', $cur_settings );
-
-					$out = array(
-						'total_files'   => $total_files,
-						'item_id'       => $item_id,
-						'success'       => true,
-						'item_percent'  => $this->percent( ++$_POST['cur_counter'], $_POST['total'] ),
-						'redirect_url'  => ($media['total_files'] > 0 ? 'media' : 'finished'),
-						'new_item_id'   => $post['ID'],
-						'new_item_html' => '<li data-post-type="' . $save_settings['post_type'] . '" style="display: none;"><a href="#" title="' . esc_attr( $item->name ) . '" data-value="' . $post['ID'] . '">' . esc_html( $item->name ) . '</a></li>',
-					);
-				} else {
-					$out = array(
-						'error' => $this->__( 'There was a problem importing the item, please refresh and try again .' ),
-					);
-				}
-			} else {
-				$out = array(
-					'error' => $this->__( 'There was a problem importing the item, please refresh and try again .' ),
-				);
-			}
-		}
-		echo json_encode( $out );
-		exit;
-	}
-}
-if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-	$gc = new GatherContent;
-	register_activation_hook( __FILE__, array( &$gc, 'install' ) );
-	register_deactivation_hook( __FILE__, array( &$gc, 'uninstall' ) );
-}
diff --git a/img/logo-big.png b/images/logo-big.png
similarity index 100%
rename from img/logo-big.png
rename to images/logo-big.png
diff --git a/images/readme.md b/images/readme.md
new file mode 100644
index 00000000..1d13ae24
--- /dev/null
+++ b/images/readme.md
@@ -0,0 +1,3 @@
+# Project Images
+
+Only images in-use by the project should be placed in this folder.  Wherever possible, combine multiple small images into sprites to be used by CSS.  Original (non-sprite) images should be placed in the `/src` subdirectory.
\ No newline at end of file
diff --git a/images/src/readme.md b/images/src/readme.md
new file mode 100644
index 00000000..5d469a9d
--- /dev/null
+++ b/images/src/readme.md
@@ -0,0 +1,3 @@
+# Project Images
+
+Only source images (i.e. non-sprites, PSDs, raw photos) should be placed in this directory.  Source files are meant to serve as a backup for any images that can be edited by an end user.
\ No newline at end of file
diff --git a/img/ajax-loader-grey.gif b/img/ajax-loader-grey.gif
deleted file mode 100644
index 0443387c3e252aeb3cbe90c9631eefc3cc6ac5bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 847
zcmZ?wbhEHb6krfw_`<;O|NsA)GiUz({d@iT^=HqXojrT@iWMu~y?b~2_U(lW7al);
z{NTZZpFe-TdiCn_=g+rp-MV}CZU$0-;(u;G*N|Xm#{gF&Jp*P&pkBp)QqD!Gi6yBi
z3gww4848J6i4{5di79%Sd1?6!ia%L6xqzy4K(>G!$-o+*pwO3+Id7?fNRFabOTwzP
zGenL}lrnAjz;?5vA-b2vhAFc(V4^@PV`uB4zBQUU4W3ay7O5nC*yS;4f<?;;Q#IL&
zPSb1!8)1=8m9j_Q_d8*;Btt==%l%SMhL+UP2P;-MsJPZ1IB@XVQ6`R_DGjL^B0@X|
z4=6YYa`_x+_>dgv-pu5*<>|Hn(-{gjt4u>v0=H?uP};XReTu;fv2}|U_B&<^oL6>a
z;I;`cH(<BnWN9$qi)6FV;^k~tR>Wp`0?>!bpC@SC67kUDIuanlsk@}z@V#*(mzDEr
zL+>pfElm&EJoIL$+}v2nz#*{j;u+Q(S=@S!;Vuq$_#zn=8F+Atwdxr3IbGrE%NFo@
z_Le8q-n5*VrA8&2H%616ryHxKL6Bf=P?*AGD00+cMYFRU+Zyp>+1*WZ7!{qKB-k@F
zZfDvzLD{v*qRJ^Sq9J*A?xHeoA*F>1FAptFXiRA14Ru>4S#(E|Z)w46&ChB78?agf
z@*6PrRygpu8VVdbDUlm1aeSwQN6&?}8yf5aT`VR{3ePokB$l};CVDVL1kd1T%r#xI
zl`+Z1V+$L@s-1~RI$V9K4F$$x$w!nosQ=)7qr`4vW*(rX6`|jt(bKDf)zWyVr5-?!
zaV&E%VK}tun4^;CM2-!!7AA1m<+ZYU8mM$g^vZdgZ{qdPVL#ZZThgr6)a)uHBCzDJ
t?!|-^9SH}RehL_Na!72L?$FQYY@WfPZ^)9y8l&0Wqo&AU4N9J1002!R5v%|J

diff --git a/img/ajax-loader.gif b/img/ajax-loader.gif
deleted file mode 100644
index e192ca895cd00d6b752ec84619b787188f30ee41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 847
zcmZ?wbhEHb6krfw_`<;O|Nnmm28JI$eppyow6wIav9YPCsa?BvZN-WeVq#)tWo2n;
zX-}R!nK5I=v17+PJUqg}!hq_D2a5l>{aizWogD*Qjr0td8G$+#|4BI)r6!i7rYMwW
zmSiX-W+hhS<R_-+W#*;jGbsLK;p76U(gE24awG$5fPz9_O6I(!1|m6%S}h5y*3J+)
zHc`s7;RD;vj)v%778|C_)_{out&E+mi~81R>NI#p{aB=u^kJ9BqzM)+D@@g7D>_ZH
z6>Nk>K2^#dec$hd&5{fSg)a9?JsDb3M<1+M;h^GLd*HyqYe$(ldZsj_W{3#!96X@l
zAjsu&py5MupnEfu)0U^(0!(Kp*sL-QO$pql{X%Kq;`Av7E5z0<TG;QHEpT4hk%8ML
zz}$e{hLfeifG?8GLW`HPU0D&E<q1F^Du14!aZAKQi|a^$2&e9ncEk6^ja*jFrwzTg
zc(gP<Wb@FQp>lI$B?E`RzKdsAZ)9=nHHN!5+~JF4SY+VADb}iE(C2i8t1nx?>)BhL
zP<zvIW|kV2Y~C16ex7cumIgtBwLxJDlcC5_hZW7va%^kFk7ai^&0$n@dXiwz(72sx
z-vnjXCW|Vkz=($A-MNd(xP_D!D!e?jIH572jW^V7nPkx&Nxr28uQflX{cpf(4ajf6
z*jwSi<7y~y=%hq$ti<u15*|Gl+HPpD3v{uVFeyCO(2-c?rkLo#5D`3sqcPWX$yUZB
z7mqD$46Ak~Ch2hXsWucCizOdX-k|=2_l**}iJ5tTnpT8<gGNuU3RX+wp_Y08J;t%j
z!Gz(^relsuo)bAX%vzYhVVBp+>S>_TA<--6ZN7=uLx=rfr*28JR#UU9l!(BR!@3s}
qR&*pBVEQRw*vTQWVY)*<pR;)ehrS_88f%PZcaNGPgEc65f&l>bLIMx~

diff --git a/img/ajax_loader_blue.gif b/img/ajax_loader_blue.gif
deleted file mode 100644
index fcadd672445ce1a2865f091ade399b7fc0a15a86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2670
zcmb7`c~nzZ9>>GW%OlAnW+Mq9kd2fiB)N6Ec+}1UFNq{!5h1lmp#`LhU@dzsPzNL^
zmQ*oC7Kfn_2q2q<5yT~}AOV6FtRkhLNSzrg))}mwGa1ixhIzEJ*#0;7eE+`Z^ZVTI
zefNbMw`|;$A|{9lHwlE*)m0B3&+3Y2^&Xy;)y1`VW>;2c@8R)Gt!34PXAzIbxwz_F
z^bFvc#k0~g>v7<j!n4va<*A<XSY4iK*FB5NQ{?nmocD5_p3DKy&H+zm&tgK4C&963
za;%sd7O{qvpEay(uAWs|XC;;?M$r^bLiqoeWEG9po8z=$G5Y7gdZHJ;gX9TJA`<{X
zy|&xhm;_`sv^L8i3yE$I&vx&n{;FrzZRAKJ6{C!hK!imJ%U75jhK2j)^!TCi5$mQG
z-{~xeJR=0&$*T$?NX#S`dc6zSx%{%XiG{G4Eao4?-q=O55DF<;0*s_;g%XLFm5SyH
z1GWXhg|$S=z7HMk?Lrz5?&1Qvsj3J-Zx*6DqW}4J0hxbA55W_YD7iw91WvQe{gbs(
zG;w=z^gH`(Sxldu_FH-)jrq4H30ZdJpR15K-p`QL^is&f{y#C}tCoiIski;agl4;*
z>|FY8VdHzoj-2Rw!^*)D^9L4~(EYrxF>yl`2FY$b|6rb#Iae)NzdTYSH;1`p6h@qN
zYxFO4#UQIT%RZWorau`i-%WScdyRebO>1n0K`wh{Pd;-4li+ymnS@O<-VYpo<LQ4j
z4o;I2dC&j7ct_~UpKI42skudasM{63G3+Oz`2-d&y8V06Qk`9&?GD%#tK62m<53AU
zy2HFbzDIa9N-^W!a@euG(p7EM(!TumVPVIsEp5AfY?<XD8EWq++FLA;8|(MBNDFha
zwW&La?-A7*Djl24<xnu>Egm;U81S}VLt`Tw0lb||fSP<W<Pqz78W}L_BRyS2jlAS+
zj=O?z8sRIS0do9xEi(57a&6W=c;^mu8z4(dcW*=U^S=jS|0@ZEmn49&4rlLNWB285
z5a_bqi6*Q$DtB|88M(YWFMfSJH;y-&dOWQ;R-!n8m9x_-!#bj#ol|a|dr|Vr{d7#W
zR{<9x*%Xjpyq_Ndp}E?fX_cjly}??dNKU1o_Co;9rZHo9-2H6KPo>eQn(Zhho|a}p
za+!OjfG+RvR|90wju0uWI`mkOt3QN_LFCElNYRYiFM>D-rO;iX6ga*pAjn()6uvi(
z|ATrvj(^`@Cxz`f=OW|PjJ6m0#G9KhmyVYu`*SOMANg}KFbU%W!fQTb)6YSH=OY)g
zy1U8{XFc&vV;Z34v0|~;lYvE?F4Xa*sTlMoLf%Sa=Fu>Auu>Upsx-nzpL790r7bOr
z2pEb$SY%;ei|oV^+eHQYQY_lXcU|HNjgyxG<kxQmQKvDwW`1E_{yF&K*23bQpc`M&
zpTfp{<9*@d)^Y4%aTfoWL6*|DUiRVm8|+Q>jHcN3&r<r#A4O`KGxwCV1EZ&?z<+|$
zq58TrPi}CxC0~_JB+&4CCk%)5q$CC)3oI6KJO$=gSpti5SheC^Ia`n_R+Ev*BRaNn
zr9Hhuat^9IGjK-QKR7s)BkcVI&B0Z6hSN1}(Wy?6+pYE+3z~L^P&?`Jo9Z#(r*f+n
zw}|9(PnU&7fbgmW;Mk7P+G{5a<U<q9DZ`Oc($(_eO*-AFk+ABLd_8+YmnN3!+~D$P
zYJFOL9Ax>l*N0>YE1RlmI!r0%#6`n-$w_2dl7T5WR>db75J^pKji9=&?xcZN)oj7I
z!Vi*AWhXz0-`T0yXP}Gd!qc5HGUlt%$X}BVDX@T#HGcTHbOvkHAFF=NmtMg9#zoeU
zkJa8u^zk6;Gq<hYDiz)QBjMiv7T&Q|^8l8Q>knB~@oJXIerc(DOZm(Lh&jYMQ#t&y
zqJuRy8npRH#n2sEpDp>+!q-)bf9#tM7cfc>GIpDo{G3d(#LCJ9EUQ&adj;iFcs6Sw
zNlT{#rcx;dh~PJ3EI^|P;<hT;7)@vuVxnF-P_zc?Sb|1yLE~ii^S6yVfvi>G(obP%
z|2g9<CcbXE1>oRdbm`(TK$Xjzk39wNjZ6Qb<ln=q&yx?eUQgb;j#Sz4!epL*bKIVr
z35kGoOKNAXW2^7$zNimvQN1et^4s-N*`Y%M4c|9hqX_`pfR98X2xk;=bo5f3PpK3#
zD<o+EVW+co^5fq86H*|q5b7w51DM}&5pXEmY4xmVqN-Gl4YY&63h`;Z=(yjdHVmof
zMcFkW+F`A~D~hU8Q)fTLh(cj@;^&!BWT_NgehMDKz5nom=?bll*|-#QXhJqz6`2~}
zGuv{+SKVv5r{%nVphG*7|8s`Wbo>7D@f|Nvj+CYp>xZ^4bH@H?bf^KjfW+l80F;}z
zU!#5<pa*briG)Wk=SBh|<rNBD9ptT*+F(|V0C39Lh6t}Hwv7)uCEdtLO0psNfC4+$
zJyg#51moL28tTH}leEcprA+J6uA7)72P+CjuW8xr9g|V>%MVEcLBr%z{Dl9?Zw+<b
z*Qs+7Ct7osHxD#k`>M>S-`sL-&xt3B!tjMh*ICTN@(y!G$}V8Y$Zz|ty5w#KQ+qI(
zN{$TPAIt_kiR2BqgovU@#6hJZ7mzFP3AkJud=w>`P=&C>AgCi!8W^C7l0vIvfo^W^
z`$yZ&!V0nBY;R4|%d9%uaE}3Ms){@%2{euv5mzKhC??HZnV~>=H}fKi48}#%kHG&^
zdHhxSde}eEf`i}8==&wnG2_}hxV>)A<Cy*pTdA7I&5sX^8hyH+gsL|AYDR)O7c{Bc
zGN$i5d#3Q+;$O$11&4+EVwpbgVKlKsLf%IXwAomxME^RQ0HMHf!bbe1r*XN}5M*#j
z#3upVh0lafi6LU%HjHt0;DR#_IZGM4n85DhVCSb|DQ72UCQPH;GoLOPiEPfu($TMu
zdLan(Jv-$mzb?+T>#FuYhO_T5cgIuP^7dy8m~SkP&yS=zRI1EJNvT60K9^nk*tg?W
zSwgzW5ySto?4^?z9uz2X=Rw;84#48l0x1yD4`@-D^&Oj@ttde2!nw>k5?|nGYpxSW
zy1KiNQ$0PWZAjZ7uhBq$>zo$haJjG(W(^Nh&aE3CW)NY>#=govjiBh|+#6hu8$fgD
o?=oNxP51en6C>W8cT(;?1n}LohY!eq0bY;2zJng45aFeN0jh?q{r~^~

diff --git a/img/glyphicons-halflings-white.png b/img/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484a29d8da269f9bc874b25493a45fae3bae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8777
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
B7G?kd

diff --git a/img/glyphicons-halflings.png b/img/glyphicons-halflings.png
deleted file mode 100644
index a9969993201f9cee63cf9f49217646347297b643..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12799
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

diff --git a/img/help.png b/img/help.png
deleted file mode 100644
index 4c62162df73e97962e20d87762b9ef9abeb34774..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1345
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m=!WZB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV
z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA<wUD9OyvQvjKmn3P{y
zVygsnDZ~r81#n~YilM;-3^4tQ!~%UoJp+)JU<!SG@hi>Eg{v+u2}(t{7puX=A(aKG
z`a!A1`K3k4z=%sz23b{L<y@4SSdw29lAoUg3&ntp{F40QjQj!x=U`KX@XWlF{PJS3
zYF}R~&%EN2#JuEGPZwJypnko~%oHnUCsRu^M^i^POCt+ILsugUXCq5Tb2B$L3lmot
zQ!`VTUYGpj(%jU%5}4i;gkC3{dO-;xw*Y9fOKMSOS!#+~QGTuh*uz$txZPrb(>$o&
z6x?pH#Hm*w=oo!av?4__ObD2EKuma|1#;lYJ~a=R){B6N`n-yE1Oo%(c25__kcwMA
zlRUeb0(n~AZi^LkaSS-fYi^_Q=;G}Ccbn(A_`j<v*sIy~+vxL6)x#{mCi<<?I(gc-
zF2|VX@WX-!IooePE!r8i_DApW$0t*aq<XcEa-R92eCGM*qe+eL%Xa%-R{2z8_x`(e
zozlb;DMs;q9Bac~7wxRr8|Se7wy)!YyxSf>YxY&`<vaLf_Sv-Mmrrh5^Z293yN?wv
zN`h9E`|m&h{IkGf!l9Xd%Ny2Se{Cwk^QX>U=HJC^6Dhg=<B7KmEav#AE$IC6`)`R=
z?xkI)pEC8z<zC4$wYdJebpL(l6Hkj89T)-&8D_u!8s+?d|GK>G)^h!(s!m*w7`Bz|
zo_qP_6r0Yp&7OKwy+XA_>m(ZvsvPe%e3;IbS)l%7&XcaAN`hsV^0sefIczo|%|d1x
zgE-eLf$~E<9G7QkbvL&<DNZgG3hm(PVrzDEyYlPE!2*WaYXou~?{7O9n7<^1k)h6P
z_Fs-3x5aVmm+P6fO<NEa+Oj!D&-nK847>Tud)srpR(q-xF7ch*>h$pUkC2H=%dBK$
zEsIwho()?Y=Dl>1Rz2sVf=?SN@6A5THvjn%>)xYDA5>fZav3nR-{{%6(Emags8I8C
L^>bP0l+XkKMR4%U

diff --git a/img/sort_field.png b/img/sort_field.png
deleted file mode 100644
index 7a9097d8132374491548ffa7dd499920cf8fb431..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1030
zcmaJ=J8aWH7<O8<Dy0>V1*Kv*To{lVKawUPZbM1!m_*<xN`e|OKpp$iSgn1=zBW$P
zr4a)~f&q0wVq`?9;vrNqv_lzK5Mr#v#)23?Vnvj5nxqT_OXqv&`@aAC|NCzvpSwCb
zJT^>G)Mz#%705hD#@QkNKfC_nHJO4qUB*RJ#dXzzR7yt`2(qTS01Hsn8+YErX^QFx
zMyZU;%5_0QCZqZo#xrfgrl{!|&sMcXh(QG|7*>-0{&t53hMuJ7q6(+jBCHviRR<PV
zb0uwcQA_Cb%w;g`2}HnzSOuQBWVwQuq+7ZIS^LK<4O$Sqn4}L)m6bdYkpn@L;X)c0
z<3NmO_{d~D9-jbVj^|h|%<|z79~UBFf#X2?qe(PJuL=c8ZpR|KBwfSU7Ff1kuQT-s
zgPaAHPb3n)MmQWIh>+W`u<C^@cf6w@L05AO8ym<1zM@(|%Q#6Br-vz+c30MN+hrmJ
zV?EVod4}^->Hrnx|4`HHqFr2oM}Ge)?3NlfWDC$m%Z^4at~&0AvIWtBDn?ETp`}h0
z^EHH#TSGPwi%~FVSURe^EwrKtS<A($rNOL}qzRuf3|-*G#3V1vv$B*<@q9XbNlwSo
z(YP2*C-`VePIb5v(w0qV;SN_n;)*@Fej}JRi7Y|KSb@6iAQQ9_7L49r5<T_WT)nrK
zR8KBT%&`8o{&mfrBhowmvfH#|(`|cbkzRL5Q}2A+Y>)@BmX%T^Z@=>E;9#adwtIK)
z7WM8V^(nA-{P*~7-`2%i)6UB0r{+gwJZ0a^UE3JQFwJc%kUR0>%8d))EA=wCaZGx0
zI+!0BoX9j+GWV-n^QT^kZ`OjF566Cd9M~TIybbK3r`q7X^@*XMpuhAe@c2Ol2l_^+
X(J$J$+h_Kl`7bk@&PmT_=bL{3ytzaI

diff --git a/includes/functions/core.php b/includes/functions/core.php
new file mode 100644
index 00000000..ae9ad940
--- /dev/null
+++ b/includes/functions/core.php
@@ -0,0 +1,74 @@
+<?php
+namespace TenUp\GatherContentImporter\Core;
+
+/**
+ * Default setup routine
+ *
+ * @uses add_action()
+ * @uses do_action()
+ *
+ * @return void
+ */
+function setup() {
+	$n = function( $function ) {
+		return __NAMESPACE__ . "\\$function";
+	};
+
+	add_action( 'init', $n( 'i18n' ) );
+	add_action( 'init', $n( 'init' ) );
+
+	do_action( 'gathercontent_loaded' );
+}
+
+/**
+ * Registers the default textdomain.
+ *
+ * @uses apply_filters()
+ * @uses get_locale()
+ * @uses load_textdomain()
+ * @uses load_plugin_textdomain()
+ * @uses plugin_basename()
+ *
+ * @return void
+ */
+function i18n() {
+	$locale = apply_filters( 'plugin_locale', get_locale(), 'gathercontent' );
+	load_textdomain( 'gathercontent', WP_LANG_DIR . '/gathercontent/gathercontent-' . $locale . '.mo' );
+	load_plugin_textdomain( 'gathercontent', false, plugin_basename( GATHERCONTENT_PATH ) . '/languages/' );
+}
+
+/**
+ * Initializes the plugin and fires an action other plugins can hook into.
+ *
+ * @uses do_action()
+ *
+ * @return void
+ */
+function init() {
+	do_action( 'gathercontent_init' );
+}
+
+/**
+ * Activate the plugin
+ *
+ * @uses init()
+ * @uses flush_rewrite_rules()
+ *
+ * @return void
+ */
+function activate() {
+	// First load the init scripts in case any rewrite functionality is being loaded
+	init();
+	flush_rewrite_rules();
+}
+
+/**
+ * Deactivate the plugin
+ *
+ * Uninstall routines should be in uninstall.php
+ *
+ * @return void
+ */
+function deactivate() {
+
+}
diff --git a/includes/readme.md b/includes/readme.md
new file mode 100644
index 00000000..ee4b23f8
--- /dev/null
+++ b/includes/readme.md
@@ -0,0 +1,3 @@
+# Includes
+
+All plugin classes, objects, and libraries should be hidden away in this `/includes` directory.
\ No newline at end of file
diff --git a/js/bootstrap.min.js b/js/bootstrap.min.js
deleted file mode 100644
index e63a3315..00000000
--- a/js/bootstrap.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
-* Bootstrap.js by @fat & @mdo
-* plugins: bootstrap-dropdown.js, bootstrap-tooltip.js
-* Copyright 2013 Twitter, Inc.
-* http://www.apache.org/licenses/LICENSE-2.0.txt
-*/
-!function(a){function d(){a(".dropdown-backdrop").remove(),a(b).each(function(){e(a(this)).removeClass("open")})}function e(b){var c=b.attr("data-target"),d;c||(c=b.attr("href"),c=c&&/#/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,"")),d=c&&a(c);if(!d||!d.length)d=b.parent();return d}var b="[data-toggle=dropdown]",c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),f,g;if(c.is(".disabled, :disabled"))return;return f=e(c),g=f.hasClass("open"),d(),g||("ontouchstart"in document.documentElement&&a('<div class="dropdown-backdrop"/>').insertBefore(a(this)).on("click",d),f.toggleClass("open")),c.focus(),!1},keydown:function(c){var d,f,g,h,i,j;if(!/(38|40|27)/.test(c.keyCode))return;d=a(this),c.preventDefault(),c.stopPropagation();if(d.is(".disabled, :disabled"))return;h=e(d),i=h.hasClass("open");if(!i||i&&c.keyCode==27)return c.which==27&&h.find(b).focus(),d.click();f=a("[role=menu] li:not(.divider):visible a",h);if(!f.length)return;j=f.index(f.filter(":focus")),c.keyCode==38&&j>0&&j--,c.keyCode==40&&j<f.length-1&&j++,~j||(j=0),f.eq(j).focus()}};var f=a.fn.dropdown;a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=f,this},a(document).on("click.dropdown.data-api",d).on("click.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.dropdown.data-api",b,c.prototype.toggle).on("keydown.dropdown.data-api",b+", [role=menu]",c.prototype.keydown)}(window.jQuery),!function(a){var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f,g,h,i;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,g=this.options.trigger.split(" ");for(i=g.length;i--;)h=g[i],h=="click"?this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this)):h!="manual"&&(e=h=="hover"?"mouseenter":"focus",f=h=="hover"?"mouseleave":"blur",this.$element.on(e+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f+"."+this.type,this.options.selector,a.proxy(this.leave,this)));this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,this.$element.data(),b),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a.fn[this.type].defaults,d={},e;this._options&&a.each(this._options,function(a,b){c[a]!=b&&(d[a]=b)},this),e=a(b.currentTarget)[this.type](d).data(this.type);if(!e.options.delay||!e.options.delay.show)return e.show();clearTimeout(this.timeout),e.hoverState="in",this.timeout=setTimeout(function(){e.hoverState=="in"&&e.show()},e.options.delay.show)},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!c.options.delay||!c.options.delay.hide)return c.hide();c.hoverState="out",this.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},show:function(){var b,c,d,e,f,g,h=a.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(h);if(h.isDefaultPrevented())return;b=this.tip(),this.setContent(),this.options.animation&&b.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,b[0],this.$element[0]):this.options.placement,b.detach().css({top:0,left:0,display:"block"}),this.options.container?b.appendTo(this.options.container):b.insertAfter(this.$element),c=this.getPosition(),d=b[0].offsetWidth,e=b[0].offsetHeight;switch(f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}this.applyPlacement(g,f),this.$element.trigger("shown")}},applyPlacement:function(a,b){var c=this.tip(),d=c[0].offsetWidth,e=c[0].offsetHeight,f,g,h,i;c.offset(a).addClass(b).addClass("in"),f=c[0].offsetWidth,g=c[0].offsetHeight,b=="top"&&g!=e&&(a.top=a.top+e-g,i=!0),b=="bottom"||b=="top"?(h=0,a.left<0&&(h=a.left*-2,a.left=0,c.offset(a),f=c[0].offsetWidth,g=c[0].offsetHeight),this.replaceArrow(h-d+f,f,"left")):this.replaceArrow(g-e,g,"top"),i&&c.offset(a)},replaceArrow:function(a,b,c){this.arrow().css(c,a?50*(1-a/b)+"%":"")},setContent:function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},hide:function(){function e(){var b=setTimeout(function(){c.off(a.support.transition.end).detach()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.detach()})}var b=this,c=this.tip(),d=a.Event("hide");this.$element.trigger(d);if(d.isDefaultPrevented())return;return c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?e():c.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var b=this.$element[0];return a.extend({},typeof b.getBoundingClientRect=="function"?b.getBoundingClientRect():{width:b.offsetWidth,height:b.offsetHeight},this.$element.offset())},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(b){var c=b?a(b.currentTarget)[this.type](this._options).data(this.type):this;c.tip().hasClass("in")?c.hide():c.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var c=a.fn.tooltip;a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},a.fn.tooltip.noConflict=function(){return a.fn.tooltip=c,this}}(window.jQuery)
diff --git a/js/item_import.js b/js/item_import.js
deleted file mode 100644
index ca73904f..00000000
--- a/js/item_import.js
+++ /dev/null
@@ -1,499 +0,0 @@
-;(function($){
-	var item_loaded = false, submit_text = '';
-	$(document).ready(function(){
-		submit_text = $('.gc_ajax_submit_button:first span').text();
-
-		$('.gc_tooltip').tooltip();
-
-		$('.gc_table_row').each(function(){
-			var parent_id = $(this).attr('data-parent-id'),
-				item_id = $(this).attr('data-item-id'),
-				parent_field = $('#gc_parent_' + item_id),
-				import_as = $('#gc_import_as_' + item_id + ' input'),
-				remove = true;
-
-			if(parent_id > 0) {
-				if($('.gc_table_row[data-item-id="' + parent_id + '"]').length > 0) {
-					remove = false;
-				}
-			}
-
-			if($('.gc_table_row[data-parent-id="' + item_id + '"]').length > 0 && import_as.val() == '') {
-				import_as.val('item');
-			}
-
-
-			if(remove === true) {
-				parent_field.find('.imported-item').remove();
-			}
-			set_value(parent_field);
-		});
-
-		$('td.gc_checkbox :checkbox').change(function() {
-			var value = $(this).val(),
-				type = $('#gc_import_as_' + value + ' input').val(),
-				func = 'addClass';
-
-			if($(this).is(':checked')) {
-				if(typeof hierarchical_post_types[type] != 'undefined') {
-					func = 'removeClass';
-				}
-			}
-
-			hide_imported_parent(value, func);
-		});
-
-
-		$('.repeat_config input').change(function(){
-			var $t = $(this);
-			if($t.is(':checked')){
-				$('.gc_overlay,.gc_repeating_modal').show();
-				setTimeout(function(){
-					repeat_config($t);
-				},500);
-			}
-		});
-
-
-		$('#gc_importer_step_items_import').submit(submit_item_import);
-
-
-		$('.gc_field_map input.live_filter').click(function(e){
-			e.preventDefault();
-			e.stopImmediatePropagation();
-		}).keyup(function(e){
-			var v = $(this).val(),
-				lis = $(this).parent().siblings('li:not(.hidden-item):not(.divider)');
-			if(!v || v == ''){
-				lis.show();
-			} else {
-				lis.hide().filter(':icontains_searchable('+$(this).val()+')').show();
-			}
-		}).focus(function(){
-			$(this).trigger('keyup');
-		});
-
-
-		$('.gc_field_map').find('a[data-value="_new_custom_field_"]').click(function(e){
-			e.preventDefault();
-			e.stopImmediatePropagation();
-			var parent = $(this).parent();
-			parent.before('<li class="custom-field inputting"><input type="text" /></li>');
-			parent.prev().find('input').focus();
-		}).end().find('ul.dropdown-menu a:not([data-value="_new_custom_field_"])').click(function(){
-			var $t = $(this), acf = '', acf_post = '';
-			if($t.hasClass('acf-field')){
-				acf = $t.attr('data-acf-field');
-				acf_post = $t.attr('data-acf-post');
-			}
-			var field = $t.closest('.gc_field_map').find('input.acf-field').val(acf).end().find('input.acf-post').val(acf_post).end(),
-				tr = field.closest('tr'),
-				item_id= tr.attr('data-item-id');
-			if($('#gc_repeat_'+item_id).is(':checked')){
-				var rows = tr.parent().find('tr.gc_table_row[data-item-id]'),
-					idx = rows.index(tr),
-					field_id = field.attr('id').split('_')[4],
-					val = $t.attr('data-value');
-				rows.filter(':gt('+idx+')').each(function(){
-					var item_id = $(this).attr('data-item-id');
-					if(!$('#gc_repeat_'+item_id).is(':checked')){
-						$('#gc_field_map_'+item_id+'_'+field_id+' li:not(.hidden-item) a[data-value="'+val+'"]').trigger('click');
-					} else {
-						return false;
-					}
-				});
-			}
-		});
-
-
-		$('.gc_field_map').on('keydown','li.inputting input', function(e){
-			var key = e.keyCode || e.which;
-			if(key == 13){
-				$(this).trigger('blur');
-			}
-		}).on('blur','li.inputting input',function(e){
-			var v = $(this).val(),
-				li = $(this).parent(),
-				prev = li.prev();
-			if(!v || v == ''){
-				li.remove();
-			} else {
-				$(this).parent().attr('data-post-type','normal').removeClass('inputting').html('<a href="#" />').find('a').attr('data-value',v).text(v).trigger('click');
-			}
-		});
-
-		$('.gc_settings_container .gc_setting:not(.gc_category) .has_input, .gc_field_map .has_input').on('click','ul a',function(e){
-			e.preventDefault();
-			$(this).closest('.has_input').find('a:first span:first').html($(this).html()).siblings('input').val($(this).attr('data-value')).trigger('change');
-		});
-		$('.gc_category').on('click','ul li:not(.disabled) a:not([data-value="-1"])', function(e){
-			e.preventDefault();
-			e.stopImmediatePropagation();
-			var $t = $(this),
-				c = $t.closest('.btn-group'),
-				lis = c.find('li:not(.hidden-item)'),
-				v = '';
-			$t.toggleClass('active');
-			lis.find('a.active').each(function(){
-				v += ','+$(this).attr('data-value');
-			});
-			c.find('input').val(v);
-		});
-
-
-		$('.gc_import_as').on('change', 'input', function(){
-
-			var value = $(this).val(),
-				row = $(this).closest('tr'),
-				item_id = row.attr('data-item-id'),
-				to = $('#gc_import_to_'+item_id),
-				parent = $('#gc_parent_'+item_id),
-				cat = $('#gc_category_'+item_id),
-				state = $('#gc_state_'+item_id),
-				format = $('#gc_format_'+item_id),
-				parent_func = '',
-				length = 0;
-
-			to.add(parent).find('li[data-post-type]').filter('[data-post-type!="' + value + '"]').hide().addClass('hidden-item').end().filter('[data-post-type="' + value +'"]').show().removeClass('hidden-item');
-			set_value(to);
-
-			if(typeof hierarchical_post_types[value] != 'undefined') {
-				parent.show();
-				set_value(parent);
-				parent_func = 'show';
-			}
-			else {
-				parent.hide();
-				parent_func = 'hide';
-			}
-
-			hide_imported_parent(item_id, parent_func);
-
-			set_map_to_fields(row, value, item_id);
-
-			length = cat.find('li').filter('[data-post-type!="' + value + '"]').hide().addClass('hidden-item').end().filter('[data-post-type="' + value + '"]').show().removeClass('hidden-item').length;
-			set_cat_value(cat);
-			if(length > 0) {
-				cat.show();
-			}
-			else {
-				cat.hide();
-			}
-
-			length = format.find('li').filter(':not([data-post-type*="|' + value + '|"])').hide().addClass('hidden-item').end().filter('[data-post-type*="|' + value + '|"]').show().removeClass('hidden-item').length;
-			set_value(format);
-			if(length > 0) {
-				format.show();
-			}
-			else {
-				format.hide();
-			}
-
-			set_value(state);
-
-		}).each(function(){
-			set_value($(this).find('.btn-group'));
-		});
-
-
-		$('.gc_import_to').on('change', 'input', function(){
-			var elem = $(this).closest('.gc_settings_container');
-			set_map_to_fields(elem,$('#gc_import_as_'+elem.attr('data-item-id')+' input').val());
-		});
-
-
-		$('.gc_settings_fields').sortable({
-			handle: '.gc_move_field',
-			update: function(e, ui) {
-				var tr = ui.item.closest('tr'),
-					item_id = tr.attr('data-item-id');
-				if($('#gc_repeat_'+item_id).is(':checked')){
-					var rows = tr.parent().find('tr.gc_table_row[data-item-id]'),
-						idx = rows.index(tr),
-						new_index = ui.item.index();
-					rows.filter(':gt('+idx+')').each(function(){
-						var item_id = $(this).attr('data-item-id');
-						if(!$('#gc_repeat_'+item_id).is(':checked')){
-							var field_id = ui.item.attr('id').split('_')[2],
-								item = $('#field_'+item_id+'_'+field_id);
-							if(item.length > 0){
-								if(new_index > 0){
-									item.parent().find('> .gc_settings_field:eq('+(new_index > item.index() ? new_index : (new_index-1))+')').after(item);
-								} else {
-									item.parent().prepend(item);
-								}
-							}
-						} else {
-							return false;
-						}
-					});
-
-				}
-			}
-		});
-		item_loaded = true;
-	});
-
-	function hide_imported_parent(item_id, func){
-
-		var display = func == 'addClass' ? 'none' : 'list-item';
-
-		$('.gc_table_row[data-parent-id="' + item_id + '"]').each(function() {
-			$(this).find('.imported-item')[func]('hidden-item').css('display', display);
-			set_value($('#gc_parent_' + $(this).attr('data-item-id')));
-		});
-	}
-
-	function set_cat_value(elem){
-		var v = elem.find('input:first').val(),
-			lis = elem.find('li:not(.hidden-item):not(.disabled)'),
-			el,
-			str = '';
-		v = v.split(',');
-		for(var i=0,il=v.length;i<il;i++){
-			str += (str == ''?'':',')+'a[data-value="'+v[i]+'"]';
-		}
-		el = lis.find(str);
-		if(el.length == 0){
-			el = lis.filter(':first');
-		}
-		el.trigger('click');
-	}
-
-	function set_map_to_fields(elem,v,item_id){
-		var to = elem.find('#gc_import_to_'+item_id),
-			to_val = to.find('input').val(),
-			m = $('#gc_fields_'+item_id+' div.gc_field_map')
-			text1 = 'attachment', text2 = 'normal';
-		if(v == 'attachment'){
-			text1 = 'normal';
-			text2 = 'attachment';
-		}
-		m.each(function(){
-			var selector = '[data-acf-post-types*="|'+v+'|"][data-acf-post-ids*="|'+to_val+'|"]'+(to_val!='0'?',[data-acf-post-ids*="|'+to_val+'|"]':'');
-			$(this).find('li.acf-row').filter(':not('+selector+')')
-				.hide().addClass('hidden-item')
-			.end().filter(selector)
-				.show().removeClass('hidden-item');
-			$(this).find('li:not(.acf-row)').filter('[data-post-type*="|'+text1+'|"],:not([data-post-type*="|'+v+'|"])')
-				.hide().addClass('hidden-item')
-			.end().filter('[data-post-type="all"],[data-post-type*="|'+text2+'|"],[data-post-type*="|'+v+'|"]')
-				.show().removeClass('hidden-item');
-			set_value($(this),true);
-		});
-	};
-
-	function set_value(elem,map_field){
-		map_field = map_field || false;
-		var v = elem.find('input:first').val(),
-			el = elem.find('li:not(.hidden-item) a[data-value="'+v+'"]:first');
-
-		var is_parent = false;
-
-		if(typeof elem.attr('id') != 'undefined') {
-			if(elem.attr('id').indexOf('gc_parent_') === 0) {
-				is_parent = true;
-			}
-		}
-
-		if(map_field){
-			if(elem.find('input.acf-field').val() != ''){
-				el = elem.find('li:not(.hidden-item) a.acf-field[data-value="'+v+'"]:first');
-				if(el.length == 0){
-					el = elem.find('li:not(.hidden-item) a[data-value="'+v+'"]:first');
-				}
-			}
-		}
-
-		if(elem.not(':visible') && !is_parent){
-			elem.find('input:first').val('');
-		}
-		if(el.length == 0){
-			el = elem.find('li:not(.hidden-item) a:first');
-		}
-		el.trigger('click');
-	};
-
-	function repeat_config($t){
-		var c = $t.closest('tr'),
-			item_id = c.attr('data-item-id'),
-			table = $('#gc_items'),
-			rows = table.find('.gc_table_row[data-item-id]'),
-			idx = rows.index(c),
-			field_rows = c.find('.gc_settings_field').removeClass('moved not-moved'),
-			fields = {},
-			import_as = $('#gc_import_as_'+item_id+' input').val();
-		rows = rows.filter(':gt('+idx+')');
-		field_rows.each(function(){
-			var $t = $(this).removeClass('not-moved'),
-				id = $t.attr('id').split('_')[2];
-			fields[field_rows.index($t)] = [$t.find('.gc_field_map input[name*="map_to"]').val(),id];
-		});
-
-		rows.each(function(){
-			var $t = $(this),
-				item_id = $t.attr('data-item-id'),
-				c = $('#gc_fields_'+item_id);
-
-			if(!$('#gc_repeat_'+item_id).is(':checked')){
-				c.find('> .gc_settings_field').removeClass('moved').addClass('not-moved');
-				$('#gc_import_as_'+item_id+' a[data-value="'+import_as+'"]').trigger('click');
-				for(var i in fields){
-					if(fields.hasOwnProperty(i)){
-						$('#gc_field_map_'+item_id+'_'+fields[i][1]+' li:not(.hidden-item) a[data-value="'+fields[i][0]+'"]').trigger('click');
-						var field = $('#field_'+item_id+'_'+fields[i][1]).removeClass('not-moved').addClass('moved');
-						if(i > 0){
-							c.find('> .gc_settings_field:eq('+(i-1)+')').after(field);
-						} else {
-							c.prepend(field);
-						}
-					}
-				};
-			} else {
-				return false;
-			}
-		});
-		$('.gc_overlay,.gc_repeating_modal').hide();
-	};
-
-	var save = {
-		"total": 0,
-		"cur_counter": 0,
-		"els": null,
-		"waiting": null,
-		"progressbar": null,
-		"title": null,
-		"cur_retry": 0
-	};
-
-	function reset_submit_button(){
-		$('.gc_ajax_submit_button').removeClass('btn-wait').addClass('btn-success').find('span').text(submit_text);
-	};
-
-	function submit_item_import(e){
-		e.preventDefault();
-		save.els = $('#gc_items td.gc_checkbox :checkbox:checked');
-		save.total = save.els.length;
-		save.cur_counter = 0;
-		save.waiting = $('.gc_importing_modal img');
-		save.progressbar = $('#current_item .bar');
-		save.title = $('#gc_item_title');
-		if(save.total > 0){
-			$('.gc_overlay,.gc_importing_modal').show();
-			save_item();
-		}
-		return false;
-	};
-
-	function save_item(){
-		$.ajax({
-			url: ajaxurl,
-			data: get_item_data(save.els.filter(':eq('+save.cur_counter+')')),
-			dataType: 'json',
-			type: 'POST',
-			timeout: 120000,
-			beforeSend: function(){
-				save.waiting.show();
-			},
-			error: function(){
-				save.waiting.hide();
-				if(save.cur_retry == 0){
-					save.cur_retry++;
-					save_item();
-				} else {
-					reset_submit_button();
-					$('.gc_overlay,.gc_importing_modal').hide();
-				}
-			},
-			success: function(data){
-				save.waiting.hide();
-				if(typeof data.error != 'undefined'){
-					save.cur_retry++;
-					alert(data.error);
-					reset_submit_button();
-					$('.gc_overlay,.gc_importing_modal').hide();
-				}
-				if(typeof data.success != 'undefined'){
-					save.cur_retry--;
-					if(typeof data.new_item_html != 'undefined') {
-
-						$('#gc_items tr[data-parent-id="'+data.item_id+'"]').each(function(){
-							var el = $('#gc_parent_'+$(this).attr('data-item-id')),
-								input = el.find('input');
-
-							if($(this).find('a[data-value="'+data.new_item_id+'"]').length == 0)
-							{
-								el.find('ul').append(data.new_item_html);
-							}
-							if(input.val() == '_imported_item_') {
-								input.val(data.new_item_id);
-								set_value(el);
-							}
-						});
-					}
-					save.cur_retry = 0;
-					save.cur_counter++;
-					save.progressbar.css('width',data.item_percent+'%');
-					if(save.cur_counter == save.total){
-						setTimeout(function(){
-							window.location.href = redirect_url[data.redirect_url];
-						},1000);
-					} else {
-						setTimeout(save_item,1000);
-					}
-				}
-			}
-		});
-	};
-
-	function get_item_data($t){
-		var tr = $t.closest('tr'),
-			title = tr.find('td.gc_itemname label').text(),
-			item_id = $t.val(),
-			settings = $('#gc_fields_'+item_id),
-			data = {
-				"_wpnonce": $('#_wpnonce').val(),
-				"action": "gathercontent_import_item",
-				"cur_retry": save.cur_retry,
-				"cur_counter": save.cur_counter,
-				"total": save.total
-			},
-			title_text = title;
-		if(title_text.length > 30){
-			title_text = title_text.substring(0,27)+'...';
-		}
-		save.title.attr('title',title).text(title_text);
-		if(settings.length > 0){
-			data.gc = {
-				"item_id": item_id,
-				"post_type": $('#gc_import_as_'+item_id+' input').val(),
-				"overwrite": $('#gc_import_to_'+item_id+' input').val(),
-				"category": $('#gc_category_'+item_id+' input').val(),
-				"parent_id": $('#gc_parent_'+item_id+' input').val(),
-				"state": $('#gc_state_'+item_id+' input').val(),
-				"format": $('#gc_format_'+item_id+' input').val(),
-				"fields": []
-			};
-			settings.find('> .gc_settings_field').each(function(){
-				var $t = $(this),
-					input = $t.find('> input'),
-					map_to = $t.find('> .gc_field_map input'),
-					field = {
-						"field_tab": input.filter('[name^="gc[field_tab]"]').val(),
-						"field_name": input.filter('[name^="gc[field_name]"]').val(),
-						"map_to": map_to.filter('[name^="gc[map_to]"]').val(),
-						"acf": map_to.filter('.acf-field').val(),
-						"acf_post": map_to.filter('.acf-post').val()
-					};
-				data.gc.fields.push(field);
-			});
-		}
-		return data;
-	};
-
-	jQuery.expr[":"].icontains_searchable = jQuery.expr.createPseudo(function(arg) {
-		return function( elem ) {
-			return jQuery(elem).attr('data-search').toUpperCase().indexOf(arg.toUpperCase()) >= 0;
-		};
-	});
-})(jQuery);
diff --git a/js/main.js b/js/main.js
deleted file mode 100644
index 42f7a972..00000000
--- a/js/main.js
+++ /dev/null
@@ -1,73 +0,0 @@
-;(function($){
-	var itemlist, itemlist_c;
-	$(document).ready(function() {
-		$('.gc_ajax_submit_button').click(function() {
-			$('.gc_ajax_submit_button').addClass('btn-wait').removeClass('btn-success').find('img').show().end().find('span').text('Please wait...');
-		});
-		$('.gc-ajax-tooltip').tooltip().click(function(e){
-			e.preventDefault();
-			return false;
-		});
-		$('#toggle_all').change(function(){
-			var checked = $(this).is(':checked');
-			$('.gc_checkbox :checkbox').attr('checked',false).filter(':visible').attr('checked',checked).trigger('change');
-		});
-		$('.gc_search_items .gc_right .dropdown-menu a').click(function(e){
-			e.preventDefault();
-			if($(this).attr('data-custom-state-name') == 'All'){
-				$('table tbody tr:not(:visible)').show();
-			} else {
-				var selector = '[data-item-state="'+$(this).attr('data-custom-state-id')+'"]';
-				$('table tbody tr').filter(':not('+selector+')').hide().end().filter(selector).show();
-			}
-			$(this).closest('.btn-group').find('> a span:first').text($(this).attr('data-custom-state-name'));
-		});
-		$('#gc_live_filter').keyup(function(){
-			var v = $.trim($(this).val()), items = $('table tbody tr');
-			if(!v || v == ''){
-				items.show();
-			} else {
-				v = v.toLowerCase();
-				items.find('.gc_itemname label').each(function(){
-					var e = $(this), t = e.text().toLowerCase(),
-						show = (t.indexOf(v) > -1), func = (show?'show':'hide');
-					e.closest('tr')[func]();
-				});
-			}
-		}).change(function(){$(this).trigger('keyup')});
-
-		itemlist = $('.gc_itemlist tr td');
-		itemlist_c = $('#gc_itemlist_container');
-		itemlist.click(function(e){
-			if(!$(e.target).is(':checkbox,label')){
-				var el = $(this).closest('tr').find(':checkbox');
-				el.attr('checked',(el.is(':checked')?false:true)).trigger('change');
-			}
-		});
-
-		itemlist.find(':checkbox').change(function(){
-			var el = $(this).closest('tr'),
-				checked = $(this).is(':checked');
-			el[(checked?'addClass':'removeClass')]('checked');
-			show_hide((itemlist.find(':checkbox:checked').length > 0));
-		}).trigger('change');
-	});
-
-	function show_hide(show){
-		if(!show && itemlist_c.hasClass('checked')){
-			itemlist_c.removeClass('checked')
-				.find('.gc_subfooter').slideUp('fast').fadeOut('fast').end()
-				.find('.gc_search_items button').animate({
-					'opacity': 0,
-					'width': 'hide'
-				},400);
-		} else if(show && !itemlist_c.hasClass('checked')){
-			itemlist_c.addClass('checked')
-				.find('.gc_subfooter').slideDown('fast').fadeIn('fast').end()
-				.find('.gc_search_items button').animate({
-					'opacity': 1,
-					'width': 'show'
-				},400);
-		}
-	};
-})(jQuery);
diff --git a/js/media.js b/js/media.js
deleted file mode 100644
index b39a03b0..00000000
--- a/js/media.js
+++ /dev/null
@@ -1,64 +0,0 @@
-;(function($){
-	var progressbar1, progressbar2, cur_num = 1, cur_total = 1, cur_retry = 0, title;
-	$(document).ready(function(){
-		progressbar1 = $('#current_item .bar');
-		progressbar2 = $('#overall_files .bar');
-		waiting = $('#gc_media img');
-
-		title = $('#gc_item_title');
-
-		get_image();
-	});
-	function get_image(){
-		$.ajax({
-			url: ajaxurl,
-			data: {
-				'_wpnonce': $('#_wpnonce').val(),
-				'action': 'gathercontent_download_media',
-				'cur_num': cur_num,
-				'cur_total': cur_total,
-				'cur_retry': cur_retry
-			},
-			dataType: 'json',
-			timeout: 120000,
-			beforeSend: function(){
-				waiting.show();
-			},
-			error: function(){
-				waiting.hide();
-				get_image();
-			},
-			success: function(data){
-				waiting.hide();
-				if(typeof data.error != 'undefined'){
-					alert(data.error);
-				}
-				if(typeof data.success != 'undefined'){
-					cur_retry = 0;
-					if(typeof data.retry != 'undefined'){
-						cur_retry = cur_retry++;
-						setTimeout(get_image,1000);
-					} else {
-						progressbar1.css('width',data.item_percent+'%');
-						progressbar2.css('width',data.overall_percent+'%');
-						cur_num = data.cur_num;
-						cur_total = data.cur_total;
-						if(data.item_percent == '100' && data.overall_percent != '100'){
-							setTimeout(function(){
-								progressbar1.css('width','0%');
-								title.html(data.item_title).attr('title',data.original_title);
-							},1000);
-						}
-						if(data.overall_percent == '100'){
-							setTimeout(function(){
-								window.location.href = redirect_url;
-							},1000);
-						} else {
-							setTimeout(get_image,1000);
-						}
-					}
-				}
-			}
-		});
-	};
-})(jQuery);
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..39bafb1a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "gathercontent-importer",
+  "title": "GatherContent Importer",
+  "description": "Imports items from GatherContent to your wordpress site",
+  "version": "3.0.0",
+  "homepage": "http://www.gathercontent.com",
+  "repository": {
+    "type": "git",
+    "url": ""
+  },
+  "author": {
+    "name": "GatherContent",
+    "email": "support@gathercontent.com",
+    "url": "http://www.gathercontent.com"
+  },
+  "devDependencies": {
+    "grunt": "^0.4.5",
+    "grunt-contrib-concat": "^0.5.1",
+    "grunt-contrib-uglify": "^0.9.1",
+    "grunt-sass": "^1.0.0",
+    "autoprefixer": "^6.0.0",
+    "grunt-postcss": "^0.6.0",
+    "grunt-contrib-cssmin": "^0.12.3",
+    "grunt-contrib-jshint": "^0.11.2",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-contrib-clean": "^0.6.0",
+    "grunt-contrib-copy": "^0.8.0",
+    "grunt-contrib-compress": "^0.13.0",
+    "grunt-phpunit": "^0.3.6",
+    "load-grunt-config": "~0.17.2",
+    "load-grunt-tasks": "^3.3.0",
+    "glob": "~5.0.15",
+    "grunt-wp-readme-to-markdown": "^0.9.0",
+	"chai": "^3.5.0",
+    "grunt-mocha": "^1.0.0"
+  },
+  "keywords": []
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 00000000..a444c41d
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,21 @@
+<phpunit
+	bootstrap="bootstrap.php.dist"
+	backupGlobals="false"
+	processIsolation="false"
+	colors="false">
+	<testsuites>
+		<testsuite name="Default">
+			<directory suffix="Tests.php">./tests/phpunit</directory>
+		</testsuite>
+	</testsuites>
+	<filter>
+		<whitelist>
+			<directory suffix=".php">./includes</directory>
+		</whitelist>
+	</filter>
+	<php>
+		<ini name="error_reporting" value="32767" />
+		<ini name="display_errors" value="1" />
+		<ini name="display_startup_errors" value="1" />
+	</php>
+</phpunit>
diff --git a/readme.txt b/readme.txt
index a78a977d..2a965777 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,11 +1,12 @@
-=== GatherContent Import ===
-Contributors: Mathew Chapman, namshee
-Tags: structured content, gather content, gathercontent, import, migrate, export, mapping, production, writing, collaboration, platform, connect, link, gather, client, word, production
-Requires at least: 3.5.0
-Tested up to: 4.4
-Stable tag: 2.6.47
-License: GPLv2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+=== GatherContent Importer ===
+Contributors:      gathercontent, mathew-chapman, namshee, justinsainton, jtsternberg
+Donate link:       http://www.gathercontent.com
+Tags               structured content, gather content, gathercontent, import, migrate, export, mapping, production, writing, collaboration, platform, connect, link, gather, client, word, production
+Requires at least: 3.8
+Tested up to:      4.5
+Stable tag:        2.6.47
+License:           GPL-2.0+
+License URI:       https://opensource.org/licenses/GPL-2.0
 
 The GatherContent Import plugin allows you to quickly import structured content from your GatherContent projects into your WordPress site.
 
@@ -30,8 +31,10 @@ This section describes how to install the plugin and get it working.
 3. Click on the menu item "GatherContent"
 3. Link your accounts. You will need to enter your GatherContent account URL (e.g. http://mywebsite.gathercontent.com) and your personal GatherContent Legacy API key. You can find your Legacy API key in your Settings area within GatherContent, by opening the Legacy API tab.
 
-== Screenshots ==
+== Frequently Asked Questions ==
+
 
+== Screenshots ==
 1. Quickly find your items using filters and live search.
 2. Import GatherContent items as Pages, Posts, Media and various Custom Post Types.
 3. Map individual fields to a huge range of places in WordPress.
diff --git a/tasks/_template.js b/tasks/_template.js
new file mode 100644
index 00000000..e0ea49a9
--- /dev/null
+++ b/tasks/_template.js
@@ -0,0 +1,3 @@
+module.exports = function (grunt) {
+	//grunt tasks here
+};
\ No newline at end of file
diff --git a/tasks/build.js b/tasks/build.js
new file mode 100644
index 00000000..8ce0b445
--- /dev/null
+++ b/tasks/build.js
@@ -0,0 +1,3 @@
+module.exports = function (grunt) {
+	grunt.registerTask( 'build', ['default', 'clean', 'copy', 'compress'] );
+};
\ No newline at end of file
diff --git a/tasks/css.js b/tasks/css.js
new file mode 100644
index 00000000..79ecfa1d
--- /dev/null
+++ b/tasks/css.js
@@ -0,0 +1,3 @@
+module.exports = function (grunt) {
+	grunt.registerTask( 'css', ['sass', 'postcss', 'cssmin'] );
+};
\ No newline at end of file
diff --git a/tasks/default.js b/tasks/default.js
new file mode 100644
index 00000000..72bbdffb
--- /dev/null
+++ b/tasks/default.js
@@ -0,0 +1,3 @@
+module.exports = function (grunt) {
+	grunt.registerTask( 'default', ['css', 'js'] );
+};
\ No newline at end of file
diff --git a/tasks/js.js b/tasks/js.js
new file mode 100644
index 00000000..df47d63f
--- /dev/null
+++ b/tasks/js.js
@@ -0,0 +1,3 @@
+module.exports = function (grunt) {
+	grunt.registerTask( 'js', ['jshint', 'concat', 'uglify'] );
+};
\ No newline at end of file
diff --git a/tasks/options/_template.js b/tasks/options/_template.js
new file mode 100644
index 00000000..1e95e9b6
--- /dev/null
+++ b/tasks/options/_template.js
@@ -0,0 +1,3 @@
+module.exports = {
+	// options go here
+};
\ No newline at end of file
diff --git a/tasks/options/clean.js b/tasks/options/clean.js
new file mode 100644
index 00000000..6f1e3e4e
--- /dev/null
+++ b/tasks/options/clean.js
@@ -0,0 +1,3 @@
+module.exports = {
+	main: ['release/<%= pkg.version %>']
+};
\ No newline at end of file
diff --git a/tasks/options/compress.js b/tasks/options/compress.js
new file mode 100644
index 00000000..3e101fd6
--- /dev/null
+++ b/tasks/options/compress.js
@@ -0,0 +1,12 @@
+module.exports = {
+	main: {
+		options: {
+			mode: 'zip',
+			archive: './release/gathercontent.<%= pkg.version %>.zip'
+		},
+		expand: true,
+		cwd: 'release/<%= pkg.version %>/',
+		src: ['**/*'],
+		dest: 'gathercontent/'
+	}
+};
\ No newline at end of file
diff --git a/tasks/options/concat.js b/tasks/options/concat.js
new file mode 100644
index 00000000..37597331
--- /dev/null
+++ b/tasks/options/concat.js
@@ -0,0 +1,16 @@
+module.exports = {
+	options: {
+		stripBanners: true,
+			banner: '/*! <%= pkg.title %> - v<%= pkg.version %>\n' +
+		' * <%= pkg.homepage %>\n' +
+		' * Copyright (c) <%= grunt.template.today("yyyy") %>;' +
+			}' * Licensed GPL-2.0+' +
+		' */\n'
+	},
+	main: {
+		src: [
+			'assets/js/src/gathercontent-importer.js'
+		],
+			dest: 'assets/js/gathercontent-importer.js'
+	}
+};
\ No newline at end of file
diff --git a/tasks/options/copy.js b/tasks/options/copy.js
new file mode 100644
index 00000000..7f6ed819
--- /dev/null
+++ b/tasks/options/copy.js
@@ -0,0 +1,28 @@
+module.exports = {
+	// Copy the theme to a versioned release directory
+	main: {
+		expand: true,
+		src:  [
+			'**',
+			'!**/.*',
+			'!**/readme.md',
+			'!node_modules/**',
+			'!vendor/**',
+			'!tests/**',
+			'!release/**',
+			'!assets/css/sass/**',
+			'!assets/css/src/**',
+			'!assets/js/src/**',
+			'!images/src/**',
+			'!bootstrap.php',
+			'!bower.json',
+			'!composer.json',
+			'!composer.lock',
+			'!Gruntfile.js',
+			'!package.json',
+			'!phpunit.xml',
+			'!phpunit.xml.dist'
+		],
+		dest: 'release/<%= pkg.version %>/'
+	}
+};
\ No newline at end of file
diff --git a/tasks/options/cssmin.js b/tasks/options/cssmin.js
new file mode 100644
index 00000000..7c9dcc34
--- /dev/null
+++ b/tasks/options/cssmin.js
@@ -0,0 +1,18 @@
+module.exports = {
+	options: {
+		banner: '/*! <%= pkg.title %> - v<%= pkg.version %>\n' +
+		' * <%=pkg.homepage %>\n' +
+		' * Copyright (c) <%= grunt.template.today("yyyy") %>;' +
+		}' * Licensed GPL-2.0+' +
+		' */\n'
+	},
+	minify: {
+		expand: true,
+
+		cwd: 'assets/css/',
+		src: ['gathercontent-importer.css'],
+
+		dest: 'assets/css/',
+		ext: '.min.css'
+	}
+};
\ No newline at end of file
diff --git a/tasks/options/jshint.js b/tasks/options/jshint.js
new file mode 100644
index 00000000..30ea9acd
--- /dev/null
+++ b/tasks/options/jshint.js
@@ -0,0 +1,7 @@
+module.exports = {
+	all: [
+		'Gruntfile.js',
+		'assets/js/src/**/*.js',
+		'assets/js/test/**/*.js'
+	]
+};
\ No newline at end of file
diff --git a/tasks/options/mocha.js b/tasks/options/mocha.js
new file mode 100644
index 00000000..760c85e8
--- /dev/null
+++ b/tasks/options/mocha.js
@@ -0,0 +1,11 @@
+var mochaPath = 'tests/mocha/';
+
+module.exports = {
+	test: {
+		src: [ mochaPath + '**/*.html' ],
+		options: {
+			run: true,
+			timeout: 10000
+		}
+	}
+};
diff --git a/tasks/options/phpunit.js b/tasks/options/phpunit.js
new file mode 100644
index 00000000..7209c877
--- /dev/null
+++ b/tasks/options/phpunit.js
@@ -0,0 +1,11 @@
+module.exports = {
+	classes: {
+		dir: 'tests/phpunit/'
+	},
+	options: {
+		bin: 'vendor/bin/phpunit',
+		bootstrap: 'bootstrap.php.dist',
+		colors: true,
+		testSuffix: 'Tests.php'
+	}
+};
\ No newline at end of file
diff --git a/tasks/options/postcss.js b/tasks/options/postcss.js
new file mode 100644
index 00000000..b0501206
--- /dev/null
+++ b/tasks/options/postcss.js
@@ -0,0 +1,12 @@
+module.exports = {
+	dist: {
+		options: {
+			processors: [
+				require('autoprefixer')({browsers: 'last 2 versions'})
+			]
+		},
+		files: { 
+			'assets/css/gathercontent-importer.css': [ 'assets/css/gathercontent-importer.css' ]
+		}
+	}
+};
\ No newline at end of file
diff --git a/tasks/options/sass.js b/tasks/options/sass.js
new file mode 100644
index 00000000..67621d35
--- /dev/null
+++ b/tasks/options/sass.js
@@ -0,0 +1,11 @@
+module.exports = {
+	all: {
+		options: {
+			precision: 2,
+			sourceMap: true
+		},
+		files: {
+			'assets/css/gathercontent-importer.css': 'assets/css/sass/gathercontent-importer.scss'
+		}
+	}
+};
\ No newline at end of file
diff --git a/tasks/options/uglify.js b/tasks/options/uglify.js
new file mode 100644
index 00000000..99125982
--- /dev/null
+++ b/tasks/options/uglify.js
@@ -0,0 +1,17 @@
+module.exports = {
+	all: {
+		files: {
+			'assets/js/gathercontent-importer.min.js': ['assets/js/gathercontent-importer.js']
+		},
+		options: {
+			banner: '/*! <%= pkg.title %> - v<%= pkg.version %>\n' +
+			' * <%= pkg.homepage %>\n' +
+			' * Copyright (c) <%= grunt.template.today("yyyy") %>;' +
+			}' * Licensed GPL-2.0+' +
+			' */\n',
+			mangle: {
+				except: ['jQuery']
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/tasks/options/watch.js b/tasks/options/watch.js
new file mode 100644
index 00000000..d95fdbc7
--- /dev/null
+++ b/tasks/options/watch.js
@@ -0,0 +1,22 @@
+module.exports = {
+	livereload: {
+		files: ['assets/css/*.css'],
+		options: {
+			livereload: true
+		}
+	},
+	css: {
+		files: ['assets/css/sass/**/*.scss'],
+		tasks: ['css'],
+		options: {
+			debounceDelay: 500
+		}
+	},
+	js: {
+		files: ['assets/js/src/**/*.js', 'assets/js/vendor/**/*.js'],
+			tasks: ['js'],
+			options: {
+			debounceDelay: 500
+		}
+	}
+};
diff --git a/tasks/test.js b/tasks/test.js
new file mode 100644
index 00000000..a92c7e3d
--- /dev/null
+++ b/tasks/test.js
@@ -0,0 +1,3 @@
+module.exports = function (grunt) {
+	grunt.registerTask( 'test', ['phpunit', 'mocha'] );
+};
diff --git a/tests/mocha/gathercontent-importer.html b/tests/mocha/gathercontent-importer.html
new file mode 100644
index 00000000..3e73202e
--- /dev/null
+++ b/tests/mocha/gathercontent-importer.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Mocha Tests</title>
+		<!-- Mocha styles -->
+		<link rel="stylesheet" href="../../node_modules/mocha/mocha.css">
+	</head>
+	<body>
+		<div id="mocha"></div>
+		<!-- Mocha Scripts -->
+		<script src="../../node_modules/mocha/mocha.js"></script>
+		<!-- Chai Scripts -->
+		<script src="../../node_modules/chai/chai.js"></script>
+		<script>
+			mocha.setup( 'bdd' );
+		</script>
+
+    	<!-- test HTML here-->
+
+    	<!-- links to test files here -->
+		<script src="tests/gathercontent-importer.js"></script>
+		<!-- run mocha after all test are loaded -->
+		<script type="text/javascript" charset="utf-8">
+			mocha.run();
+		</script>
+	</body>
+</html>
diff --git a/tests/mocha/tests/gathercontent-importer.js b/tests/mocha/tests/gathercontent-importer.js
new file mode 100644
index 00000000..78a4e766
--- /dev/null
+++ b/tests/mocha/tests/gathercontent-importer.js
@@ -0,0 +1,9 @@
+var assert = chai.assert;
+
+describe( 'Array', function() {
+	it( 'should start empty', function() {
+		var arr = [];
+
+		assert.equal( arr.length, 0 );
+	} );
+} );
diff --git a/tests/phpunit/Core_Tests.php b/tests/phpunit/Core_Tests.php
new file mode 100644
index 00000000..8e3dcb1e
--- /dev/null
+++ b/tests/phpunit/Core_Tests.php
@@ -0,0 +1,113 @@
+<?php
+namespace TenUp\GatherContentImporter\Core;
+
+/**
+ * This is a very basic test case to get things started. You should probably rename this and make
+ * it work for your project. You can use all the tools provided by WP Mock and Mockery to create
+ * your tests. Coverage is calculated against your includes/ folder, so try to keep all of your
+ * functional code self contained in there.
+ *
+ * References:
+ *   - http://phpunit.de/manual/current/en/index.html
+ *   - https://github.com/padraic/mockery
+ *   - https://github.com/10up/wp_mock
+ */
+
+use TenUp\GatherContentImporter as Base;
+
+class Core_Tests extends Base\TestCase {
+
+	protected $testFiles = [
+		'functions/core.php'
+	];
+
+	/** 
+	 * Test load method.
+	 */
+	public function test_setup() {
+		// Setup
+		\WP_Mock::expectActionAdded( 'init', 'TenUp\GatherContentImporter\Core\i18n' );
+		\WP_Mock::expectActionAdded( 'init', 'TenUp\GatherContentImporter\Core\init' );
+		\WP_Mock::expectAction( 'gathercontent_loaded' );
+
+		// Act
+		setup();
+
+		// Verify
+		$this->assertConditionsMet();
+	}
+
+	/**
+	 * Test internationalization integration.
+	 */
+	public function test_i18n() {
+		// Setup
+		\WP_Mock::wpFunction( 'get_locale', array(
+			'times' => 1,
+			'args' => array(),
+			'return' => 'en_US',
+		) );
+		\WP_Mock::onFilter( 'plugin_locale' )->with( 'en_US', 'gathercontent' )->reply( 'en_US' );
+		\WP_Mock::wpFunction( 'load_textdomain', array(
+			'times' => 1,
+			'args' => array( 'gathercontent', 'lang_dir/gathercontent/gathercontent-en_US.mo' ),
+		) );
+		\WP_Mock::wpFunction( 'plugin_basename', array(
+			'times' => 1,
+			'args' => array( 'path' ),
+			'return' => 'path',
+		) );
+		\WP_Mock::wpFunction( 'load_plugin_textdomain', array(
+			'times' => 1,
+			'args' => array( 'gathercontent', false, 'path/languages/' ),
+		) );
+
+		// Act
+		i18n();
+
+		// Verify
+		$this->assertConditionsMet();
+	}
+
+	/** 
+	 * Test initialization method.
+	 */
+	public function test_init() {
+		// Setup
+		\WP_Mock::expectAction( 'gathercontent_init' );
+
+		// Act
+		init();
+
+		// Verify
+		$this->assertConditionsMet();
+	}
+
+	/** 
+	 * Test activation routine.
+	 */
+	public function test_activate() {
+		// Setup
+		\WP_Mock::wpFunction( 'flush_rewrite_rules', array(
+			'times' => 1
+		) );
+
+		// Act
+		activate();
+
+		// Verify
+		$this->assertConditionsMet();
+	}
+
+	/** 
+	 * Test deactivation routine.
+	 */
+	public function test_deactivate() {
+		// Setup
+
+		// Act
+		deactivate();
+
+		// Verify
+	}
+}
\ No newline at end of file
diff --git a/tests/phpunit/test-tools/TestCase.php b/tests/phpunit/test-tools/TestCase.php
new file mode 100644
index 00000000..44b2674b
--- /dev/null
+++ b/tests/phpunit/test-tools/TestCase.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace TenUp\GatherContentImporter;
+
+use PHPUnit_Framework_TestResult;
+use Text_Template;
+use WP_Mock;
+use WP_Mock\Tools\TestCase as BaseTestCase;
+
+class TestCase extends BaseTestCase {
+	public function run( PHPUnit_Framework_TestResult $result = null ) {
+		$this->setPreserveGlobalState( false );
+		return parent::run( $result );
+	}
+
+	protected $testFiles = array();
+
+	public function setUp() {
+		if ( ! empty( $this->testFiles ) ) {
+			foreach ( $this->testFiles as $file ) {
+				if ( file_exists( PROJECT . $file ) ) {
+					require_once( PROJECT . $file );
+				}
+			}
+		}
+
+		parent::setUp();
+	}
+
+	public function assertActionsCalled() {
+		$actions_not_added = $expected_actions = 0;
+		try {
+			WP_Mock::assertActionsCalled();
+		} catch ( \Exception $e ) {
+			$actions_not_added = 1;
+			$expected_actions  = $e->getMessage();
+		}
+		$this->assertEmpty( $actions_not_added, $expected_actions );
+	}
+
+	public function ns( $function ) {
+		if ( ! is_string( $function ) || false !== strpos( $function, '\\' ) ) {
+			return $function;
+		}
+
+		$thisClassName = trim( get_class( $this ), '\\' );
+
+		if ( ! strpos( $thisClassName, '\\' ) ) {
+			return $function;
+		}
+
+		// $thisNamespace is constructed by exploding the current class name on
+		// namespace separators, running array_slice on that array starting at 0
+		// and ending one element from the end (chops the class name off) and
+		// imploding that using namespace separators as the glue.
+		$thisNamespace = implode( '\\', array_slice( explode( '\\', $thisClassName ), 0, - 1 ) );
+
+		return "$thisNamespace\\$function";
+	}
+
+	/**
+	 * Define constants after requires/includes
+	 *
+	 * See http://kpayne.me/2012/07/02/phpunit-process-isolation-and-constant-already-defined/
+	 * for more details
+	 *
+	 * @param \Text_Template $template
+	 */
+	public function prepareTemplate( \Text_Template $template ) {
+		$template->setVar( [
+			'globals' => '$GLOBALS[\'__PHPUNIT_BOOTSTRAP\'] = \'' . $GLOBALS['__PHPUNIT_BOOTSTRAP'] . '\';',
+		] );
+		parent::prepareTemplate( $template );
+	}
+}
\ No newline at end of file
diff --git a/view/curl-error.php b/view/curl-error.php
deleted file mode 100644
index 95c7965f..00000000
--- a/view/curl-error.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<h2 class="gc_logo"><span>GatherContent</span></h2>
-
-<div class="gc_container">
-	<div class="gc_container-header">
-		<h2><?php $this->_e( 'cURL not found' ) ?></h2>
-	</div>
-	<div class="curl_error">
-		<p><?php $this->_e( 'cURL was not found on your server. GatherContent requires cURL in order to connect to our services API. Please contact your host/webmaster to request they enable cURL.' ) ?></p>
-		<p><?php printf( $this->__( 'If you have cURL installed and are seeing this error, please contact %ssupport@gathercontent.com%s' ), '<a href="mailto:support@gathercontent.com">', '</a>' ) ?></p>
-	</div>
-</div>
diff --git a/view/finished.php b/view/finished.php
deleted file mode 100644
index 194aec5f..00000000
--- a/view/finished.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<h2 class="gc_logo"><span>GatherContent</span></h2>
-
-<div class="gc_container">
-	<div class="gc_container-header">
-		<h2><?php $this->_e( 'Success!' ) ?></h2>
-	</div>
-	<div class="gc_finished">
-		<p class="gc_message">
-			<?php $this->_e( 'All of your selected content has been imported.' ) ?>
-		</p>
-		<div class="gc_subfooter">
-			<a href="<?php $this->url( 'items' ) ?>" class="gc_blue_link"><?php $this->_e( 'Go back to project' ) ?></a>
-		</div>
-	</div>
-</div>
diff --git a/view/item-import.php b/view/item-import.php
deleted file mode 100644
index e67fd48e..00000000
--- a/view/item-import.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<h2 class="gc_logo"><span>GatherContent</span></h2>
-<?php
-if ( $this->error != '' ){
-	echo '<p class="gc_error">'.$this->error.'</p>';
-}
-?>
-<div class="gc_container gc_wide">
-	<div class="gc_overlay"></div>
-	<div class="gc_container gc_modal gc_importing_modal">
-		<h2><?php $this->_e( 'Importing items and text content...' ) ?></h2>
-		<label><?php $this->_e( 'Item:' ) ?> <span id="gc_item_title"></span><img src="<?php echo $this->plugin_url ?>img/ajax-loader-grey.gif" alt="" /></label>
-		<div id="current_item" class="progress">
-			<div class="bar" style="width:0%"></div>
-		</div>
-	</div>
-	<div class="gc_container gc_modal gc_repeating_modal">
-		<h2><?php $this->_e( 'Repeating configuration...' ) ?></h2>
-		<img src="<?php echo $this->plugin_url ?>img/ajax_loader_blue.gif" alt="" />
-	</div>
-	<div class="gc_container-header gc_cf">
-		<h2><?php $this->_e( 'Choose items to import' ) ?><a href="<?php $this->url( 'login' ) ?>" class="gc_blue_link gc_right"><?php $this->_e( 'Choose account' ) ?></a></h2>
-	</div>
-	<form action="<?php $this->url( 'item_import' ) ?>" method="post" id="gc_importer_step_items_import">
-		<div class="gc_main_content">
-			<div class="gc_search_items gc_cf">
-				<div class="gc_left">
-					<a href="<?php $this->url( 'items' ) ?>" class="gc_option"><?php $this->_e( 'Select different items' ) ?></a>
-				</div>
-				<div class="gc_right">
-					<?php $item_count > 0 && $this->get_submit_button( $this->__( 'Import selected items' ) ) ?>
-				</div>
-			</div>
-			<table class="gc_items" id="gc_items" cellspacing="0" cellpadding="0">
-				<thead>
-					<tr>
-						<th></th>
-						<th class="gc_th_item_name"><?php echo $this->__( 'Items' ); ?></th>
-						<th><input type="checkbox" id="toggle_all" checked="checked" /></th>
-					</tr>
-				</thead>
-				<tbody>
-					<?php echo $item_settings ?>
-				</tbody>
-			</table>
-		</div>
-		<div class="gc_subfooter gc_cf">
-			<div class="gc_right">
-				<?php $item_count > 0 && $this->get_submit_button( $this->__( 'Import selected items' ) ) ?>
-			</div>
-		</div>
-		<?php wp_nonce_field( $this->base_name ) ?>
-	</form>
-</div>
-<script type="text/javascript">
-var redirect_url = <?php
-echo json_encode(
-	array(
-		'media'        => $this->url( 'media', false ),
-		'finished'     => $this->url( 'finished', false )
-	)
-);
-?>;
-var hierarchical_post_types =  <?php echo json_encode( $this->hierarchical ); ?>;
-</script>
diff --git a/view/items.php b/view/items.php
deleted file mode 100644
index cbb09c33..00000000
--- a/view/items.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<h2 class="gc_logo"><span>GatherContent</span></h2>
-<?php
-if ( $this->error != '' ) {
-	echo '<p class="gc_error">' . $this->error . '</p>';
-}
-?>
-<div class="gc_container gc_wide" id="gc_itemlist_container">
-	<div class="gc_container-header">
-		<h2><?php $this->_e( 'Choose items to import' ) ?><a href="<?php $this->url( 'login' ) ?>" class="gc_blue_link gc_right"><?php $this->_e( 'Choose account' ) ?></a></h2>
-	</div>
-	<form action="<?php $this->url( 'items' ) ?>" method="post" id="gc_importer_step_items">
-		<div class="gc_main_content">
-			<div class="gc_search_items gc_cf">
-				<div class="gc_left">
-					<?php echo $projects_dropdown ?>
-				</div>
-				<div class="gc_right">
-					<?php echo $state_dropdown ?>
-					<input type="text" name="search" id="gc_live_filter" placeholder="<?php echo esc_attr( $this->__( 'Search...' ) ) ?>" />
-					<?php $item_count > 0 && $this->get_submit_button( $this->__( 'Configure selected items' ) ) ?>
-				</div>
-			</div>
-			<table class="gc_items gc_itemlist" cellspacing="0" cellpadding="0">
-				<thead>
-					<tr>
-						<th></th>
-						<th class="gc_th_item_name"><?php echo $this->__( 'Items' ); ?></th>
-						<th><input type="checkbox" id="toggle_all" /></th>
-					</tr>
-				</thead>
-				<tbody>
-					<?php echo $item_settings ?>
-				</tbody>
-			</table>
-		</div>
-		<div class="gc_subfooter gc_cf">
-			<div class="gc_right">
-				<?php $item_count > 0 && $this->get_submit_button( $this->__( 'Configure selected items' ) ) ?>
-			</div>
-		</div>
-		<?php wp_nonce_field( $this->base_name ) ?>
-	</form>
-</div>
diff --git a/view/login.php b/view/login.php
deleted file mode 100644
index 8a8bc09b..00000000
--- a/view/login.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2 class="gc_logo"><span>GatherContent</span></h2>
-
-<div class="gc_container">
-	<div class="gc_container-header">
-		<h2><?php $this->_e( 'Connect to your GatherContent account' ) ?></h2>
-	</div>
-	<form action="<?php $this->url( 'login' ) ?>" method="post" id="gc_importer_step_auth">
-		<div>
-			<label for="gc_api_url"><?php $this->_e( 'Your login URL' ) ?></label>
-			<span class="gc_domainprefix">https://</span>
-			<input type="text" name="gc[api_url]" id="gc_api_url" value="<?php echo esc_attr( $this->option( 'api_url' ) ) ?>" class="gc_api_url"/>
-			<span class="gc_domain">.gathercontent.com</span>
-		</div>
-		<div>
-			<label for="gc_api_key"><?php $this->_e( 'API Key' ) ?><a href="#" class="gc-ajax-tooltip" title="<?php esc_attr( $this->_e( 'You can find your unique API key inside your GatherContent account by going to Personal Settings and opening the Legacy API tab.' ) ) ?>"></a></label>
-			<input type="text" name="gc[api_key]" id="gc_api_key" value="<?php echo esc_attr( $this->option( 'api_key' ) ) ?>" />
-		</div>
-		<div class="gc_cf">
-			<?php $this->get_submit_button( $this->__( 'Connect account' ) ) ?>
-		</div>
-		<?php wp_nonce_field( $this->base_name ) ?>
-	</form>
-</div>
diff --git a/view/media.php b/view/media.php
deleted file mode 100644
index df8aa646..00000000
--- a/view/media.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<h2 class="gc_logo"><span>GatherContent</span></h2>
-
-<div class="gc_container">
-	<div class="gc_container-header">
-		<h2><?php $this->_e( 'Importing files' ) ?></h2>
-	</div>
-	<div id="gc_media">
-		<div class="alert alert-success">
-			<?php $this->_e( '<strong>Heads up!</strong> This process can take a while, it depends on how many files you have attached to your items. Just think how much time you\'re saving.' ) ?>
-		</div>
-		<label><?php $this->_e( 'Item:' ) ?> <span id="gc_item_title" title="<?php echo $original_title ?>"><?php echo $item_title ?></span><img src="<?php echo $this->plugin_url ?>img/ajax-loader-grey.gif" alt="" /></label>
-		<div id="current_item" class="progress">
-			<div class="bar" style="width:0%"></div>
-		</div>
-		<label><?php $this->_e( 'Overall Progress' ) ?></label>
-		<div id="overall_files" class="progress">
-			<div class="bar" style="width:0%"></div>
-		</div>
-		<div class="gc_center">
-			<a href="<?php $this->url( 'item_import' ) ?>" class="gc_blue_link"><?php $this->_e( 'Cancel' ) ?></a>
-		</div>
-		<?php wp_nonce_field( $this->base_name ) ?>
-	</div>
-</div>
-<script type="text/javascript">
-var redirect_url = '<?php $this->url( 'finished' ) ?>';
-</script>
diff --git a/view/projects.php b/view/projects.php
deleted file mode 100644
index 48d8813f..00000000
--- a/view/projects.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<h2 class="gc_logo"><span>GatherContent</span></h2>
-<?php
-if ( $this->error != '' ) {
-	echo '<p class="gc_error">'.$this->error.'</p>';
-}
-?>
-<div class="gc_container">
-	<div class="gc_container-header">
-		<h2><?php $this->_e( 'Choose a project to import content from' ) ?></h2>
-	</div>
-	<form action="<?php $this->url( 'projects' ) ?>" method="post" id="gc_importer_step_projects">
-		<?php if ( count( $projects ) > 0 ): ?>
-		<ul class="gc_list">
-		<?php foreach ( $projects as $id => $info ): $fieldid = 'gc_project_'.$id; ?>
-			<li>
-				<input type="radio" class="gc_radio" name="project_id" id="<?php echo $fieldid ?>" value="<?php echo $id ?>"<?php echo $current == $id ? ' checked="checked"':'' ?> />
-				<label for="<?php echo $fieldid ?>" class="gc_label"><?php echo $info['name'] ?> &mdash; <span class="item-count"><?php echo $info['item_count'].' item'.($info['item_count'] == '1'?'':'s') ?></span></label>
-			</li>
-		<?php endforeach ?>
-		</ul>
-		<?php else: ?>
-			<p class="gc_error"><?php $this->_e( 'No projects found' ) ?></p>
-		<?php endif ?>
-		<div class="gc_subfooter gc_cf">
-			<div class="gc_left">
-				<a href="<?php $this->url( 'login' ) ?>" class="gc_option"><?php $this->_e( 'Change account settings' ) ?></a>
-			</div>
-			<?php if( count( $projects ) > 0 ): ?>
-			<div class="gc_right">
-				<?php $this->get_submit_button( $this->__( 'Import content' ) ) ?>
-			</div>
-			<?php endif ?>
-		</div>
-		<?php wp_nonce_field( $this->base_name ) ?>
-	</form>
-</div>