diff --git a/mitmproxy/web/.bowerrc b/web/.bowerrc
similarity index 100%
rename from mitmproxy/web/.bowerrc
rename to web/.bowerrc
diff --git a/mitmproxy/web/.eslintrc b/web/.eslintrc
similarity index 100%
rename from mitmproxy/web/.eslintrc
rename to web/.eslintrc
diff --git a/mitmproxy/web/README b/web/README
similarity index 100%
rename from mitmproxy/web/README
rename to web/README
diff --git a/mitmproxy/web/conf.js b/web/conf.js
similarity index 100%
rename from mitmproxy/web/conf.js
rename to web/conf.js
diff --git a/mitmproxy/web/gulpfile.js b/web/gulpfile.js
similarity index 100%
rename from mitmproxy/web/gulpfile.js
rename to web/gulpfile.js
diff --git a/mitmproxy/web/package.json b/web/package.json
similarity index 100%
rename from mitmproxy/web/package.json
rename to web/package.json
diff --git a/mitmproxy/web/src/css/app.less b/web/src/css/app.less
similarity index 100%
rename from mitmproxy/web/src/css/app.less
rename to web/src/css/app.less
diff --git a/mitmproxy/web/src/css/eventlog.less b/web/src/css/eventlog.less
similarity index 100%
rename from mitmproxy/web/src/css/eventlog.less
rename to web/src/css/eventlog.less
diff --git a/mitmproxy/web/src/css/flowdetail.less b/web/src/css/flowdetail.less
similarity index 100%
rename from mitmproxy/web/src/css/flowdetail.less
rename to web/src/css/flowdetail.less
diff --git a/mitmproxy/web/src/css/flowtable.less b/web/src/css/flowtable.less
similarity index 100%
rename from mitmproxy/web/src/css/flowtable.less
rename to web/src/css/flowtable.less
diff --git a/mitmproxy/web/src/css/flowview.less b/web/src/css/flowview.less
similarity index 100%
rename from mitmproxy/web/src/css/flowview.less
rename to web/src/css/flowview.less
diff --git a/mitmproxy/web/src/css/footer.less b/web/src/css/footer.less
similarity index 100%
rename from mitmproxy/web/src/css/footer.less
rename to web/src/css/footer.less
diff --git a/mitmproxy/web/src/css/header.less b/web/src/css/header.less
similarity index 100%
rename from mitmproxy/web/src/css/header.less
rename to web/src/css/header.less
diff --git a/mitmproxy/web/src/css/layout.less b/web/src/css/layout.less
similarity index 100%
rename from mitmproxy/web/src/css/layout.less
rename to web/src/css/layout.less
diff --git a/mitmproxy/web/src/css/prompt.less b/web/src/css/prompt.less
similarity index 100%
rename from mitmproxy/web/src/css/prompt.less
rename to web/src/css/prompt.less
diff --git a/mitmproxy/web/src/css/sprites.less b/web/src/css/sprites.less
similarity index 100%
rename from mitmproxy/web/src/css/sprites.less
rename to web/src/css/sprites.less
diff --git a/mitmproxy/web/src/css/tabs.less b/web/src/css/tabs.less
similarity index 100%
rename from mitmproxy/web/src/css/tabs.less
rename to web/src/css/tabs.less
diff --git a/mitmproxy/web/src/css/vendor-bootstrap-variables.less b/web/src/css/vendor-bootstrap-variables.less
similarity index 100%
rename from mitmproxy/web/src/css/vendor-bootstrap-variables.less
rename to web/src/css/vendor-bootstrap-variables.less
diff --git a/mitmproxy/web/src/css/vendor-bootstrap.less b/web/src/css/vendor-bootstrap.less
similarity index 100%
rename from mitmproxy/web/src/css/vendor-bootstrap.less
rename to web/src/css/vendor-bootstrap.less
diff --git a/mitmproxy/web/src/css/vendor.less b/web/src/css/vendor.less
similarity index 100%
rename from mitmproxy/web/src/css/vendor.less
rename to web/src/css/vendor.less
diff --git a/mitmproxy/web/src/fonts/FontAwesome.otf b/web/src/fonts/FontAwesome.otf
similarity index 100%
rename from mitmproxy/web/src/fonts/FontAwesome.otf
rename to web/src/fonts/FontAwesome.otf
diff --git a/mitmproxy/web/src/fonts/README b/web/src/fonts/README
similarity index 100%
rename from mitmproxy/web/src/fonts/README
rename to web/src/fonts/README
diff --git a/mitmproxy/web/src/fonts/font-awesome.css b/web/src/fonts/font-awesome.css
similarity index 100%
rename from mitmproxy/web/src/fonts/font-awesome.css
rename to web/src/fonts/font-awesome.css
diff --git a/mitmproxy/web/src/fonts/fontawesome-webfont.eot b/web/src/fonts/fontawesome-webfont.eot
similarity index 100%
rename from mitmproxy/web/src/fonts/fontawesome-webfont.eot
rename to web/src/fonts/fontawesome-webfont.eot
diff --git a/mitmproxy/web/src/fonts/fontawesome-webfont.svg b/web/src/fonts/fontawesome-webfont.svg
similarity index 100%
rename from mitmproxy/web/src/fonts/fontawesome-webfont.svg
rename to web/src/fonts/fontawesome-webfont.svg
diff --git a/mitmproxy/web/src/fonts/fontawesome-webfont.ttf b/web/src/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from mitmproxy/web/src/fonts/fontawesome-webfont.ttf
rename to web/src/fonts/fontawesome-webfont.ttf
diff --git a/mitmproxy/web/src/fonts/fontawesome-webfont.woff b/web/src/fonts/fontawesome-webfont.woff
similarity index 100%
rename from mitmproxy/web/src/fonts/fontawesome-webfont.woff
rename to web/src/fonts/fontawesome-webfont.woff
diff --git a/mitmproxy/web/src/images/chrome-devtools/LICENSE b/web/src/images/chrome-devtools/LICENSE
similarity index 100%
rename from mitmproxy/web/src/images/chrome-devtools/LICENSE
rename to web/src/images/chrome-devtools/LICENSE
diff --git a/mitmproxy/web/src/images/chrome-devtools/resourceCSSIcon.png b/web/src/images/chrome-devtools/resourceCSSIcon.png
similarity index 100%
rename from mitmproxy/web/src/images/chrome-devtools/resourceCSSIcon.png
rename to web/src/images/chrome-devtools/resourceCSSIcon.png
diff --git a/mitmproxy/web/src/images/chrome-devtools/resourceDocumentIcon.png b/web/src/images/chrome-devtools/resourceDocumentIcon.png
similarity index 100%
rename from mitmproxy/web/src/images/chrome-devtools/resourceDocumentIcon.png
rename to web/src/images/chrome-devtools/resourceDocumentIcon.png
diff --git a/mitmproxy/web/src/images/chrome-devtools/resourceJSIcon.png b/web/src/images/chrome-devtools/resourceJSIcon.png
similarity index 100%
rename from mitmproxy/web/src/images/chrome-devtools/resourceJSIcon.png
rename to web/src/images/chrome-devtools/resourceJSIcon.png
diff --git a/mitmproxy/web/src/images/chrome-devtools/resourcePlainIcon.png b/web/src/images/chrome-devtools/resourcePlainIcon.png
similarity index 100%
rename from mitmproxy/web/src/images/chrome-devtools/resourcePlainIcon.png
rename to web/src/images/chrome-devtools/resourcePlainIcon.png
diff --git a/mitmproxy/web/src/images/resourceExecutableIcon.png b/web/src/images/resourceExecutableIcon.png
similarity index 100%
rename from mitmproxy/web/src/images/resourceExecutableIcon.png
rename to web/src/images/resourceExecutableIcon.png
diff --git a/mitmproxy/web/src/images/resourceFlashIcon.png b/web/src/images/resourceFlashIcon.png
similarity index 100%
rename from mitmproxy/web/src/images/resourceFlashIcon.png
rename to web/src/images/resourceFlashIcon.png
diff --git a/mitmproxy/web/src/images/resourceImageIcon.png b/web/src/images/resourceImageIcon.png
similarity index 100%
rename from mitmproxy/web/src/images/resourceImageIcon.png
rename to web/src/images/resourceImageIcon.png
diff --git a/mitmproxy/web/src/images/resourceJavaIcon.png b/web/src/images/resourceJavaIcon.png
similarity index 100%
rename from mitmproxy/web/src/images/resourceJavaIcon.png
rename to web/src/images/resourceJavaIcon.png
diff --git a/mitmproxy/web/src/images/resourceNotModifiedIcon.png b/web/src/images/resourceNotModifiedIcon.png
similarity index 100%
rename from mitmproxy/web/src/images/resourceNotModifiedIcon.png
rename to web/src/images/resourceNotModifiedIcon.png
diff --git a/mitmproxy/web/src/images/resourceRedirectIcon.png b/web/src/images/resourceRedirectIcon.png
similarity index 100%
rename from mitmproxy/web/src/images/resourceRedirectIcon.png
rename to web/src/images/resourceRedirectIcon.png
diff --git a/mitmproxy/web/src/js/actions.js b/web/src/js/actions.js
similarity index 100%
rename from mitmproxy/web/src/js/actions.js
rename to web/src/js/actions.js
diff --git a/mitmproxy/web/src/js/app.js b/web/src/js/app.js
similarity index 100%
rename from mitmproxy/web/src/js/app.js
rename to web/src/js/app.js
diff --git a/mitmproxy/web/src/js/components/common.js b/web/src/js/components/common.js
similarity index 100%
rename from mitmproxy/web/src/js/components/common.js
rename to web/src/js/components/common.js
diff --git a/mitmproxy/web/src/js/components/editor.js b/web/src/js/components/editor.js
similarity index 100%
rename from mitmproxy/web/src/js/components/editor.js
rename to web/src/js/components/editor.js
diff --git a/mitmproxy/web/src/js/components/eventlog.js b/web/src/js/components/eventlog.js
similarity index 100%
rename from mitmproxy/web/src/js/components/eventlog.js
rename to web/src/js/components/eventlog.js
diff --git a/mitmproxy/web/src/js/components/flowtable-columns.js b/web/src/js/components/flowtable-columns.js
similarity index 100%
rename from mitmproxy/web/src/js/components/flowtable-columns.js
rename to web/src/js/components/flowtable-columns.js
diff --git a/mitmproxy/web/src/js/components/flowtable.js b/web/src/js/components/flowtable.js
similarity index 100%
rename from mitmproxy/web/src/js/components/flowtable.js
rename to web/src/js/components/flowtable.js
diff --git a/mitmproxy/web/src/js/components/flowview/contentview.js b/web/src/js/components/flowview/contentview.js
similarity index 100%
rename from mitmproxy/web/src/js/components/flowview/contentview.js
rename to web/src/js/components/flowview/contentview.js
diff --git a/mitmproxy/web/src/js/components/flowview/details.js b/web/src/js/components/flowview/details.js
similarity index 100%
rename from mitmproxy/web/src/js/components/flowview/details.js
rename to web/src/js/components/flowview/details.js
diff --git a/mitmproxy/web/src/js/components/flowview/index.js b/web/src/js/components/flowview/index.js
similarity index 100%
rename from mitmproxy/web/src/js/components/flowview/index.js
rename to web/src/js/components/flowview/index.js
diff --git a/mitmproxy/web/src/js/components/flowview/messages.js b/web/src/js/components/flowview/messages.js
similarity index 100%
rename from mitmproxy/web/src/js/components/flowview/messages.js
rename to web/src/js/components/flowview/messages.js
diff --git a/mitmproxy/web/src/js/components/flowview/nav.js b/web/src/js/components/flowview/nav.js
similarity index 100%
rename from mitmproxy/web/src/js/components/flowview/nav.js
rename to web/src/js/components/flowview/nav.js
diff --git a/mitmproxy/web/src/js/components/footer.js b/web/src/js/components/footer.js
similarity index 100%
rename from mitmproxy/web/src/js/components/footer.js
rename to web/src/js/components/footer.js
diff --git a/mitmproxy/web/src/js/components/header.js b/web/src/js/components/header.js
similarity index 100%
rename from mitmproxy/web/src/js/components/header.js
rename to web/src/js/components/header.js
diff --git a/mitmproxy/web/src/js/components/mainview.js b/web/src/js/components/mainview.js
similarity index 100%
rename from mitmproxy/web/src/js/components/mainview.js
rename to web/src/js/components/mainview.js
diff --git a/mitmproxy/web/src/js/components/prompt.js b/web/src/js/components/prompt.js
similarity index 100%
rename from mitmproxy/web/src/js/components/prompt.js
rename to web/src/js/components/prompt.js
diff --git a/mitmproxy/web/src/js/components/proxyapp.js b/web/src/js/components/proxyapp.js
similarity index 100%
rename from mitmproxy/web/src/js/components/proxyapp.js
rename to web/src/js/components/proxyapp.js
diff --git a/mitmproxy/web/src/js/components/virtualscroll.js b/web/src/js/components/virtualscroll.js
similarity index 100%
rename from mitmproxy/web/src/js/components/virtualscroll.js
rename to web/src/js/components/virtualscroll.js
diff --git a/mitmproxy/web/src/js/connection.js b/web/src/js/connection.js
similarity index 100%
rename from mitmproxy/web/src/js/connection.js
rename to web/src/js/connection.js
diff --git a/mitmproxy/web/src/js/dispatcher.js b/web/src/js/dispatcher.js
similarity index 100%
rename from mitmproxy/web/src/js/dispatcher.js
rename to web/src/js/dispatcher.js
diff --git a/mitmproxy/web/src/js/filt/filt.js b/web/src/js/filt/filt.js
similarity index 100%
rename from mitmproxy/web/src/js/filt/filt.js
rename to web/src/js/filt/filt.js
diff --git a/mitmproxy/web/src/js/filt/filt.peg b/web/src/js/filt/filt.peg
similarity index 100%
rename from mitmproxy/web/src/js/filt/filt.peg
rename to web/src/js/filt/filt.peg
diff --git a/mitmproxy/web/src/js/flow/utils.js b/web/src/js/flow/utils.js
similarity index 100%
rename from mitmproxy/web/src/js/flow/utils.js
rename to web/src/js/flow/utils.js
diff --git a/mitmproxy/web/src/js/store/store.js b/web/src/js/store/store.js
similarity index 100%
rename from mitmproxy/web/src/js/store/store.js
rename to web/src/js/store/store.js
diff --git a/mitmproxy/web/src/js/store/view.js b/web/src/js/store/view.js
similarity index 100%
rename from mitmproxy/web/src/js/store/view.js
rename to web/src/js/store/view.js
diff --git a/mitmproxy/web/src/js/tests/utils.js b/web/src/js/tests/utils.js
similarity index 100%
rename from mitmproxy/web/src/js/tests/utils.js
rename to web/src/js/tests/utils.js
diff --git a/mitmproxy/web/src/js/utils.js b/web/src/js/utils.js
similarity index 100%
rename from mitmproxy/web/src/js/utils.js
rename to web/src/js/utils.js
diff --git a/mitmproxy/web/src/templates/index.html b/web/src/templates/index.html
similarity index 100%
rename from mitmproxy/web/src/templates/index.html
rename to web/src/templates/index.html