diff --git a/.travis.yml b/.travis.yml
index 66395e5f..eb1e114c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,7 @@ language: cpp
 sudo: false
 branches:
   exclude:
-    - gh-pages
-env:
-  global:
-    - secure: "Tdqt9SFIri3bu3B0D1aJqkYr5Zhy1yuBgvL5xC84w96DX45/gq27q51jEHxZdyhAo71D5UNxd9It7aRDMixoYmHj9VvPmhX3o34JKcXsXTFmK6Mks55E8gVr8FJfX7Efl8TSrZ677c51aUeScIaLnpL7G2VoKAqp8GA15foBgggQYjMC6h0ciDRh39GEKUWc/aZa1+uqsTw8rYfDTUn6fQ4GQqVaFhcN14V4vDOleeHM17GgOSoZTPXMi/9qAgRkASARvkdndWYwAIu8XFgu7Za8mWqpn2lpl9Yfv/YbRoPTm8FC9yH4VSbS1YKUw2vS6ehdpgqp8c8ANqoCKp4nUTY6O+5HYJO8bq3pvYOdz2Uz99gSagzIQ/JHxPHQ6GH/3j7e79OWI810FLtG7jJ4SCnBrN8tSCWeDlCatDEMyAchXB2bAns61Tcu5Welf9wLYDgFWYlYl20X6Y/a1B44yczvu8h+McptcNCPola2xLj+TVTc5EewgjAFgpugtx39XMC/GLaY74wv+Q4rX0o1V4AQgZ42fXPKpUeum2JXzBD+Sw0Qzp8cu+qGMjLv2i0BoKcOtQ6LuJsftq/0p/EjnlZCupHeV0aiujNHqB1KkKdTX/aerPNef0Xz3ZL+eukGTwTbFUxng4zkV4JL+3f9RykzJ0TJDMavZSPggXXP4P0="
+  - gh-pages
 cache:
   directories:
   - ${TRAVIS_BUILD_DIR}/deps/cmake
@@ -21,9 +18,9 @@ matrix:
         packages:
         - clang-3.5
     env:
-      - COMPILER=3.5
-      - DEPLOY_MAT=yes
-      - DOXYFILE=$TRAVIS_BUILD_DIR/docs/Doxyfile
+    - COMPILER=3.5
+    - DEPLOY_MAT=yes
+    - DOXYFILE=$TRAVIS_BUILD_DIR/docs/Doxyfile
   - compiler: gcc
     addons:
       apt:
@@ -46,28 +43,29 @@ matrix:
     env:
     - COMPILER=4.7
   - os: osx
-
 install:
 - python -c 'import sys; print(sys.version_info[:])'
 - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd $TRAVIS_BUILD_DIR && . .ci/prepare_altern.sh ; fi
-- if [ "$TRAVIS_OS_NAME" = "linux" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_cmake.sh ; fi
-- if [ "$TRAVIS_OS_NAME" = "linux" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_doxygen.sh ; fi
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd $TRAVIS_BUILD_DIR && . .ci/prepare_altern.sh
+  ; fi
+- if [ "$TRAVIS_OS_NAME" = "linux" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_cmake.sh
+  ; fi
+- if [ "$TRAVIS_OS_NAME" = "linux" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_doxygen.sh
+  ; fi
 - if [ -n "$COVERALLS" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_lcov.sh ; fi
 - cd "${DEPS_DIR}"
 - if [ "$(python -c 'import sys; print(sys.version_info[0])')" = "2" ] ; then pip
   install --user pathlib; fi
-
 script:
 - cd "${TRAVIS_BUILD_DIR}"
 - .ci/travis.sh
-
 after_success:
 - if [ -n "$COVERALLS" ] ; then cd $TRAVIS_BUILD_DIR && .ci/run_codecov.sh ; fi
 - echo "${TRAVIS_BRANCH}"
 - echo "${TRAVIS_PULL_REQUEST}"
-- if [ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" && -n "$DEPLOY_MAT" ] ; then echo "Updating docs" &&  cd $TRAVIS_BUILD_DIR && .ci/build_docs.sh ; fi
-
+- if [ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" && -n
+  "$DEPLOY_MAT" ] ; then echo "Updating docs" &&  cd $TRAVIS_BUILD_DIR && .ci/build_docs.sh
+  ; fi
 deploy:
   provider: releases
   api_key:
@@ -75,14 +73,16 @@ deploy:
   skip_cleanup: true
   file: build/include/CLI11.hpp
   on:
-    repo: henryiii/CLI11
+    repo: CLTools/CLI11
     tags: true
     condition: $DEPLOY_MAT = yes
-
 notifications:
   webhooks:
     urls:
-      - https://webhooks.gitter.im/e/bbdb3befce4c00448d24
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
+    - https://webhooks.gitter.im/e/bbdb3befce4c00448d24
+    on_success: change
+    on_failure: always
+    on_start: never
+env:
+  global:
+    secure: OKpsUj80J/zdGXE1eoMe78kq2HNsu4H6nTLd+JpenCU8DNmNugz2uwVr5pL9dL70y1LIh0Zjfm7yvnEDTYebEtj94n3Ms2kRDKBDZRiy1ZXxhVrGUGRC8PCkZIrKVOzy2CA3OY2PlqWbRF4kD0FaO7G4rVTYP4cNCJSnx/nM5knS2KMQ0uVyr/fi4CfjL7SKwdguVpvDlTgqx70+xwQyfba0PCZRzA2SSth7MGAC0chel3H4G1xDksukZkOoTRtRXlwHtqFNIlk7pZc6oZyoDxWIVbdZaluffYfGSolNTwLskaq1sV8coa9roLDZOpKKa97q2YPI2uU87l7FD/rDs/K15bDCGfai0sSKL/THqC1SvoHuHstAsy1cYjmOaIN55/nl0hY3rL9nMt01d84FNRGQA2VVzSJ4A6TTTlP+Vme25COhEBkF8MFfNqNVj0hfVY7wqUJu75SOy6gmkp9tH2ZEQHzVOWsm0ZX0tOlauhLTVfNkq5k60NAGK659doC1H9kpEOVfyrbnPGLFiJIB3LugQacknm/Px4owR/XkZrfrka/kk4WKYgzo9vCpOrNr5j1ERYnw70aOxpAQ75mIQOsGQDAqp6AIMJjLoVy7y4rUWIEfARn/2u/1bs3OsON33PI+9xhF+E/W1SlQmqVglbnJiwrbet7SM+//09Gr3aw=
diff --git a/README.md b/README.md
index aa00c985..c4b42dd3 100644
--- a/README.md
+++ b/README.md
@@ -268,22 +268,22 @@ try {
 This will print help in blue, errors in red, and will reset before returning the terminal to the user.
 
 
-[travis-badge]:      https://img.shields.io/travis/henryiii/CLI11/master.svg?label=Linux/macOS
-[travis-link]:       https://travis-ci.org/henryiii/CLI11
+[travis-badge]:      https://img.shields.io/travis/CLTools/CLI11/master.svg?label=Linux/macOS
+[travis-link]:       https://travis-ci.org/CLTools/CLI11
 [appveyor-badge]:    https://img.shields.io/appveyor/ci/HenrySchreiner/cli11/master.svg?label=Windows
 [appveyor-link]:     https://ci.appveyor.com/project/HenrySchreiner/cli11
-[codecov-badge]:     https://codecov.io/gh/henryiii/CLI11/branch/master/graph/badge.svg
-[codecov-link]:      https://codecov.io/gh/henryiii/CLI11
+[codecov-badge]:     https://codecov.io/gh/CLTools/CLI11/branch/master/graph/badge.svg
+[codecov-link]:      https://codecov.io/gh/CLTools/CLI11
 [gitter-badge]:      https://badges.gitter.im/CLI11gitter/Lobby.svg
 [gitter-link]:       https://gitter.im/CLI11gitter/Lobby
 [license-badge]:     https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg
-[github-releases]:   https://github.com/henryiii/CLI11/releases
-[github-issues]:     https://github.com/henryiii/CLI11/issues
-[github-pull]:       https://github.com/henryiii/CLI11/pulls
+[github-releases]:   https://github.com/CLTools/CLI11/releases
+[github-issues]:     https://github.com/CLTools/CLI11/issues
+[github-pull]:       https://github.com/CLTools/CLI11/pulls
 [goofit-link]:       https://GooFit.github.io 
 [plumbum-link]:      https://plumbum.readthedocs.io/en/latest/
 [click-link]:        http://click.pocoo.org
-[api-docs]:          https://henryiii.github.io/CLI11/index.html
+[api-docs]:          https://CLTools.github.io/CLI11/index.html
 [rang-link]:         https://github.com/agauniyal/rang/wiki
 [boost-link]:        http://www.boost.org/doc/libs/1_63_0/doc/html/program_options.html
 [optionparser-link]: http://optionparser.sourceforge.net
diff --git a/docs/mainpage.md b/docs/mainpage.md
index e91c301b..171e3e15 100644
--- a/docs/mainpage.md
+++ b/docs/mainpage.md
@@ -1,6 +1,6 @@
 # Introduction
 
-This is the Doxygen API documentation for CLI11 parser. There is a friendly introduction to CLI11 on the [Github page](https://github.com/henryiii/CLI11).
+This is the Doxygen API documentation for CLI11 parser. There is a friendly introduction to CLI11 on the [Github page](https://github.com/CLTools/CLI11).
 
 The main classes are:
 
diff --git a/include/CLI/App.hpp b/include/CLI/App.hpp
index 613aa717..28024181 100644
--- a/include/CLI/App.hpp
+++ b/include/CLI/App.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // Distributed under the LGPL v2.1 license.  See accompanying
-// file LICENSE or https://github.com/henryiii/CLI11 for details.
+// file LICENSE or https://github.com/CLTools/CLI11 for details.
 
 #include <string>
 #include <memory>
diff --git a/include/CLI/CLI.hpp b/include/CLI/CLI.hpp
index 7bdbe58c..00b19799 100644
--- a/include/CLI/CLI.hpp
+++ b/include/CLI/CLI.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // Distributed under the LGPL v2.1 license.  See accompanying
-// file LICENSE or https://github.com/henryiii/CLI11 for details.
+// file LICENSE or https://github.com/CLTools/CLI11 for details.
 
 // CLI Library includes
 #include "CLI/Error.hpp"
diff --git a/include/CLI/Error.hpp b/include/CLI/Error.hpp
index e807990f..3b962aa3 100644
--- a/include/CLI/Error.hpp
+++ b/include/CLI/Error.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // Distributed under the LGPL v2.1 license.  See accompanying
-// file LICENSE or https://github.com/henryiii/CLI11 for details.
+// file LICENSE or https://github.com/CLTools/CLI11 for details.
 
 #include <string>
 #include <exception>
diff --git a/include/CLI/Ini.hpp b/include/CLI/Ini.hpp
index 9b04cdad..1b16b680 100644
--- a/include/CLI/Ini.hpp
+++ b/include/CLI/Ini.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // Distributed under the LGPL v2.1 license.  See accompanying
-// file LICENSE or https://github.com/henryiii/CLI11 for details.
+// file LICENSE or https://github.com/CLTools/CLI11 for details.
 
 #include <fstream>
 #include <string>
diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index 7c77081f..0658d553 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // Distributed under the LGPL v2.1 license.  See accompanying
-// file LICENSE or https://github.com/henryiii/CLI11 for details.
+// file LICENSE or https://github.com/CLTools/CLI11 for details.
 
 #include <string>
 #include <functional>
diff --git a/include/CLI/Split.hpp b/include/CLI/Split.hpp
index ef6af978..019eb6b4 100644
--- a/include/CLI/Split.hpp
+++ b/include/CLI/Split.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // Distributed under the LGPL v2.1 license.  See accompanying
-// file LICENSE or https://github.com/henryiii/CLI11 for details.
+// file LICENSE or https://github.com/CLTools/CLI11 for details.
 
 #include <string>
 #include <vector>
diff --git a/include/CLI/StringTools.hpp b/include/CLI/StringTools.hpp
index 25320160..2b576009 100644
--- a/include/CLI/StringTools.hpp
+++ b/include/CLI/StringTools.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // Distributed under the LGPL v2.1 license.  See accompanying
-// file LICENSE or https://github.com/henryiii/CLI11 for details.
+// file LICENSE or https://github.com/CLTools/CLI11 for details.
 
 #include <string>
 #include <sstream>
diff --git a/include/CLI/Timer.hpp b/include/CLI/Timer.hpp
index cff16f9b..46b853bb 100644
--- a/include/CLI/Timer.hpp
+++ b/include/CLI/Timer.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // Distributed under the LGPL v2.1 license.  See accompanying
-// file LICENSE or https://github.com/henryiii/CLI11 for details.
+// file LICENSE or https://github.com/CLTools/CLI11 for details.
 
 #include <string>
 #include <iostream>
diff --git a/include/CLI/TypeTools.hpp b/include/CLI/TypeTools.hpp
index 762d5f9b..17de472e 100644
--- a/include/CLI/TypeTools.hpp
+++ b/include/CLI/TypeTools.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // Distributed under the LGPL v2.1 license.  See accompanying
-// file LICENSE or https://github.com/henryiii/CLI11 for details.
+// file LICENSE or https://github.com/CLTools/CLI11 for details.
 
 #include <vector>
 #include <type_traits>
diff --git a/include/CLI/Validators.hpp b/include/CLI/Validators.hpp
index 75c9b397..7ee7965f 100644
--- a/include/CLI/Validators.hpp
+++ b/include/CLI/Validators.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // Distributed under the LGPL v2.1 license.  See accompanying
-// file LICENSE or https://github.com/henryiii/CLI11 for details.
+// file LICENSE or https://github.com/CLTools/CLI11 for details.
 
 #include <string>
 #include <iostream>
diff --git a/scripts/MakeSingleHeader.py b/scripts/MakeSingleHeader.py
index ad3431a8..ad461ad6 100755
--- a/scripts/MakeSingleHeader.py
+++ b/scripts/MakeSingleHeader.py
@@ -41,7 +41,7 @@ def MakeHeader(out):
 #pragma once
 
 // Distributed under the LGPL v2.1 license.  See accompanying
-// file LICENSE or https://github.com/henryiii/CLI11 for details.
+// file LICENSE or https://github.com/CLTools/CLI11 for details.
 
 // This file was generated using MakeSingleHeader.py in CLI11/scripts
 // from: {tag}