diff --git a/gulpfile.js b/gulpfile.js
index f8836b40..38246080 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -13,8 +13,8 @@ var gulp = require('gulp'),
 gulp.task('composer', function() {
     del.sync([
         './composer',
-        './src/application/third_party/**/*',
-        '!./src/application/third_party/index.html',
+        './src/vendor/**/*',
+        '!./src/vendor/index.html',
     ]);
 
     exec('composer update && composer install --prefer-dist', function (err, stdout, stderr) {
@@ -30,7 +30,7 @@ gulp.task('composer', function() {
         '!composer/**/{*.yml,*.md}',
         '!composer/codeigniter{,/**}'
     ])
-        .pipe(gulp.dest('./src/application/third_party/'));
+        .pipe(gulp.dest('./src/vendor/'));
 });
 
 /**
diff --git a/src/index.php b/src/index.php
index 7046b933..9b6b86be 100644
--- a/src/index.php
+++ b/src/index.php
@@ -72,7 +72,7 @@
   *
   */
 
- require_once __DIR__ . '/application/third_party/autoload.php';
+ require_once __DIR__ . '/vendor/autoload.php';
 
 /*
  *---------------------------------------------------------------
diff --git a/src/application/third_party/autoload.php b/src/vendor/autoload.php
similarity index 100%
rename from src/application/third_party/autoload.php
rename to src/vendor/autoload.php
diff --git a/src/application/third_party/composer/ClassLoader.php b/src/vendor/composer/ClassLoader.php
similarity index 100%
rename from src/application/third_party/composer/ClassLoader.php
rename to src/vendor/composer/ClassLoader.php
diff --git a/src/application/third_party/composer/LICENSE b/src/vendor/composer/LICENSE
similarity index 100%
rename from src/application/third_party/composer/LICENSE
rename to src/vendor/composer/LICENSE
diff --git a/src/application/third_party/composer/autoload_classmap.php b/src/vendor/composer/autoload_classmap.php
similarity index 100%
rename from src/application/third_party/composer/autoload_classmap.php
rename to src/vendor/composer/autoload_classmap.php
diff --git a/src/application/third_party/composer/autoload_namespaces.php b/src/vendor/composer/autoload_namespaces.php
similarity index 100%
rename from src/application/third_party/composer/autoload_namespaces.php
rename to src/vendor/composer/autoload_namespaces.php
diff --git a/src/application/third_party/composer/autoload_psr4.php b/src/vendor/composer/autoload_psr4.php
similarity index 100%
rename from src/application/third_party/composer/autoload_psr4.php
rename to src/vendor/composer/autoload_psr4.php
diff --git a/src/application/third_party/composer/autoload_real.php b/src/vendor/composer/autoload_real.php
similarity index 100%
rename from src/application/third_party/composer/autoload_real.php
rename to src/vendor/composer/autoload_real.php
diff --git a/src/application/third_party/composer/installed.json b/src/vendor/composer/installed.json
similarity index 100%
rename from src/application/third_party/composer/installed.json
rename to src/vendor/composer/installed.json
diff --git a/src/application/third_party/gregwar/captcha/CaptchaBuilder.php b/src/vendor/gregwar/captcha/CaptchaBuilder.php
similarity index 100%
rename from src/application/third_party/gregwar/captcha/CaptchaBuilder.php
rename to src/vendor/gregwar/captcha/CaptchaBuilder.php
diff --git a/src/application/third_party/gregwar/captcha/CaptchaBuilderInterface.php b/src/vendor/gregwar/captcha/CaptchaBuilderInterface.php
similarity index 100%
rename from src/application/third_party/gregwar/captcha/CaptchaBuilderInterface.php
rename to src/vendor/gregwar/captcha/CaptchaBuilderInterface.php
diff --git a/src/application/third_party/gregwar/captcha/Font/captcha0.ttf b/src/vendor/gregwar/captcha/Font/captcha0.ttf
similarity index 100%
rename from src/application/third_party/gregwar/captcha/Font/captcha0.ttf
rename to src/vendor/gregwar/captcha/Font/captcha0.ttf
diff --git a/src/application/third_party/gregwar/captcha/Font/captcha1.ttf b/src/vendor/gregwar/captcha/Font/captcha1.ttf
similarity index 100%
rename from src/application/third_party/gregwar/captcha/Font/captcha1.ttf
rename to src/vendor/gregwar/captcha/Font/captcha1.ttf
diff --git a/src/application/third_party/gregwar/captcha/Font/captcha2.ttf b/src/vendor/gregwar/captcha/Font/captcha2.ttf
similarity index 100%
rename from src/application/third_party/gregwar/captcha/Font/captcha2.ttf
rename to src/vendor/gregwar/captcha/Font/captcha2.ttf
diff --git a/src/application/third_party/gregwar/captcha/Font/captcha3.ttf b/src/vendor/gregwar/captcha/Font/captcha3.ttf
similarity index 100%
rename from src/application/third_party/gregwar/captcha/Font/captcha3.ttf
rename to src/vendor/gregwar/captcha/Font/captcha3.ttf
diff --git a/src/application/third_party/gregwar/captcha/Font/captcha4.ttf b/src/vendor/gregwar/captcha/Font/captcha4.ttf
similarity index 100%
rename from src/application/third_party/gregwar/captcha/Font/captcha4.ttf
rename to src/vendor/gregwar/captcha/Font/captcha4.ttf
diff --git a/src/application/third_party/gregwar/captcha/Font/captcha5.ttf b/src/vendor/gregwar/captcha/Font/captcha5.ttf
similarity index 100%
rename from src/application/third_party/gregwar/captcha/Font/captcha5.ttf
rename to src/vendor/gregwar/captcha/Font/captcha5.ttf
diff --git a/src/application/third_party/gregwar/captcha/ImageFileHandler.php b/src/vendor/gregwar/captcha/ImageFileHandler.php
similarity index 100%
rename from src/application/third_party/gregwar/captcha/ImageFileHandler.php
rename to src/vendor/gregwar/captcha/ImageFileHandler.php
diff --git a/src/application/third_party/gregwar/captcha/LICENSE b/src/vendor/gregwar/captcha/LICENSE
similarity index 100%
rename from src/application/third_party/gregwar/captcha/LICENSE
rename to src/vendor/gregwar/captcha/LICENSE
diff --git a/src/application/third_party/gregwar/captcha/PhraseBuilder.php b/src/vendor/gregwar/captcha/PhraseBuilder.php
similarity index 100%
rename from src/application/third_party/gregwar/captcha/PhraseBuilder.php
rename to src/vendor/gregwar/captcha/PhraseBuilder.php
diff --git a/src/application/third_party/gregwar/captcha/PhraseBuilderInterface.php b/src/vendor/gregwar/captcha/PhraseBuilderInterface.php
similarity index 100%
rename from src/application/third_party/gregwar/captcha/PhraseBuilderInterface.php
rename to src/vendor/gregwar/captcha/PhraseBuilderInterface.php
diff --git a/src/application/third_party/gregwar/captcha/autoload.php b/src/vendor/gregwar/captcha/autoload.php
similarity index 100%
rename from src/application/third_party/gregwar/captcha/autoload.php
rename to src/vendor/gregwar/captcha/autoload.php
diff --git a/src/application/third_party/index.html b/src/vendor/index.html
similarity index 100%
rename from src/application/third_party/index.html
rename to src/vendor/index.html
diff --git a/src/application/third_party/phpmailer/phpmailer/LICENSE b/src/vendor/phpmailer/phpmailer/LICENSE
similarity index 100%
rename from src/application/third_party/phpmailer/phpmailer/LICENSE
rename to src/vendor/phpmailer/phpmailer/LICENSE
diff --git a/src/application/third_party/phpmailer/phpmailer/PHPMailerAutoload.php b/src/vendor/phpmailer/phpmailer/PHPMailerAutoload.php
similarity index 100%
rename from src/application/third_party/phpmailer/phpmailer/PHPMailerAutoload.php
rename to src/vendor/phpmailer/phpmailer/PHPMailerAutoload.php
diff --git a/src/application/third_party/phpmailer/phpmailer/VERSION b/src/vendor/phpmailer/phpmailer/VERSION
similarity index 100%
rename from src/application/third_party/phpmailer/phpmailer/VERSION
rename to src/vendor/phpmailer/phpmailer/VERSION
diff --git a/src/application/third_party/phpmailer/phpmailer/class.phpmailer.php b/src/vendor/phpmailer/phpmailer/class.phpmailer.php
similarity index 100%
rename from src/application/third_party/phpmailer/phpmailer/class.phpmailer.php
rename to src/vendor/phpmailer/phpmailer/class.phpmailer.php
diff --git a/src/application/third_party/phpmailer/phpmailer/class.phpmaileroauth.php b/src/vendor/phpmailer/phpmailer/class.phpmaileroauth.php
similarity index 100%
rename from src/application/third_party/phpmailer/phpmailer/class.phpmaileroauth.php
rename to src/vendor/phpmailer/phpmailer/class.phpmaileroauth.php
diff --git a/src/application/third_party/phpmailer/phpmailer/class.phpmaileroauthgoogle.php b/src/vendor/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
similarity index 100%
rename from src/application/third_party/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
rename to src/vendor/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
diff --git a/src/application/third_party/phpmailer/phpmailer/class.pop3.php b/src/vendor/phpmailer/phpmailer/class.pop3.php
similarity index 100%
rename from src/application/third_party/phpmailer/phpmailer/class.pop3.php
rename to src/vendor/phpmailer/phpmailer/class.pop3.php
diff --git a/src/application/third_party/phpmailer/phpmailer/class.smtp.php b/src/vendor/phpmailer/phpmailer/class.smtp.php
similarity index 100%
rename from src/application/third_party/phpmailer/phpmailer/class.smtp.php
rename to src/vendor/phpmailer/phpmailer/class.smtp.php
diff --git a/src/application/third_party/phpmailer/phpmailer/get_oauth_token.php b/src/vendor/phpmailer/phpmailer/get_oauth_token.php
similarity index 100%
rename from src/application/third_party/phpmailer/phpmailer/get_oauth_token.php
rename to src/vendor/phpmailer/phpmailer/get_oauth_token.php
diff --git a/src/application/third_party/phpmailer/phpmailer/travis.phpunit.xml.dist b/src/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
similarity index 100%
rename from src/application/third_party/phpmailer/phpmailer/travis.phpunit.xml.dist
rename to src/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist