diff --git a/MANIFEST.in b/MANIFEST.in
index 0598b9f03..c40c74e36 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-recursive-include connexion/swagger-ui *
+recursive-include connexion/vendor/swagger-ui *
 include *.txt
 include *.rst
diff --git a/connexion/api.py b/connexion/api.py
index c7f488ad0..e1d5004b8 100644
--- a/connexion/api.py
+++ b/connexion/api.py
@@ -21,7 +21,7 @@
 from . import utils
 
 MODULE_PATH = pathlib.Path(__file__).absolute().parent
-SWAGGER_UI_PATH = MODULE_PATH / 'swagger-ui'
+SWAGGER_UI_PATH = MODULE_PATH / 'vendor' / 'swagger-ui'
 SWAGGER_UI_URL = 'ui'
 
 logger = logging.getLogger('connexion.api')
diff --git a/connexion/swagger-ui/css/print.css b/connexion/vendor/swagger-ui/css/print.css
similarity index 100%
rename from connexion/swagger-ui/css/print.css
rename to connexion/vendor/swagger-ui/css/print.css
diff --git a/connexion/swagger-ui/css/reset.css b/connexion/vendor/swagger-ui/css/reset.css
similarity index 100%
rename from connexion/swagger-ui/css/reset.css
rename to connexion/vendor/swagger-ui/css/reset.css
diff --git a/connexion/swagger-ui/css/screen.css b/connexion/vendor/swagger-ui/css/screen.css
similarity index 100%
rename from connexion/swagger-ui/css/screen.css
rename to connexion/vendor/swagger-ui/css/screen.css
diff --git a/connexion/swagger-ui/css/style.css b/connexion/vendor/swagger-ui/css/style.css
similarity index 100%
rename from connexion/swagger-ui/css/style.css
rename to connexion/vendor/swagger-ui/css/style.css
diff --git a/connexion/swagger-ui/css/typography.css b/connexion/vendor/swagger-ui/css/typography.css
similarity index 100%
rename from connexion/swagger-ui/css/typography.css
rename to connexion/vendor/swagger-ui/css/typography.css
diff --git a/connexion/swagger-ui/fonts/droid-sans-v6-latin-700.eot b/connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-700.eot
similarity index 100%
rename from connexion/swagger-ui/fonts/droid-sans-v6-latin-700.eot
rename to connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-700.eot
diff --git a/connexion/swagger-ui/fonts/droid-sans-v6-latin-700.svg b/connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-700.svg
similarity index 100%
rename from connexion/swagger-ui/fonts/droid-sans-v6-latin-700.svg
rename to connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-700.svg
diff --git a/connexion/swagger-ui/fonts/droid-sans-v6-latin-700.ttf b/connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-700.ttf
similarity index 100%
rename from connexion/swagger-ui/fonts/droid-sans-v6-latin-700.ttf
rename to connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-700.ttf
diff --git a/connexion/swagger-ui/fonts/droid-sans-v6-latin-700.woff b/connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-700.woff
similarity index 100%
rename from connexion/swagger-ui/fonts/droid-sans-v6-latin-700.woff
rename to connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-700.woff
diff --git a/connexion/swagger-ui/fonts/droid-sans-v6-latin-700.woff2 b/connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-700.woff2
similarity index 100%
rename from connexion/swagger-ui/fonts/droid-sans-v6-latin-700.woff2
rename to connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-700.woff2
diff --git a/connexion/swagger-ui/fonts/droid-sans-v6-latin-regular.eot b/connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-regular.eot
similarity index 100%
rename from connexion/swagger-ui/fonts/droid-sans-v6-latin-regular.eot
rename to connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-regular.eot
diff --git a/connexion/swagger-ui/fonts/droid-sans-v6-latin-regular.svg b/connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-regular.svg
similarity index 100%
rename from connexion/swagger-ui/fonts/droid-sans-v6-latin-regular.svg
rename to connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-regular.svg
diff --git a/connexion/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf b/connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf
similarity index 100%
rename from connexion/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf
rename to connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf
diff --git a/connexion/swagger-ui/fonts/droid-sans-v6-latin-regular.woff b/connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-regular.woff
similarity index 100%
rename from connexion/swagger-ui/fonts/droid-sans-v6-latin-regular.woff
rename to connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-regular.woff
diff --git a/connexion/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2 b/connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2
similarity index 100%
rename from connexion/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2
rename to connexion/vendor/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2
diff --git a/connexion/swagger-ui/images/explorer_icons.png b/connexion/vendor/swagger-ui/images/explorer_icons.png
similarity index 100%
rename from connexion/swagger-ui/images/explorer_icons.png
rename to connexion/vendor/swagger-ui/images/explorer_icons.png
diff --git a/connexion/swagger-ui/images/favicon-16x16.png b/connexion/vendor/swagger-ui/images/favicon-16x16.png
similarity index 100%
rename from connexion/swagger-ui/images/favicon-16x16.png
rename to connexion/vendor/swagger-ui/images/favicon-16x16.png
diff --git a/connexion/swagger-ui/images/favicon-32x32.png b/connexion/vendor/swagger-ui/images/favicon-32x32.png
similarity index 100%
rename from connexion/swagger-ui/images/favicon-32x32.png
rename to connexion/vendor/swagger-ui/images/favicon-32x32.png
diff --git a/connexion/swagger-ui/images/favicon.ico b/connexion/vendor/swagger-ui/images/favicon.ico
similarity index 100%
rename from connexion/swagger-ui/images/favicon.ico
rename to connexion/vendor/swagger-ui/images/favicon.ico
diff --git a/connexion/swagger-ui/images/logo_small.png b/connexion/vendor/swagger-ui/images/logo_small.png
similarity index 100%
rename from connexion/swagger-ui/images/logo_small.png
rename to connexion/vendor/swagger-ui/images/logo_small.png
diff --git a/connexion/swagger-ui/images/pet_store_api.png b/connexion/vendor/swagger-ui/images/pet_store_api.png
similarity index 100%
rename from connexion/swagger-ui/images/pet_store_api.png
rename to connexion/vendor/swagger-ui/images/pet_store_api.png
diff --git a/connexion/swagger-ui/images/throbber.gif b/connexion/vendor/swagger-ui/images/throbber.gif
similarity index 100%
rename from connexion/swagger-ui/images/throbber.gif
rename to connexion/vendor/swagger-ui/images/throbber.gif
diff --git a/connexion/swagger-ui/images/wordnik_api.png b/connexion/vendor/swagger-ui/images/wordnik_api.png
similarity index 100%
rename from connexion/swagger-ui/images/wordnik_api.png
rename to connexion/vendor/swagger-ui/images/wordnik_api.png
diff --git a/connexion/swagger-ui/index.html b/connexion/vendor/swagger-ui/index.html
similarity index 100%
rename from connexion/swagger-ui/index.html
rename to connexion/vendor/swagger-ui/index.html
diff --git a/connexion/swagger-ui/lang/en.js b/connexion/vendor/swagger-ui/lang/en.js
similarity index 100%
rename from connexion/swagger-ui/lang/en.js
rename to connexion/vendor/swagger-ui/lang/en.js
diff --git a/connexion/swagger-ui/lang/es.js b/connexion/vendor/swagger-ui/lang/es.js
similarity index 100%
rename from connexion/swagger-ui/lang/es.js
rename to connexion/vendor/swagger-ui/lang/es.js
diff --git a/connexion/swagger-ui/lang/pt.js b/connexion/vendor/swagger-ui/lang/pt.js
similarity index 100%
rename from connexion/swagger-ui/lang/pt.js
rename to connexion/vendor/swagger-ui/lang/pt.js
diff --git a/connexion/swagger-ui/lang/ru.js b/connexion/vendor/swagger-ui/lang/ru.js
similarity index 100%
rename from connexion/swagger-ui/lang/ru.js
rename to connexion/vendor/swagger-ui/lang/ru.js
diff --git a/connexion/swagger-ui/lang/tr.js b/connexion/vendor/swagger-ui/lang/tr.js
similarity index 100%
rename from connexion/swagger-ui/lang/tr.js
rename to connexion/vendor/swagger-ui/lang/tr.js
diff --git a/connexion/swagger-ui/lang/translator.js b/connexion/vendor/swagger-ui/lang/translator.js
similarity index 100%
rename from connexion/swagger-ui/lang/translator.js
rename to connexion/vendor/swagger-ui/lang/translator.js
diff --git a/connexion/swagger-ui/lang/zh-cn.js b/connexion/vendor/swagger-ui/lang/zh-cn.js
similarity index 100%
rename from connexion/swagger-ui/lang/zh-cn.js
rename to connexion/vendor/swagger-ui/lang/zh-cn.js
diff --git a/connexion/swagger-ui/lib/backbone-min.js b/connexion/vendor/swagger-ui/lib/backbone-min.js
similarity index 100%
rename from connexion/swagger-ui/lib/backbone-min.js
rename to connexion/vendor/swagger-ui/lib/backbone-min.js
diff --git a/connexion/swagger-ui/lib/handlebars-2.0.0.js b/connexion/vendor/swagger-ui/lib/handlebars-2.0.0.js
similarity index 100%
rename from connexion/swagger-ui/lib/handlebars-2.0.0.js
rename to connexion/vendor/swagger-ui/lib/handlebars-2.0.0.js
diff --git a/connexion/swagger-ui/lib/highlight.7.3.pack.js b/connexion/vendor/swagger-ui/lib/highlight.7.3.pack.js
similarity index 100%
rename from connexion/swagger-ui/lib/highlight.7.3.pack.js
rename to connexion/vendor/swagger-ui/lib/highlight.7.3.pack.js
diff --git a/connexion/swagger-ui/lib/jquery-1.8.0.min.js b/connexion/vendor/swagger-ui/lib/jquery-1.8.0.min.js
similarity index 100%
rename from connexion/swagger-ui/lib/jquery-1.8.0.min.js
rename to connexion/vendor/swagger-ui/lib/jquery-1.8.0.min.js
diff --git a/connexion/swagger-ui/lib/jquery.ba-bbq.min.js b/connexion/vendor/swagger-ui/lib/jquery.ba-bbq.min.js
similarity index 100%
rename from connexion/swagger-ui/lib/jquery.ba-bbq.min.js
rename to connexion/vendor/swagger-ui/lib/jquery.ba-bbq.min.js
diff --git a/connexion/swagger-ui/lib/jquery.slideto.min.js b/connexion/vendor/swagger-ui/lib/jquery.slideto.min.js
similarity index 100%
rename from connexion/swagger-ui/lib/jquery.slideto.min.js
rename to connexion/vendor/swagger-ui/lib/jquery.slideto.min.js
diff --git a/connexion/swagger-ui/lib/jquery.wiggle.min.js b/connexion/vendor/swagger-ui/lib/jquery.wiggle.min.js
similarity index 100%
rename from connexion/swagger-ui/lib/jquery.wiggle.min.js
rename to connexion/vendor/swagger-ui/lib/jquery.wiggle.min.js
diff --git a/connexion/swagger-ui/lib/marked.js b/connexion/vendor/swagger-ui/lib/marked.js
similarity index 100%
rename from connexion/swagger-ui/lib/marked.js
rename to connexion/vendor/swagger-ui/lib/marked.js
diff --git a/connexion/swagger-ui/lib/swagger-oauth.js b/connexion/vendor/swagger-ui/lib/swagger-oauth.js
similarity index 100%
rename from connexion/swagger-ui/lib/swagger-oauth.js
rename to connexion/vendor/swagger-ui/lib/swagger-oauth.js
diff --git a/connexion/swagger-ui/lib/underscore-min.js b/connexion/vendor/swagger-ui/lib/underscore-min.js
similarity index 100%
rename from connexion/swagger-ui/lib/underscore-min.js
rename to connexion/vendor/swagger-ui/lib/underscore-min.js
diff --git a/connexion/swagger-ui/lib/underscore-min.map b/connexion/vendor/swagger-ui/lib/underscore-min.map
similarity index 100%
rename from connexion/swagger-ui/lib/underscore-min.map
rename to connexion/vendor/swagger-ui/lib/underscore-min.map
diff --git a/connexion/swagger-ui/o2c.html b/connexion/vendor/swagger-ui/o2c.html
similarity index 100%
rename from connexion/swagger-ui/o2c.html
rename to connexion/vendor/swagger-ui/o2c.html
diff --git a/connexion/swagger-ui/swagger-ui.js b/connexion/vendor/swagger-ui/swagger-ui.js
similarity index 100%
rename from connexion/swagger-ui/swagger-ui.js
rename to connexion/vendor/swagger-ui/swagger-ui.js
diff --git a/connexion/swagger-ui/swagger-ui.min.js b/connexion/vendor/swagger-ui/swagger-ui.min.js
similarity index 100%
rename from connexion/swagger-ui/swagger-ui.min.js
rename to connexion/vendor/swagger-ui/swagger-ui.min.js