From f1a0a3b228181457d10f4ffbe6609769d22fabba Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Tue, 16 Feb 2016 20:34:23 +0100 Subject: [PATCH] rename mitmproxy source directory --- mitmproxy/{ => bin}/mitmdump | 0 mitmproxy/{ => bin}/mitmproxy | 0 mitmproxy/{ => bin}/mitmweb | 0 mitmproxy/{libmproxy => mitmproxy}/__init__.py | 0 mitmproxy/{libmproxy => mitmproxy}/cmdline.py | 0 .../{libmproxy => mitmproxy}/console/__init__.py | 0 .../{libmproxy => mitmproxy}/console/common.py | 0 .../console/flowdetailview.py | 0 .../{libmproxy => mitmproxy}/console/flowlist.py | 0 .../{libmproxy => mitmproxy}/console/flowview.py | 0 .../{libmproxy => mitmproxy}/console/grideditor.py | 0 mitmproxy/{libmproxy => mitmproxy}/console/help.py | 0 .../{libmproxy => mitmproxy}/console/options.py | 0 .../console/palettepicker.py | 0 .../{libmproxy => mitmproxy}/console/palettes.py | 0 .../{libmproxy => mitmproxy}/console/pathedit.py | 0 .../{libmproxy => mitmproxy}/console/searchable.py | 0 .../{libmproxy => mitmproxy}/console/select.py | 0 .../{libmproxy => mitmproxy}/console/signals.py | 0 .../{libmproxy => mitmproxy}/console/statusbar.py | 0 mitmproxy/{libmproxy => mitmproxy}/console/tabs.py | 0 .../{libmproxy => mitmproxy}/console/window.py | 0 mitmproxy/{libmproxy => mitmproxy}/contentviews.py | 0 mitmproxy/{libmproxy => mitmproxy}/contrib/README | 0 .../{libmproxy => mitmproxy}/contrib/__init__.py | 0 .../contrib/jsbeautifier/__init__.py | 0 .../contrib/jsbeautifier/unpackers/README.specs.mkd | 0 .../contrib/jsbeautifier/unpackers/__init__.py | 0 .../contrib/jsbeautifier/unpackers/evalbased.py | 0 .../jsbeautifier/unpackers/javascriptobfuscator.py | 0 .../contrib/jsbeautifier/unpackers/myobfuscate.py | 0 .../contrib/jsbeautifier/unpackers/packer.py | 0 .../contrib/jsbeautifier/unpackers/urlencode.py | 0 .../contrib/tls/__init__.py | 0 .../contrib/tls/_constructs.py | 0 .../{libmproxy => mitmproxy}/contrib/tls/utils.py | 0 .../contrib/wbxml/ASCommandResponse.py | 0 .../contrib/wbxml/ASWBXML.py | 0 .../contrib/wbxml/ASWBXMLByteQueue.py | 0 .../contrib/wbxml/ASWBXMLCodePage.py | 0 .../contrib/wbxml/GlobalTokens.py | 0 .../contrib/wbxml/InvalidDataException.py | 0 .../contrib/wbxml/__init__.py | 0 mitmproxy/{libmproxy => mitmproxy}/controller.py | 0 mitmproxy/{libmproxy => mitmproxy}/dump.py | 0 mitmproxy/{libmproxy => mitmproxy}/exceptions.py | 0 mitmproxy/{libmproxy => mitmproxy}/filt.py | 0 mitmproxy/{libmproxy => mitmproxy}/flow.py | 0 mitmproxy/{libmproxy => mitmproxy}/flow_export.py | 0 .../{libmproxy => mitmproxy}/flow_format_compat.py | 0 mitmproxy/{libmproxy => mitmproxy}/main.py | 0 .../{libmproxy => mitmproxy}/models/__init__.py | 0 .../{libmproxy => mitmproxy}/models/connections.py | 0 mitmproxy/{libmproxy => mitmproxy}/models/flow.py | 0 mitmproxy/{libmproxy => mitmproxy}/models/http.py | 0 .../{libmproxy => mitmproxy}/onboarding/__init__.py | 0 .../{libmproxy => mitmproxy}/onboarding/app.py | 0 .../onboarding/static/bootstrap.min.css | 0 .../static/fontawesome/css/font-awesome.css | 0 .../static/fontawesome/css/font-awesome.min.css | 0 .../static/fontawesome/fonts/FontAwesome.otf | Bin .../fontawesome/fonts/fontawesome-webfont.eot | Bin .../fontawesome/fonts/fontawesome-webfont.svg | 0 .../fontawesome/fonts/fontawesome-webfont.ttf | Bin .../fontawesome/fonts/fontawesome-webfont.woff | Bin .../onboarding/static/mitmproxy.css | 0 .../onboarding/templates/frame.html | 0 .../onboarding/templates/index.html | 0 .../onboarding/templates/layout.html | 0 .../{libmproxy => mitmproxy}/platform/__init__.py | 0 .../{libmproxy => mitmproxy}/platform/linux.py | 0 mitmproxy/{libmproxy => mitmproxy}/platform/osx.py | 0 mitmproxy/{libmproxy => mitmproxy}/platform/pf.py | 0 .../{libmproxy => mitmproxy}/platform/windows.py | 0 .../{libmproxy => mitmproxy}/protocol/__init__.py | 0 mitmproxy/{libmproxy => mitmproxy}/protocol/base.py | 0 mitmproxy/{libmproxy => mitmproxy}/protocol/http.py | 0 .../{libmproxy => mitmproxy}/protocol/http1.py | 0 .../{libmproxy => mitmproxy}/protocol/http2.py | 0 .../protocol/http_replay.py | 0 .../{libmproxy => mitmproxy}/protocol/rawtcp.py | 0 mitmproxy/{libmproxy => mitmproxy}/protocol/tls.py | 0 .../{libmproxy => mitmproxy}/proxy/__init__.py | 0 mitmproxy/{libmproxy => mitmproxy}/proxy/config.py | 0 .../proxy/modes/__init__.py | 0 .../proxy/modes/http_proxy.py | 0 .../proxy/modes/reverse_proxy.py | 0 .../proxy/modes/socks_proxy.py | 0 .../proxy/modes/transparent_proxy.py | 0 .../{libmproxy => mitmproxy}/proxy/root_context.py | 0 mitmproxy/{libmproxy => mitmproxy}/proxy/server.py | 0 .../{libmproxy => mitmproxy}/script/__init__.py | 0 .../{libmproxy => mitmproxy}/script/concurrent.py | 0 .../{libmproxy => mitmproxy}/script/reloader.py | 0 mitmproxy/{libmproxy => mitmproxy}/script/script.py | 0 .../script/script_context.py | 0 mitmproxy/{libmproxy => mitmproxy}/stateobject.py | 0 mitmproxy/{libmproxy => mitmproxy}/tnetstring.py | 0 mitmproxy/{libmproxy => mitmproxy}/utils.py | 0 mitmproxy/{libmproxy => mitmproxy}/version.py | 0 mitmproxy/{libmproxy => mitmproxy}/web/__init__.py | 0 mitmproxy/{libmproxy => mitmproxy}/web/app.py | 0 .../{libmproxy => mitmproxy}/web/static/app.css | 0 .../{libmproxy => mitmproxy}/web/static/app.js | 0 .../web/static/fonts/fontawesome-webfont.eot | Bin .../web/static/fonts/fontawesome-webfont.svg | 0 .../web/static/fonts/fontawesome-webfont.ttf | Bin .../web/static/fonts/fontawesome-webfont.woff | Bin .../web/static/images/chrome-devtools/LICENSE | 0 .../images/chrome-devtools/resourceCSSIcon.png | Bin .../images/chrome-devtools/resourceDocumentIcon.png | Bin .../images/chrome-devtools/resourceJSIcon.png | Bin .../images/chrome-devtools/resourcePlainIcon.png | Bin .../web/static/images/resourceExecutableIcon.png | Bin .../web/static/images/resourceFlashIcon.png | Bin .../web/static/images/resourceImageIcon.png | Bin .../web/static/images/resourceJavaIcon.png | Bin .../web/static/images/resourceNotModifiedIcon.png | Bin .../web/static/images/resourceRedirectIcon.png | Bin .../{libmproxy => mitmproxy}/web/static/vendor.css | 0 .../{libmproxy => mitmproxy}/web/static/vendor.js | 0 .../web/templates/index.html | 0 .../webfonts/fontawesome-webfont.eot | Bin .../webfonts/fontawesome-webfont.svg | 0 .../webfonts/fontawesome-webfont.ttf | Bin .../webfonts/fontawesome-webfont.woff | Bin 126 files changed, 0 insertions(+), 0 deletions(-) rename mitmproxy/{ => bin}/mitmdump (100%) rename mitmproxy/{ => bin}/mitmproxy (100%) rename mitmproxy/{ => bin}/mitmweb (100%) rename mitmproxy/{libmproxy => mitmproxy}/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/cmdline.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/common.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/flowdetailview.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/flowlist.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/flowview.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/grideditor.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/help.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/options.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/palettepicker.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/palettes.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/pathedit.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/searchable.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/select.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/signals.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/statusbar.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/tabs.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/console/window.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contentviews.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/README (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/jsbeautifier/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/jsbeautifier/unpackers/README.specs.mkd (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/jsbeautifier/unpackers/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/jsbeautifier/unpackers/evalbased.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/jsbeautifier/unpackers/javascriptobfuscator.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/jsbeautifier/unpackers/myobfuscate.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/jsbeautifier/unpackers/packer.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/jsbeautifier/unpackers/urlencode.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/tls/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/tls/_constructs.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/tls/utils.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/wbxml/ASCommandResponse.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/wbxml/ASWBXML.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/wbxml/ASWBXMLByteQueue.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/wbxml/ASWBXMLCodePage.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/wbxml/GlobalTokens.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/wbxml/InvalidDataException.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/contrib/wbxml/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/controller.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/dump.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/exceptions.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/filt.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/flow.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/flow_export.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/flow_format_compat.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/main.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/models/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/models/connections.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/models/flow.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/models/http.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/app.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/static/bootstrap.min.css (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/static/fontawesome/css/font-awesome.css (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/static/fontawesome/css/font-awesome.min.css (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/static/fontawesome/fonts/FontAwesome.otf (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/static/mitmproxy.css (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/templates/frame.html (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/templates/index.html (100%) rename mitmproxy/{libmproxy => mitmproxy}/onboarding/templates/layout.html (100%) rename mitmproxy/{libmproxy => mitmproxy}/platform/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/platform/linux.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/platform/osx.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/platform/pf.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/platform/windows.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/protocol/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/protocol/base.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/protocol/http.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/protocol/http1.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/protocol/http2.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/protocol/http_replay.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/protocol/rawtcp.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/protocol/tls.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/proxy/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/proxy/config.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/proxy/modes/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/proxy/modes/http_proxy.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/proxy/modes/reverse_proxy.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/proxy/modes/socks_proxy.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/proxy/modes/transparent_proxy.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/proxy/root_context.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/proxy/server.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/script/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/script/concurrent.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/script/reloader.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/script/script.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/script/script_context.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/stateobject.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/tnetstring.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/utils.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/version.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/__init__.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/app.py (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/app.css (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/app.js (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/fonts/fontawesome-webfont.eot (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/fonts/fontawesome-webfont.svg (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/fonts/fontawesome-webfont.ttf (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/fonts/fontawesome-webfont.woff (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/images/chrome-devtools/LICENSE (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/images/chrome-devtools/resourceCSSIcon.png (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/images/chrome-devtools/resourceDocumentIcon.png (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/images/chrome-devtools/resourceJSIcon.png (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/images/chrome-devtools/resourcePlainIcon.png (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/images/resourceExecutableIcon.png (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/images/resourceFlashIcon.png (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/images/resourceImageIcon.png (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/images/resourceJavaIcon.png (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/images/resourceNotModifiedIcon.png (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/images/resourceRedirectIcon.png (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/vendor.css (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/static/vendor.js (100%) rename mitmproxy/{libmproxy => mitmproxy}/web/templates/index.html (100%) rename mitmproxy/{libmproxy => mitmproxy}/webfonts/fontawesome-webfont.eot (100%) rename mitmproxy/{libmproxy => mitmproxy}/webfonts/fontawesome-webfont.svg (100%) rename mitmproxy/{libmproxy => mitmproxy}/webfonts/fontawesome-webfont.ttf (100%) rename mitmproxy/{libmproxy => mitmproxy}/webfonts/fontawesome-webfont.woff (100%) diff --git a/mitmproxy/mitmdump b/mitmproxy/bin/mitmdump similarity index 100% rename from mitmproxy/mitmdump rename to mitmproxy/bin/mitmdump diff --git a/mitmproxy/mitmproxy b/mitmproxy/bin/mitmproxy similarity index 100% rename from mitmproxy/mitmproxy rename to mitmproxy/bin/mitmproxy diff --git a/mitmproxy/mitmweb b/mitmproxy/bin/mitmweb similarity index 100% rename from mitmproxy/mitmweb rename to mitmproxy/bin/mitmweb diff --git a/mitmproxy/libmproxy/__init__.py b/mitmproxy/mitmproxy/__init__.py similarity index 100% rename from mitmproxy/libmproxy/__init__.py rename to mitmproxy/mitmproxy/__init__.py diff --git a/mitmproxy/libmproxy/cmdline.py b/mitmproxy/mitmproxy/cmdline.py similarity index 100% rename from mitmproxy/libmproxy/cmdline.py rename to mitmproxy/mitmproxy/cmdline.py diff --git a/mitmproxy/libmproxy/console/__init__.py b/mitmproxy/mitmproxy/console/__init__.py similarity index 100% rename from mitmproxy/libmproxy/console/__init__.py rename to mitmproxy/mitmproxy/console/__init__.py diff --git a/mitmproxy/libmproxy/console/common.py b/mitmproxy/mitmproxy/console/common.py similarity index 100% rename from mitmproxy/libmproxy/console/common.py rename to mitmproxy/mitmproxy/console/common.py diff --git a/mitmproxy/libmproxy/console/flowdetailview.py b/mitmproxy/mitmproxy/console/flowdetailview.py similarity index 100% rename from mitmproxy/libmproxy/console/flowdetailview.py rename to mitmproxy/mitmproxy/console/flowdetailview.py diff --git a/mitmproxy/libmproxy/console/flowlist.py b/mitmproxy/mitmproxy/console/flowlist.py similarity index 100% rename from mitmproxy/libmproxy/console/flowlist.py rename to mitmproxy/mitmproxy/console/flowlist.py diff --git a/mitmproxy/libmproxy/console/flowview.py b/mitmproxy/mitmproxy/console/flowview.py similarity index 100% rename from mitmproxy/libmproxy/console/flowview.py rename to mitmproxy/mitmproxy/console/flowview.py diff --git a/mitmproxy/libmproxy/console/grideditor.py b/mitmproxy/mitmproxy/console/grideditor.py similarity index 100% rename from mitmproxy/libmproxy/console/grideditor.py rename to mitmproxy/mitmproxy/console/grideditor.py diff --git a/mitmproxy/libmproxy/console/help.py b/mitmproxy/mitmproxy/console/help.py similarity index 100% rename from mitmproxy/libmproxy/console/help.py rename to mitmproxy/mitmproxy/console/help.py diff --git a/mitmproxy/libmproxy/console/options.py b/mitmproxy/mitmproxy/console/options.py similarity index 100% rename from mitmproxy/libmproxy/console/options.py rename to mitmproxy/mitmproxy/console/options.py diff --git a/mitmproxy/libmproxy/console/palettepicker.py b/mitmproxy/mitmproxy/console/palettepicker.py similarity index 100% rename from mitmproxy/libmproxy/console/palettepicker.py rename to mitmproxy/mitmproxy/console/palettepicker.py diff --git a/mitmproxy/libmproxy/console/palettes.py b/mitmproxy/mitmproxy/console/palettes.py similarity index 100% rename from mitmproxy/libmproxy/console/palettes.py rename to mitmproxy/mitmproxy/console/palettes.py diff --git a/mitmproxy/libmproxy/console/pathedit.py b/mitmproxy/mitmproxy/console/pathedit.py similarity index 100% rename from mitmproxy/libmproxy/console/pathedit.py rename to mitmproxy/mitmproxy/console/pathedit.py diff --git a/mitmproxy/libmproxy/console/searchable.py b/mitmproxy/mitmproxy/console/searchable.py similarity index 100% rename from mitmproxy/libmproxy/console/searchable.py rename to mitmproxy/mitmproxy/console/searchable.py diff --git a/mitmproxy/libmproxy/console/select.py b/mitmproxy/mitmproxy/console/select.py similarity index 100% rename from mitmproxy/libmproxy/console/select.py rename to mitmproxy/mitmproxy/console/select.py diff --git a/mitmproxy/libmproxy/console/signals.py b/mitmproxy/mitmproxy/console/signals.py similarity index 100% rename from mitmproxy/libmproxy/console/signals.py rename to mitmproxy/mitmproxy/console/signals.py diff --git a/mitmproxy/libmproxy/console/statusbar.py b/mitmproxy/mitmproxy/console/statusbar.py similarity index 100% rename from mitmproxy/libmproxy/console/statusbar.py rename to mitmproxy/mitmproxy/console/statusbar.py diff --git a/mitmproxy/libmproxy/console/tabs.py b/mitmproxy/mitmproxy/console/tabs.py similarity index 100% rename from mitmproxy/libmproxy/console/tabs.py rename to mitmproxy/mitmproxy/console/tabs.py diff --git a/mitmproxy/libmproxy/console/window.py b/mitmproxy/mitmproxy/console/window.py similarity index 100% rename from mitmproxy/libmproxy/console/window.py rename to mitmproxy/mitmproxy/console/window.py diff --git a/mitmproxy/libmproxy/contentviews.py b/mitmproxy/mitmproxy/contentviews.py similarity index 100% rename from mitmproxy/libmproxy/contentviews.py rename to mitmproxy/mitmproxy/contentviews.py diff --git a/mitmproxy/libmproxy/contrib/README b/mitmproxy/mitmproxy/contrib/README similarity index 100% rename from mitmproxy/libmproxy/contrib/README rename to mitmproxy/mitmproxy/contrib/README diff --git a/mitmproxy/libmproxy/contrib/__init__.py b/mitmproxy/mitmproxy/contrib/__init__.py similarity index 100% rename from mitmproxy/libmproxy/contrib/__init__.py rename to mitmproxy/mitmproxy/contrib/__init__.py diff --git a/mitmproxy/libmproxy/contrib/jsbeautifier/__init__.py b/mitmproxy/mitmproxy/contrib/jsbeautifier/__init__.py similarity index 100% rename from mitmproxy/libmproxy/contrib/jsbeautifier/__init__.py rename to mitmproxy/mitmproxy/contrib/jsbeautifier/__init__.py diff --git a/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd b/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd similarity index 100% rename from mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd rename to mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd diff --git a/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/__init__.py b/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/__init__.py similarity index 100% rename from mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/__init__.py rename to mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/__init__.py diff --git a/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/evalbased.py b/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/evalbased.py similarity index 100% rename from mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/evalbased.py rename to mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/evalbased.py diff --git a/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py b/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py similarity index 100% rename from mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py rename to mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py diff --git a/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py b/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py similarity index 100% rename from mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py rename to mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py diff --git a/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/packer.py b/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/packer.py similarity index 100% rename from mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/packer.py rename to mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/packer.py diff --git a/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/urlencode.py b/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/urlencode.py similarity index 100% rename from mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/urlencode.py rename to mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/urlencode.py diff --git a/mitmproxy/libmproxy/contrib/tls/__init__.py b/mitmproxy/mitmproxy/contrib/tls/__init__.py similarity index 100% rename from mitmproxy/libmproxy/contrib/tls/__init__.py rename to mitmproxy/mitmproxy/contrib/tls/__init__.py diff --git a/mitmproxy/libmproxy/contrib/tls/_constructs.py b/mitmproxy/mitmproxy/contrib/tls/_constructs.py similarity index 100% rename from mitmproxy/libmproxy/contrib/tls/_constructs.py rename to mitmproxy/mitmproxy/contrib/tls/_constructs.py diff --git a/mitmproxy/libmproxy/contrib/tls/utils.py b/mitmproxy/mitmproxy/contrib/tls/utils.py similarity index 100% rename from mitmproxy/libmproxy/contrib/tls/utils.py rename to mitmproxy/mitmproxy/contrib/tls/utils.py diff --git a/mitmproxy/libmproxy/contrib/wbxml/ASCommandResponse.py b/mitmproxy/mitmproxy/contrib/wbxml/ASCommandResponse.py similarity index 100% rename from mitmproxy/libmproxy/contrib/wbxml/ASCommandResponse.py rename to mitmproxy/mitmproxy/contrib/wbxml/ASCommandResponse.py diff --git a/mitmproxy/libmproxy/contrib/wbxml/ASWBXML.py b/mitmproxy/mitmproxy/contrib/wbxml/ASWBXML.py similarity index 100% rename from mitmproxy/libmproxy/contrib/wbxml/ASWBXML.py rename to mitmproxy/mitmproxy/contrib/wbxml/ASWBXML.py diff --git a/mitmproxy/libmproxy/contrib/wbxml/ASWBXMLByteQueue.py b/mitmproxy/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py similarity index 100% rename from mitmproxy/libmproxy/contrib/wbxml/ASWBXMLByteQueue.py rename to mitmproxy/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py diff --git a/mitmproxy/libmproxy/contrib/wbxml/ASWBXMLCodePage.py b/mitmproxy/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py similarity index 100% rename from mitmproxy/libmproxy/contrib/wbxml/ASWBXMLCodePage.py rename to mitmproxy/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py diff --git a/mitmproxy/libmproxy/contrib/wbxml/GlobalTokens.py b/mitmproxy/mitmproxy/contrib/wbxml/GlobalTokens.py similarity index 100% rename from mitmproxy/libmproxy/contrib/wbxml/GlobalTokens.py rename to mitmproxy/mitmproxy/contrib/wbxml/GlobalTokens.py diff --git a/mitmproxy/libmproxy/contrib/wbxml/InvalidDataException.py b/mitmproxy/mitmproxy/contrib/wbxml/InvalidDataException.py similarity index 100% rename from mitmproxy/libmproxy/contrib/wbxml/InvalidDataException.py rename to mitmproxy/mitmproxy/contrib/wbxml/InvalidDataException.py diff --git a/mitmproxy/libmproxy/contrib/wbxml/__init__.py b/mitmproxy/mitmproxy/contrib/wbxml/__init__.py similarity index 100% rename from mitmproxy/libmproxy/contrib/wbxml/__init__.py rename to mitmproxy/mitmproxy/contrib/wbxml/__init__.py diff --git a/mitmproxy/libmproxy/controller.py b/mitmproxy/mitmproxy/controller.py similarity index 100% rename from mitmproxy/libmproxy/controller.py rename to mitmproxy/mitmproxy/controller.py diff --git a/mitmproxy/libmproxy/dump.py b/mitmproxy/mitmproxy/dump.py similarity index 100% rename from mitmproxy/libmproxy/dump.py rename to mitmproxy/mitmproxy/dump.py diff --git a/mitmproxy/libmproxy/exceptions.py b/mitmproxy/mitmproxy/exceptions.py similarity index 100% rename from mitmproxy/libmproxy/exceptions.py rename to mitmproxy/mitmproxy/exceptions.py diff --git a/mitmproxy/libmproxy/filt.py b/mitmproxy/mitmproxy/filt.py similarity index 100% rename from mitmproxy/libmproxy/filt.py rename to mitmproxy/mitmproxy/filt.py diff --git a/mitmproxy/libmproxy/flow.py b/mitmproxy/mitmproxy/flow.py similarity index 100% rename from mitmproxy/libmproxy/flow.py rename to mitmproxy/mitmproxy/flow.py diff --git a/mitmproxy/libmproxy/flow_export.py b/mitmproxy/mitmproxy/flow_export.py similarity index 100% rename from mitmproxy/libmproxy/flow_export.py rename to mitmproxy/mitmproxy/flow_export.py diff --git a/mitmproxy/libmproxy/flow_format_compat.py b/mitmproxy/mitmproxy/flow_format_compat.py similarity index 100% rename from mitmproxy/libmproxy/flow_format_compat.py rename to mitmproxy/mitmproxy/flow_format_compat.py diff --git a/mitmproxy/libmproxy/main.py b/mitmproxy/mitmproxy/main.py similarity index 100% rename from mitmproxy/libmproxy/main.py rename to mitmproxy/mitmproxy/main.py diff --git a/mitmproxy/libmproxy/models/__init__.py b/mitmproxy/mitmproxy/models/__init__.py similarity index 100% rename from mitmproxy/libmproxy/models/__init__.py rename to mitmproxy/mitmproxy/models/__init__.py diff --git a/mitmproxy/libmproxy/models/connections.py b/mitmproxy/mitmproxy/models/connections.py similarity index 100% rename from mitmproxy/libmproxy/models/connections.py rename to mitmproxy/mitmproxy/models/connections.py diff --git a/mitmproxy/libmproxy/models/flow.py b/mitmproxy/mitmproxy/models/flow.py similarity index 100% rename from mitmproxy/libmproxy/models/flow.py rename to mitmproxy/mitmproxy/models/flow.py diff --git a/mitmproxy/libmproxy/models/http.py b/mitmproxy/mitmproxy/models/http.py similarity index 100% rename from mitmproxy/libmproxy/models/http.py rename to mitmproxy/mitmproxy/models/http.py diff --git a/mitmproxy/libmproxy/onboarding/__init__.py b/mitmproxy/mitmproxy/onboarding/__init__.py similarity index 100% rename from mitmproxy/libmproxy/onboarding/__init__.py rename to mitmproxy/mitmproxy/onboarding/__init__.py diff --git a/mitmproxy/libmproxy/onboarding/app.py b/mitmproxy/mitmproxy/onboarding/app.py similarity index 100% rename from mitmproxy/libmproxy/onboarding/app.py rename to mitmproxy/mitmproxy/onboarding/app.py diff --git a/mitmproxy/libmproxy/onboarding/static/bootstrap.min.css b/mitmproxy/mitmproxy/onboarding/static/bootstrap.min.css similarity index 100% rename from mitmproxy/libmproxy/onboarding/static/bootstrap.min.css rename to mitmproxy/mitmproxy/onboarding/static/bootstrap.min.css diff --git a/mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.css b/mitmproxy/mitmproxy/onboarding/static/fontawesome/css/font-awesome.css similarity index 100% rename from mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.css rename to mitmproxy/mitmproxy/onboarding/static/fontawesome/css/font-awesome.css diff --git a/mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.min.css b/mitmproxy/mitmproxy/onboarding/static/fontawesome/css/font-awesome.min.css similarity index 100% rename from mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.min.css rename to mitmproxy/mitmproxy/onboarding/static/fontawesome/css/font-awesome.min.css diff --git a/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf b/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf similarity index 100% rename from mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf rename to mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf diff --git a/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot b/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot similarity index 100% rename from mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot rename to mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot diff --git a/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg b/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg similarity index 100% rename from mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg rename to mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg diff --git a/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf b/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf rename to mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf diff --git a/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff b/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff similarity index 100% rename from mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff rename to mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff diff --git a/mitmproxy/libmproxy/onboarding/static/mitmproxy.css b/mitmproxy/mitmproxy/onboarding/static/mitmproxy.css similarity index 100% rename from mitmproxy/libmproxy/onboarding/static/mitmproxy.css rename to mitmproxy/mitmproxy/onboarding/static/mitmproxy.css diff --git a/mitmproxy/libmproxy/onboarding/templates/frame.html b/mitmproxy/mitmproxy/onboarding/templates/frame.html similarity index 100% rename from mitmproxy/libmproxy/onboarding/templates/frame.html rename to mitmproxy/mitmproxy/onboarding/templates/frame.html diff --git a/mitmproxy/libmproxy/onboarding/templates/index.html b/mitmproxy/mitmproxy/onboarding/templates/index.html similarity index 100% rename from mitmproxy/libmproxy/onboarding/templates/index.html rename to mitmproxy/mitmproxy/onboarding/templates/index.html diff --git a/mitmproxy/libmproxy/onboarding/templates/layout.html b/mitmproxy/mitmproxy/onboarding/templates/layout.html similarity index 100% rename from mitmproxy/libmproxy/onboarding/templates/layout.html rename to mitmproxy/mitmproxy/onboarding/templates/layout.html diff --git a/mitmproxy/libmproxy/platform/__init__.py b/mitmproxy/mitmproxy/platform/__init__.py similarity index 100% rename from mitmproxy/libmproxy/platform/__init__.py rename to mitmproxy/mitmproxy/platform/__init__.py diff --git a/mitmproxy/libmproxy/platform/linux.py b/mitmproxy/mitmproxy/platform/linux.py similarity index 100% rename from mitmproxy/libmproxy/platform/linux.py rename to mitmproxy/mitmproxy/platform/linux.py diff --git a/mitmproxy/libmproxy/platform/osx.py b/mitmproxy/mitmproxy/platform/osx.py similarity index 100% rename from mitmproxy/libmproxy/platform/osx.py rename to mitmproxy/mitmproxy/platform/osx.py diff --git a/mitmproxy/libmproxy/platform/pf.py b/mitmproxy/mitmproxy/platform/pf.py similarity index 100% rename from mitmproxy/libmproxy/platform/pf.py rename to mitmproxy/mitmproxy/platform/pf.py diff --git a/mitmproxy/libmproxy/platform/windows.py b/mitmproxy/mitmproxy/platform/windows.py similarity index 100% rename from mitmproxy/libmproxy/platform/windows.py rename to mitmproxy/mitmproxy/platform/windows.py diff --git a/mitmproxy/libmproxy/protocol/__init__.py b/mitmproxy/mitmproxy/protocol/__init__.py similarity index 100% rename from mitmproxy/libmproxy/protocol/__init__.py rename to mitmproxy/mitmproxy/protocol/__init__.py diff --git a/mitmproxy/libmproxy/protocol/base.py b/mitmproxy/mitmproxy/protocol/base.py similarity index 100% rename from mitmproxy/libmproxy/protocol/base.py rename to mitmproxy/mitmproxy/protocol/base.py diff --git a/mitmproxy/libmproxy/protocol/http.py b/mitmproxy/mitmproxy/protocol/http.py similarity index 100% rename from mitmproxy/libmproxy/protocol/http.py rename to mitmproxy/mitmproxy/protocol/http.py diff --git a/mitmproxy/libmproxy/protocol/http1.py b/mitmproxy/mitmproxy/protocol/http1.py similarity index 100% rename from mitmproxy/libmproxy/protocol/http1.py rename to mitmproxy/mitmproxy/protocol/http1.py diff --git a/mitmproxy/libmproxy/protocol/http2.py b/mitmproxy/mitmproxy/protocol/http2.py similarity index 100% rename from mitmproxy/libmproxy/protocol/http2.py rename to mitmproxy/mitmproxy/protocol/http2.py diff --git a/mitmproxy/libmproxy/protocol/http_replay.py b/mitmproxy/mitmproxy/protocol/http_replay.py similarity index 100% rename from mitmproxy/libmproxy/protocol/http_replay.py rename to mitmproxy/mitmproxy/protocol/http_replay.py diff --git a/mitmproxy/libmproxy/protocol/rawtcp.py b/mitmproxy/mitmproxy/protocol/rawtcp.py similarity index 100% rename from mitmproxy/libmproxy/protocol/rawtcp.py rename to mitmproxy/mitmproxy/protocol/rawtcp.py diff --git a/mitmproxy/libmproxy/protocol/tls.py b/mitmproxy/mitmproxy/protocol/tls.py similarity index 100% rename from mitmproxy/libmproxy/protocol/tls.py rename to mitmproxy/mitmproxy/protocol/tls.py diff --git a/mitmproxy/libmproxy/proxy/__init__.py b/mitmproxy/mitmproxy/proxy/__init__.py similarity index 100% rename from mitmproxy/libmproxy/proxy/__init__.py rename to mitmproxy/mitmproxy/proxy/__init__.py diff --git a/mitmproxy/libmproxy/proxy/config.py b/mitmproxy/mitmproxy/proxy/config.py similarity index 100% rename from mitmproxy/libmproxy/proxy/config.py rename to mitmproxy/mitmproxy/proxy/config.py diff --git a/mitmproxy/libmproxy/proxy/modes/__init__.py b/mitmproxy/mitmproxy/proxy/modes/__init__.py similarity index 100% rename from mitmproxy/libmproxy/proxy/modes/__init__.py rename to mitmproxy/mitmproxy/proxy/modes/__init__.py diff --git a/mitmproxy/libmproxy/proxy/modes/http_proxy.py b/mitmproxy/mitmproxy/proxy/modes/http_proxy.py similarity index 100% rename from mitmproxy/libmproxy/proxy/modes/http_proxy.py rename to mitmproxy/mitmproxy/proxy/modes/http_proxy.py diff --git a/mitmproxy/libmproxy/proxy/modes/reverse_proxy.py b/mitmproxy/mitmproxy/proxy/modes/reverse_proxy.py similarity index 100% rename from mitmproxy/libmproxy/proxy/modes/reverse_proxy.py rename to mitmproxy/mitmproxy/proxy/modes/reverse_proxy.py diff --git a/mitmproxy/libmproxy/proxy/modes/socks_proxy.py b/mitmproxy/mitmproxy/proxy/modes/socks_proxy.py similarity index 100% rename from mitmproxy/libmproxy/proxy/modes/socks_proxy.py rename to mitmproxy/mitmproxy/proxy/modes/socks_proxy.py diff --git a/mitmproxy/libmproxy/proxy/modes/transparent_proxy.py b/mitmproxy/mitmproxy/proxy/modes/transparent_proxy.py similarity index 100% rename from mitmproxy/libmproxy/proxy/modes/transparent_proxy.py rename to mitmproxy/mitmproxy/proxy/modes/transparent_proxy.py diff --git a/mitmproxy/libmproxy/proxy/root_context.py b/mitmproxy/mitmproxy/proxy/root_context.py similarity index 100% rename from mitmproxy/libmproxy/proxy/root_context.py rename to mitmproxy/mitmproxy/proxy/root_context.py diff --git a/mitmproxy/libmproxy/proxy/server.py b/mitmproxy/mitmproxy/proxy/server.py similarity index 100% rename from mitmproxy/libmproxy/proxy/server.py rename to mitmproxy/mitmproxy/proxy/server.py diff --git a/mitmproxy/libmproxy/script/__init__.py b/mitmproxy/mitmproxy/script/__init__.py similarity index 100% rename from mitmproxy/libmproxy/script/__init__.py rename to mitmproxy/mitmproxy/script/__init__.py diff --git a/mitmproxy/libmproxy/script/concurrent.py b/mitmproxy/mitmproxy/script/concurrent.py similarity index 100% rename from mitmproxy/libmproxy/script/concurrent.py rename to mitmproxy/mitmproxy/script/concurrent.py diff --git a/mitmproxy/libmproxy/script/reloader.py b/mitmproxy/mitmproxy/script/reloader.py similarity index 100% rename from mitmproxy/libmproxy/script/reloader.py rename to mitmproxy/mitmproxy/script/reloader.py diff --git a/mitmproxy/libmproxy/script/script.py b/mitmproxy/mitmproxy/script/script.py similarity index 100% rename from mitmproxy/libmproxy/script/script.py rename to mitmproxy/mitmproxy/script/script.py diff --git a/mitmproxy/libmproxy/script/script_context.py b/mitmproxy/mitmproxy/script/script_context.py similarity index 100% rename from mitmproxy/libmproxy/script/script_context.py rename to mitmproxy/mitmproxy/script/script_context.py diff --git a/mitmproxy/libmproxy/stateobject.py b/mitmproxy/mitmproxy/stateobject.py similarity index 100% rename from mitmproxy/libmproxy/stateobject.py rename to mitmproxy/mitmproxy/stateobject.py diff --git a/mitmproxy/libmproxy/tnetstring.py b/mitmproxy/mitmproxy/tnetstring.py similarity index 100% rename from mitmproxy/libmproxy/tnetstring.py rename to mitmproxy/mitmproxy/tnetstring.py diff --git a/mitmproxy/libmproxy/utils.py b/mitmproxy/mitmproxy/utils.py similarity index 100% rename from mitmproxy/libmproxy/utils.py rename to mitmproxy/mitmproxy/utils.py diff --git a/mitmproxy/libmproxy/version.py b/mitmproxy/mitmproxy/version.py similarity index 100% rename from mitmproxy/libmproxy/version.py rename to mitmproxy/mitmproxy/version.py diff --git a/mitmproxy/libmproxy/web/__init__.py b/mitmproxy/mitmproxy/web/__init__.py similarity index 100% rename from mitmproxy/libmproxy/web/__init__.py rename to mitmproxy/mitmproxy/web/__init__.py diff --git a/mitmproxy/libmproxy/web/app.py b/mitmproxy/mitmproxy/web/app.py similarity index 100% rename from mitmproxy/libmproxy/web/app.py rename to mitmproxy/mitmproxy/web/app.py diff --git a/mitmproxy/libmproxy/web/static/app.css b/mitmproxy/mitmproxy/web/static/app.css similarity index 100% rename from mitmproxy/libmproxy/web/static/app.css rename to mitmproxy/mitmproxy/web/static/app.css diff --git a/mitmproxy/libmproxy/web/static/app.js b/mitmproxy/mitmproxy/web/static/app.js similarity index 100% rename from mitmproxy/libmproxy/web/static/app.js rename to mitmproxy/mitmproxy/web/static/app.js diff --git a/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.eot b/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.eot similarity index 100% rename from mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.eot rename to mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.eot diff --git a/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.svg b/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.svg similarity index 100% rename from mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.svg rename to mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.svg diff --git a/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.ttf b/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.ttf similarity index 100% rename from mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.ttf rename to mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.ttf diff --git a/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.woff b/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.woff similarity index 100% rename from mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.woff rename to mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.woff diff --git a/mitmproxy/libmproxy/web/static/images/chrome-devtools/LICENSE b/mitmproxy/mitmproxy/web/static/images/chrome-devtools/LICENSE similarity index 100% rename from mitmproxy/libmproxy/web/static/images/chrome-devtools/LICENSE rename to mitmproxy/mitmproxy/web/static/images/chrome-devtools/LICENSE diff --git a/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png b/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png similarity index 100% rename from mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png rename to mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png diff --git a/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png b/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png similarity index 100% rename from mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png rename to mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png diff --git a/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceJSIcon.png b/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceJSIcon.png similarity index 100% rename from mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceJSIcon.png rename to mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceJSIcon.png diff --git a/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png b/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png similarity index 100% rename from mitmproxy/libmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png rename to mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png diff --git a/mitmproxy/libmproxy/web/static/images/resourceExecutableIcon.png b/mitmproxy/mitmproxy/web/static/images/resourceExecutableIcon.png similarity index 100% rename from mitmproxy/libmproxy/web/static/images/resourceExecutableIcon.png rename to mitmproxy/mitmproxy/web/static/images/resourceExecutableIcon.png diff --git a/mitmproxy/libmproxy/web/static/images/resourceFlashIcon.png b/mitmproxy/mitmproxy/web/static/images/resourceFlashIcon.png similarity index 100% rename from mitmproxy/libmproxy/web/static/images/resourceFlashIcon.png rename to mitmproxy/mitmproxy/web/static/images/resourceFlashIcon.png diff --git a/mitmproxy/libmproxy/web/static/images/resourceImageIcon.png b/mitmproxy/mitmproxy/web/static/images/resourceImageIcon.png similarity index 100% rename from mitmproxy/libmproxy/web/static/images/resourceImageIcon.png rename to mitmproxy/mitmproxy/web/static/images/resourceImageIcon.png diff --git a/mitmproxy/libmproxy/web/static/images/resourceJavaIcon.png b/mitmproxy/mitmproxy/web/static/images/resourceJavaIcon.png similarity index 100% rename from mitmproxy/libmproxy/web/static/images/resourceJavaIcon.png rename to mitmproxy/mitmproxy/web/static/images/resourceJavaIcon.png diff --git a/mitmproxy/libmproxy/web/static/images/resourceNotModifiedIcon.png b/mitmproxy/mitmproxy/web/static/images/resourceNotModifiedIcon.png similarity index 100% rename from mitmproxy/libmproxy/web/static/images/resourceNotModifiedIcon.png rename to mitmproxy/mitmproxy/web/static/images/resourceNotModifiedIcon.png diff --git a/mitmproxy/libmproxy/web/static/images/resourceRedirectIcon.png b/mitmproxy/mitmproxy/web/static/images/resourceRedirectIcon.png similarity index 100% rename from mitmproxy/libmproxy/web/static/images/resourceRedirectIcon.png rename to mitmproxy/mitmproxy/web/static/images/resourceRedirectIcon.png diff --git a/mitmproxy/libmproxy/web/static/vendor.css b/mitmproxy/mitmproxy/web/static/vendor.css similarity index 100% rename from mitmproxy/libmproxy/web/static/vendor.css rename to mitmproxy/mitmproxy/web/static/vendor.css diff --git a/mitmproxy/libmproxy/web/static/vendor.js b/mitmproxy/mitmproxy/web/static/vendor.js similarity index 100% rename from mitmproxy/libmproxy/web/static/vendor.js rename to mitmproxy/mitmproxy/web/static/vendor.js diff --git a/mitmproxy/libmproxy/web/templates/index.html b/mitmproxy/mitmproxy/web/templates/index.html similarity index 100% rename from mitmproxy/libmproxy/web/templates/index.html rename to mitmproxy/mitmproxy/web/templates/index.html diff --git a/mitmproxy/libmproxy/webfonts/fontawesome-webfont.eot b/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.eot similarity index 100% rename from mitmproxy/libmproxy/webfonts/fontawesome-webfont.eot rename to mitmproxy/mitmproxy/webfonts/fontawesome-webfont.eot diff --git a/mitmproxy/libmproxy/webfonts/fontawesome-webfont.svg b/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.svg similarity index 100% rename from mitmproxy/libmproxy/webfonts/fontawesome-webfont.svg rename to mitmproxy/mitmproxy/webfonts/fontawesome-webfont.svg diff --git a/mitmproxy/libmproxy/webfonts/fontawesome-webfont.ttf b/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.ttf similarity index 100% rename from mitmproxy/libmproxy/webfonts/fontawesome-webfont.ttf rename to mitmproxy/mitmproxy/webfonts/fontawesome-webfont.ttf diff --git a/mitmproxy/libmproxy/webfonts/fontawesome-webfont.woff b/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.woff similarity index 100% rename from mitmproxy/libmproxy/webfonts/fontawesome-webfont.woff rename to mitmproxy/mitmproxy/webfonts/fontawesome-webfont.woff