From 33fa49277a821b9d38e8c9bf0bcf2adcfa2f6f04 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 15 Feb 2016 14:58:46 +0100 Subject: [PATCH] move mitmproxy --- .appveyor.yml => mitmproxy/.appveyor.yml | 0 .coveragerc => mitmproxy/.coveragerc | 0 .dockerignore => mitmproxy/.dockerignore | 0 .env => mitmproxy/.env | 0 .gitattributes => mitmproxy/.gitattributes | 0 .gitignore => mitmproxy/.gitignore | 0 .landscape.yml => mitmproxy/.landscape.yml | 0 .travis.yml => mitmproxy/.travis.yml | 0 CHANGELOG => mitmproxy/CHANGELOG | 0 CONTRIBUTING.md => mitmproxy/CONTRIBUTING.md | 0 CONTRIBUTORS => mitmproxy/CONTRIBUTORS | 0 Dockerfile => mitmproxy/Dockerfile | 0 LICENSE => mitmproxy/LICENSE | 0 MANIFEST.in => mitmproxy/MANIFEST.in | 0 README.rst => mitmproxy/README.rst | 0 dev => mitmproxy/dev | 0 dev.bat => mitmproxy/dev.bat | 0 {docs => mitmproxy/docs}/.gitignore | 0 {docs => mitmproxy/docs}/Makefile | 0 {docs => mitmproxy/docs}/_templates/page.html | 0 {docs => mitmproxy/docs}/certinstall-webapp.png | Bin {docs => mitmproxy/docs}/certinstall.rst | 0 {docs => mitmproxy/docs}/conf.py | 0 {docs => mitmproxy/docs}/config.rst | 0 {docs => mitmproxy/docs}/custom-routing.txt | 0 {docs => mitmproxy/docs}/dev/addingviews.html | 0 {docs => mitmproxy/docs}/dev/architecture.rst | 0 {docs => mitmproxy/docs}/dev/exceptions.rst | 0 {docs => mitmproxy/docs}/dev/models.rst | 0 {docs => mitmproxy/docs}/dev/protocols.rst | 0 {docs => mitmproxy/docs}/dev/proxy.rst | 0 {docs => mitmproxy/docs}/dev/sslkeylogfile.rst | 0 {docs => mitmproxy/docs}/dev/testing.rst | 0 {docs => mitmproxy/docs}/favicon.ico | Bin {docs => mitmproxy/docs}/features/anticache.rst | 0 {docs => mitmproxy/docs}/features/clientreplay.rst | 0 {docs => mitmproxy/docs}/features/filters.rst | 0 {docs => mitmproxy/docs}/features/passthrough.rst | 0 {docs => mitmproxy/docs}/features/proxyauth.rst | 0 {docs => mitmproxy/docs}/features/replacements.rst | 0 .../docs}/features/responsestreaming.rst | 0 {docs => mitmproxy/docs}/features/reverseproxy.rst | 0 {docs => mitmproxy/docs}/features/serverreplay.rst | 0 {docs => mitmproxy/docs}/features/setheaders.rst | 0 {docs => mitmproxy/docs}/features/socksproxy.rst | 0 {docs => mitmproxy/docs}/features/sticky.rst | 0 {docs => mitmproxy/docs}/features/tcpproxy.rst | 0 {docs => mitmproxy/docs}/features/upstreamcerts.rst | 0 {docs => mitmproxy/docs}/features/upstreamproxy.rst | 0 {docs => mitmproxy/docs}/howmitmproxy.rst | 0 {docs => mitmproxy/docs}/index.rst | 0 {docs => mitmproxy/docs}/install.rst | 0 {docs => mitmproxy/docs}/introduction.rst | 0 {docs => mitmproxy/docs}/mitmdump.rst | 0 {docs => mitmproxy/docs}/mitmproxy-docs.png | Bin {docs => mitmproxy/docs}/mitmproxy-long.png | Bin {docs => mitmproxy/docs}/mitmproxy.rst | 0 {docs => mitmproxy/docs}/modes.rst | 0 .../docs}/schematics/_explicit.graffle/data.plist | 0 .../docs}/schematics/_explicit.graffle/image3.icns | Bin .../docs}/schematics/_explicit.graffle/image6.tiff | Bin .../schematics/_explicit_https.graffle/data.plist | 0 .../schematics/_explicit_https.graffle/image3.icns | Bin .../schematics/_explicit_https.graffle/image6.tiff | Bin .../schematics/_transparent.graffle/data.plist | 0 .../schematics/_transparent.graffle/image3.icns | Bin .../schematics/_transparent.graffle/image6.tiff | Bin .../_transparent_https.graffle/data.plist | 0 .../_transparent_https.graffle/image3.icns | Bin .../_transparent_https.graffle/image6.tiff | Bin .../docs}/schematics/architecture.pdf | Bin .../docs}/schematics/architecture.png | Bin .../docs}/schematics/architecture.vsdx | Bin .../how-mitmproxy-works-explicit-https.png | Bin .../schematics/how-mitmproxy-works-explicit.png | Bin .../how-mitmproxy-works-transparent-https.png | Bin .../schematics/how-mitmproxy-works-transparent.png | Bin .../docs}/schematics/proxy-modes-flowchart.png | Bin .../docs}/schematics/proxy-modes-regular.png | Bin .../docs}/schematics/proxy-modes-reverse.png | Bin .../docs}/schematics/proxy-modes-transparent-1.png | Bin .../docs}/schematics/proxy-modes-transparent-2.png | Bin .../docs}/schematics/proxy-modes-transparent-3.png | Bin .../schematics/proxy-modes-transparent-wrong.png | Bin .../docs}/schematics/proxy-modes-upstream.png | Bin {docs => mitmproxy/docs}/schematics/proxy-modes.pdf | Bin .../docs}/schematics/proxy-modes.vsdx | Bin .../docs}/screenshots/firefox3-import.jpg | Bin .../docs}/screenshots/firefox3-trust.jpg | Bin {docs => mitmproxy/docs}/screenshots/firefox3.jpg | Bin .../docs}/screenshots/ios-gateway.png | Bin .../docs}/screenshots/ios-installed.png | Bin {docs => mitmproxy/docs}/screenshots/ios-manual.png | Bin .../docs}/screenshots/ios-profile.png | Bin .../docs}/screenshots/ios-reverse.png | Bin .../docs}/screenshots/ios-warning.png | Bin .../docs}/screenshots/mitmproxy-flowview.png | Bin .../docs}/screenshots/mitmproxy-intercept-filt.png | Bin .../docs}/screenshots/mitmproxy-intercept-mid.png | Bin .../screenshots/mitmproxy-intercept-options.png | Bin .../screenshots/mitmproxy-intercept-result.png | Bin .../screenshots/mitmproxy-kveditor-editmode.png | Bin .../docs}/screenshots/mitmproxy-kveditor.png | Bin {docs => mitmproxy/docs}/screenshots/mitmproxy.png | Bin .../docs}/screenshots/osx-addcert-alwaystrust.png | Bin .../screenshots/win7-certstore-trustedroot.png | Bin .../docs}/screenshots/win7-certstore.png | Bin .../docs}/screenshots/win7-wizard.png | Bin .../docs}/screenshots/winpythoninstaller.jpg | Bin .../docs}/scripting/inlinescripts.rst | 0 {docs => mitmproxy/docs}/scripting/libmproxy.rst | 0 {docs => mitmproxy/docs}/transparent.rst | 0 {docs => mitmproxy/docs}/transparent/linux.rst | 0 {docs => mitmproxy/docs}/transparent/osx.rst | 0 {docs => mitmproxy/docs}/tutorials/30second.rst | 0 {docs => mitmproxy/docs}/tutorials/gamecenter.rst | 0 {docs => mitmproxy/docs}/tutorials/leaderboard.png | Bin {docs => mitmproxy/docs}/tutorials/one.png | Bin {docs => mitmproxy/docs}/tutorials/supermega.png | Bin .../docs}/tutorials/transparent-dhcp.rst | 0 .../tutorials/transparent-dhcp/step1_proxy.png | Bin .../tutorials/transparent-dhcp/step1_vbox_eth0.png | Bin .../tutorials/transparent-dhcp/step1_vbox_eth1.png | Bin .../tutorials/transparent-dhcp/step2_proxied_vm.png | Bin {examples => mitmproxy/examples}/README | 0 {examples => mitmproxy/examples}/add_header.py | 0 .../examples}/change_upstream_proxy.py | 0 .../examples}/custom_contentviews.py | 0 {examples => mitmproxy/examples}/dns_spoofing.py | 0 {examples => mitmproxy/examples}/dup_and_replay.py | 0 {examples => mitmproxy/examples}/filt.py | 0 {examples => mitmproxy/examples}/flowbasic | 0 {examples => mitmproxy/examples}/flowwriter.py | 0 {examples => mitmproxy/examples}/har_extractor.py | 0 {examples => mitmproxy/examples}/iframe_injector.py | 0 .../examples}/mitmproxywrapper.py | 0 {examples => mitmproxy/examples}/modify_form.py | 0 .../examples}/modify_querystring.py | 0 .../examples}/modify_response_body.py | 0 {examples => mitmproxy/examples}/nonblocking.py | 0 {examples => mitmproxy/examples}/proxapp.py | 0 {examples => mitmproxy/examples}/read_dumpfile | 0 .../examples}/redirect_requests.py | 0 {examples => mitmproxy/examples}/sslstrip.py | 0 {examples => mitmproxy/examples}/stickycookies | 0 {examples => mitmproxy/examples}/stream.py | 0 {examples => mitmproxy/examples}/stream_modify.py | 0 {examples => mitmproxy/examples}/stub.py | 0 {examples => mitmproxy/examples}/tcp_message.py | 0 {examples => mitmproxy/examples}/tls_passthrough.py | 0 .../examples}/upsidedownternet.py | 0 {libmproxy => mitmproxy/libmproxy}/__init__.py | 0 {libmproxy => mitmproxy/libmproxy}/cmdline.py | 0 .../libmproxy}/console/__init__.py | 0 .../libmproxy}/console/common.py | 0 .../libmproxy}/console/flowdetailview.py | 0 .../libmproxy}/console/flowlist.py | 0 .../libmproxy}/console/flowview.py | 0 .../libmproxy}/console/grideditor.py | 0 {libmproxy => mitmproxy/libmproxy}/console/help.py | 0 .../libmproxy}/console/options.py | 0 .../libmproxy}/console/palettepicker.py | 0 .../libmproxy}/console/palettes.py | 0 .../libmproxy}/console/pathedit.py | 0 .../libmproxy}/console/searchable.py | 0 .../libmproxy}/console/select.py | 0 .../libmproxy}/console/signals.py | 0 .../libmproxy}/console/statusbar.py | 0 {libmproxy => mitmproxy/libmproxy}/console/tabs.py | 0 .../libmproxy}/console/window.py | 0 {libmproxy => mitmproxy/libmproxy}/contentviews.py | 0 {libmproxy => mitmproxy/libmproxy}/contrib/README | 0 .../libmproxy}/contrib/__init__.py | 0 .../libmproxy}/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 .../libmproxy}/contrib/tls/__init__.py | 0 .../libmproxy}/contrib/tls/_constructs.py | 0 .../libmproxy}/contrib/tls/utils.py | 0 .../libmproxy}/contrib/wbxml/ASCommandResponse.py | 0 .../libmproxy}/contrib/wbxml/ASWBXML.py | 0 .../libmproxy}/contrib/wbxml/ASWBXMLByteQueue.py | 0 .../libmproxy}/contrib/wbxml/ASWBXMLCodePage.py | 0 .../libmproxy}/contrib/wbxml/GlobalTokens.py | 0 .../contrib/wbxml/InvalidDataException.py | 0 .../libmproxy}/contrib/wbxml/__init__.py | 0 {libmproxy => mitmproxy/libmproxy}/controller.py | 0 {libmproxy => mitmproxy/libmproxy}/dump.py | 0 {libmproxy => mitmproxy/libmproxy}/exceptions.py | 0 {libmproxy => mitmproxy/libmproxy}/filt.py | 0 {libmproxy => mitmproxy/libmproxy}/flow.py | 0 {libmproxy => mitmproxy/libmproxy}/flow_export.py | 0 .../libmproxy}/flow_format_compat.py | 0 {libmproxy => mitmproxy/libmproxy}/main.py | 0 .../libmproxy}/models/__init__.py | 0 .../libmproxy}/models/connections.py | 0 {libmproxy => mitmproxy/libmproxy}/models/flow.py | 0 {libmproxy => mitmproxy/libmproxy}/models/http.py | 0 .../libmproxy}/onboarding/__init__.py | 0 .../libmproxy}/onboarding/app.py | 0 .../libmproxy}/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 .../libmproxy}/onboarding/static/mitmproxy.css | 0 .../libmproxy}/onboarding/templates/frame.html | 0 .../libmproxy}/onboarding/templates/index.html | 0 .../libmproxy}/onboarding/templates/layout.html | 0 .../libmproxy}/platform/__init__.py | 0 .../libmproxy}/platform/linux.py | 0 {libmproxy => mitmproxy/libmproxy}/platform/osx.py | 0 {libmproxy => mitmproxy/libmproxy}/platform/pf.py | 0 .../libmproxy}/platform/windows.py | 0 .../libmproxy}/protocol/__init__.py | 0 {libmproxy => mitmproxy/libmproxy}/protocol/base.py | 0 {libmproxy => mitmproxy/libmproxy}/protocol/http.py | 0 .../libmproxy}/protocol/http1.py | 0 .../libmproxy}/protocol/http2.py | 0 .../libmproxy}/protocol/http_replay.py | 0 .../libmproxy}/protocol/rawtcp.py | 0 {libmproxy => mitmproxy/libmproxy}/protocol/tls.py | 0 .../libmproxy}/proxy/__init__.py | 0 {libmproxy => mitmproxy/libmproxy}/proxy/config.py | 0 .../libmproxy}/proxy/modes/__init__.py | 0 .../libmproxy}/proxy/modes/http_proxy.py | 0 .../libmproxy}/proxy/modes/reverse_proxy.py | 0 .../libmproxy}/proxy/modes/socks_proxy.py | 0 .../libmproxy}/proxy/modes/transparent_proxy.py | 0 .../libmproxy}/proxy/root_context.py | 0 {libmproxy => mitmproxy/libmproxy}/proxy/server.py | 0 .../libmproxy}/script/__init__.py | 0 .../libmproxy}/script/concurrent.py | 0 .../libmproxy}/script/reloader.py | 0 {libmproxy => mitmproxy/libmproxy}/script/script.py | 0 .../libmproxy}/script/script_context.py | 0 {libmproxy => mitmproxy/libmproxy}/stateobject.py | 0 {libmproxy => mitmproxy/libmproxy}/tnetstring.py | 0 {libmproxy => mitmproxy/libmproxy}/utils.py | 0 {libmproxy => mitmproxy/libmproxy}/version.py | 0 {libmproxy => mitmproxy/libmproxy}/web/__init__.py | 0 {libmproxy => mitmproxy/libmproxy}/web/app.py | 0 .../libmproxy}/web/static/app.css | 0 .../libmproxy}/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}/web/static/vendor.css | 0 .../libmproxy}/web/static/vendor.js | 0 .../libmproxy}/web/templates/index.html | 0 .../libmproxy}/webfonts/fontawesome-webfont.eot | Bin .../libmproxy}/webfonts/fontawesome-webfont.svg | 0 .../libmproxy}/webfonts/fontawesome-webfont.ttf | Bin .../libmproxy}/webfonts/fontawesome-webfont.woff | Bin mitmdump => mitmproxy/mitmdump | 0 mitmproxy => mitmproxy/mitmproxy | 0 mitmweb => mitmproxy/mitmweb | 0 {release => mitmproxy/release}/mitmdump.spec | 0 {release => mitmproxy/release}/mitmproxy.spec | 0 {release => mitmproxy/release}/mitmweb.spec | 0 requirements.txt => mitmproxy/requirements.txt | 0 setup.cfg => mitmproxy/setup.cfg | 0 setup.py => mitmproxy/setup.py | 0 {test => mitmproxy/test}/__init__.py | 0 {test => mitmproxy/test}/completion/aaa | 0 {test => mitmproxy/test}/completion/aab | 0 {test => mitmproxy/test}/completion/aac | 0 {test => mitmproxy/test}/data/1.css | 0 {test => mitmproxy/test}/data/amf01 | Bin {test => mitmproxy/test}/data/amf02 | Bin {test => mitmproxy/test}/data/amf03 | Bin {test => mitmproxy/test}/data/clientcert/.gitignore | 0 .../test}/data/clientcert/127.0.0.1.pem | 0 {test => mitmproxy/test}/data/clientcert/client.cnf | 0 {test => mitmproxy/test}/data/clientcert/client.pem | 0 {test => mitmproxy/test}/data/clientcert/make | 0 .../test}/data/confdir/mitmproxy-ca-cert.cer | 0 .../test}/data/confdir/mitmproxy-ca-cert.p12 | Bin .../test}/data/confdir/mitmproxy-ca-cert.pem | 0 .../test}/data/confdir/mitmproxy-ca.pem | 0 {test => mitmproxy/test}/data/dercert | Bin {test => mitmproxy/test}/data/dumpfile-012 | 0 {test => mitmproxy/test}/data/dumpfile-013 | 0 {test => mitmproxy/test}/data/htpasswd | 0 {test => mitmproxy/test}/data/htpasswd.invalid | 0 {test => mitmproxy/test}/data/image-err1.jpg | Bin {test => mitmproxy/test}/data/image.gif | Bin {test => mitmproxy/test}/data/image.ico | Bin {test => mitmproxy/test}/data/image.jpg | Bin {test => mitmproxy/test}/data/image.png | Bin {test => mitmproxy/test}/data/no_common_name.pem | 0 {test => mitmproxy/test}/data/pf01 | 0 {test => mitmproxy/test}/data/pf02 | 0 {test => mitmproxy/test}/data/protobuf01 | 0 {test => mitmproxy/test}/data/replace | 0 {test => mitmproxy/test}/data/testkey.pem | 0 .../test}/data/trusted-cadir/8117bdb9.0 | 0 .../test}/data/trusted-cadir/9d45e6a9.0 | 0 .../test}/data/trusted-cadir/trusted-ca.pem | 0 {test => mitmproxy/test}/data/trusted-server.crt | 0 {test => mitmproxy/test}/data/untrusted-server.crt | 0 {test => mitmproxy/test}/fuzzing/.env | 0 {test => mitmproxy/test}/fuzzing/README | 0 {test => mitmproxy/test}/fuzzing/client_patterns | 0 {test => mitmproxy/test}/fuzzing/go_proxy | 0 {test => mitmproxy/test}/fuzzing/reverse_patterns | 0 {test => mitmproxy/test}/fuzzing/straight_stream | 0 .../test}/fuzzing/straight_stream_patterns | 0 .../test}/fuzzing/straight_stream_ssl | 0 {test => mitmproxy/test}/mock_urwid.py | 0 {test => mitmproxy/test}/scripts/a.py | 0 {test => mitmproxy/test}/scripts/a_helper.py | 0 {test => mitmproxy/test}/scripts/all.py | 0 .../test}/scripts/concurrent_decorator.py | 0 .../test}/scripts/concurrent_decorator_err.py | 0 {test => mitmproxy/test}/scripts/duplicate_flow.py | 0 {test => mitmproxy/test}/scripts/loaderr.py | 0 {test => mitmproxy/test}/scripts/reqerr.py | 0 {test => mitmproxy/test}/scripts/starterr.py | 0 {test => mitmproxy/test}/scripts/stream_modify.py | 0 {test => mitmproxy/test}/scripts/syntaxerr.py | 0 .../test}/scripts/tcp_stream_modify.py | 0 {test => mitmproxy/test}/scripts/unloaderr.py | 0 {test => mitmproxy/test}/test_app.py | 0 {test => mitmproxy/test}/test_cmdline.py | 0 {test => mitmproxy/test}/test_console.py | 0 {test => mitmproxy/test}/test_console_common.py | 0 {test => mitmproxy/test}/test_console_help.py | 0 {test => mitmproxy/test}/test_console_palettes.py | 0 {test => mitmproxy/test}/test_console_pathedit.py | 0 {test => mitmproxy/test}/test_contentview.py | 0 {test => mitmproxy/test}/test_controller.py | 0 {test => mitmproxy/test}/test_custom_contentview.py | 0 {test => mitmproxy/test}/test_dump.py | 0 {test => mitmproxy/test}/test_examples.py | 0 {test => mitmproxy/test}/test_filt.py | 0 {test => mitmproxy/test}/test_flow.py | 0 {test => mitmproxy/test}/test_flow_export.py | 0 {test => mitmproxy/test}/test_flow_format_compat.py | 0 {test => mitmproxy/test}/test_fuzzing.py | 0 {test => mitmproxy/test}/test_platform_pf.py | 0 {test => mitmproxy/test}/test_protocol_http1.py | 0 {test => mitmproxy/test}/test_protocol_http2.py | 0 {test => mitmproxy/test}/test_proxy.py | 0 {test => mitmproxy/test}/test_script.py | 0 {test => mitmproxy/test}/test_server.py | 0 {test => mitmproxy/test}/test_utils.py | 0 {test => mitmproxy/test}/tools/1024example | 0 {test => mitmproxy/test}/tools/ab.exe | Bin {test => mitmproxy/test}/tools/bench.py | 0 {test => mitmproxy/test}/tools/benchtool.py | 0 {test => mitmproxy/test}/tools/getcert | 0 {test => mitmproxy/test}/tools/inspect_dumpfile.py | 0 {test => mitmproxy/test}/tools/memoryleak.py | 0 {test => mitmproxy/test}/tools/passive_close.py | 0 {test => mitmproxy/test}/tools/testpatt | 0 {test => mitmproxy/test}/tservers.py | 0 {test => mitmproxy/test}/tutils.py | 0 {web => mitmproxy/web}/.bowerrc | 0 {web => mitmproxy/web}/.eslintrc | 0 {web => mitmproxy/web}/README | 0 {web => mitmproxy/web}/conf.js | 0 {web => mitmproxy/web}/gulpfile.js | 0 {web => mitmproxy/web}/package.json | 0 {web => mitmproxy/web}/src/css/app.less | 0 {web => mitmproxy/web}/src/css/eventlog.less | 0 {web => mitmproxy/web}/src/css/flowdetail.less | 0 {web => mitmproxy/web}/src/css/flowtable.less | 0 {web => mitmproxy/web}/src/css/flowview.less | 0 {web => mitmproxy/web}/src/css/footer.less | 0 {web => mitmproxy/web}/src/css/header.less | 0 {web => mitmproxy/web}/src/css/layout.less | 0 {web => mitmproxy/web}/src/css/prompt.less | 0 {web => mitmproxy/web}/src/css/sprites.less | 0 {web => mitmproxy/web}/src/css/tabs.less | 0 .../web}/src/css/vendor-bootstrap-variables.less | 0 .../web}/src/css/vendor-bootstrap.less | 0 {web => mitmproxy/web}/src/css/vendor.less | 0 {web => mitmproxy/web}/src/fonts/FontAwesome.otf | Bin {web => mitmproxy/web}/src/fonts/README | 0 {web => mitmproxy/web}/src/fonts/font-awesome.css | 0 .../web}/src/fonts/fontawesome-webfont.eot | Bin .../web}/src/fonts/fontawesome-webfont.svg | 0 .../web}/src/fonts/fontawesome-webfont.ttf | Bin .../web}/src/fonts/fontawesome-webfont.woff | Bin .../web}/src/images/chrome-devtools/LICENSE | 0 .../src/images/chrome-devtools/resourceCSSIcon.png | Bin .../images/chrome-devtools/resourceDocumentIcon.png | Bin .../src/images/chrome-devtools/resourceJSIcon.png | Bin .../images/chrome-devtools/resourcePlainIcon.png | Bin .../web}/src/images/resourceExecutableIcon.png | Bin .../web}/src/images/resourceFlashIcon.png | Bin .../web}/src/images/resourceImageIcon.png | Bin .../web}/src/images/resourceJavaIcon.png | Bin .../web}/src/images/resourceNotModifiedIcon.png | Bin .../web}/src/images/resourceRedirectIcon.png | Bin {web => mitmproxy/web}/src/js/actions.js | 0 {web => mitmproxy/web}/src/js/app.js | 0 {web => mitmproxy/web}/src/js/components/common.js | 0 {web => mitmproxy/web}/src/js/components/editor.js | 0 .../web}/src/js/components/eventlog.js | 0 .../web}/src/js/components/flowtable-columns.js | 0 .../web}/src/js/components/flowtable.js | 0 .../web}/src/js/components/flowview/contentview.js | 0 .../web}/src/js/components/flowview/details.js | 0 .../web}/src/js/components/flowview/index.js | 0 .../web}/src/js/components/flowview/messages.js | 0 .../web}/src/js/components/flowview/nav.js | 0 {web => mitmproxy/web}/src/js/components/footer.js | 0 {web => mitmproxy/web}/src/js/components/header.js | 0 .../web}/src/js/components/mainview.js | 0 {web => mitmproxy/web}/src/js/components/prompt.js | 0 .../web}/src/js/components/proxyapp.js | 0 .../web}/src/js/components/virtualscroll.js | 0 {web => mitmproxy/web}/src/js/connection.js | 0 {web => mitmproxy/web}/src/js/dispatcher.js | 0 {web => mitmproxy/web}/src/js/filt/filt.js | 0 {web => mitmproxy/web}/src/js/filt/filt.peg | 0 {web => mitmproxy/web}/src/js/flow/utils.js | 0 {web => mitmproxy/web}/src/js/store/store.js | 0 {web => mitmproxy/web}/src/js/store/view.js | 0 {web => mitmproxy/web}/src/js/tests/utils.js | 0 {web => mitmproxy/web}/src/js/utils.js | 0 {web => mitmproxy/web}/src/templates/index.html | 0 444 files changed, 0 insertions(+), 0 deletions(-) rename .appveyor.yml => mitmproxy/.appveyor.yml (100%) rename .coveragerc => mitmproxy/.coveragerc (100%) rename .dockerignore => mitmproxy/.dockerignore (100%) rename .env => mitmproxy/.env (100%) rename .gitattributes => mitmproxy/.gitattributes (100%) rename .gitignore => mitmproxy/.gitignore (100%) rename .landscape.yml => mitmproxy/.landscape.yml (100%) rename .travis.yml => mitmproxy/.travis.yml (100%) rename CHANGELOG => mitmproxy/CHANGELOG (100%) rename CONTRIBUTING.md => mitmproxy/CONTRIBUTING.md (100%) rename CONTRIBUTORS => mitmproxy/CONTRIBUTORS (100%) rename Dockerfile => mitmproxy/Dockerfile (100%) rename LICENSE => mitmproxy/LICENSE (100%) rename MANIFEST.in => mitmproxy/MANIFEST.in (100%) rename README.rst => mitmproxy/README.rst (100%) rename dev => mitmproxy/dev (100%) mode change 100755 => 100644 rename dev.bat => mitmproxy/dev.bat (100%) rename {docs => mitmproxy/docs}/.gitignore (100%) rename {docs => mitmproxy/docs}/Makefile (100%) rename {docs => mitmproxy/docs}/_templates/page.html (100%) rename {docs => mitmproxy/docs}/certinstall-webapp.png (100%) rename {docs => mitmproxy/docs}/certinstall.rst (100%) rename {docs => mitmproxy/docs}/conf.py (100%) rename {docs => mitmproxy/docs}/config.rst (100%) rename {docs => mitmproxy/docs}/custom-routing.txt (100%) rename {docs => mitmproxy/docs}/dev/addingviews.html (100%) rename {docs => mitmproxy/docs}/dev/architecture.rst (100%) rename {docs => mitmproxy/docs}/dev/exceptions.rst (100%) rename {docs => mitmproxy/docs}/dev/models.rst (100%) rename {docs => mitmproxy/docs}/dev/protocols.rst (100%) rename {docs => mitmproxy/docs}/dev/proxy.rst (100%) rename {docs => mitmproxy/docs}/dev/sslkeylogfile.rst (100%) rename {docs => mitmproxy/docs}/dev/testing.rst (100%) rename {docs => mitmproxy/docs}/favicon.ico (100%) rename {docs => mitmproxy/docs}/features/anticache.rst (100%) rename {docs => mitmproxy/docs}/features/clientreplay.rst (100%) rename {docs => mitmproxy/docs}/features/filters.rst (100%) rename {docs => mitmproxy/docs}/features/passthrough.rst (100%) rename {docs => mitmproxy/docs}/features/proxyauth.rst (100%) rename {docs => mitmproxy/docs}/features/replacements.rst (100%) rename {docs => mitmproxy/docs}/features/responsestreaming.rst (100%) rename {docs => mitmproxy/docs}/features/reverseproxy.rst (100%) rename {docs => mitmproxy/docs}/features/serverreplay.rst (100%) rename {docs => mitmproxy/docs}/features/setheaders.rst (100%) rename {docs => mitmproxy/docs}/features/socksproxy.rst (100%) rename {docs => mitmproxy/docs}/features/sticky.rst (100%) rename {docs => mitmproxy/docs}/features/tcpproxy.rst (100%) rename {docs => mitmproxy/docs}/features/upstreamcerts.rst (100%) rename {docs => mitmproxy/docs}/features/upstreamproxy.rst (100%) rename {docs => mitmproxy/docs}/howmitmproxy.rst (100%) rename {docs => mitmproxy/docs}/index.rst (100%) rename {docs => mitmproxy/docs}/install.rst (100%) rename {docs => mitmproxy/docs}/introduction.rst (100%) rename {docs => mitmproxy/docs}/mitmdump.rst (100%) rename {docs => mitmproxy/docs}/mitmproxy-docs.png (100%) rename {docs => mitmproxy/docs}/mitmproxy-long.png (100%) rename {docs => mitmproxy/docs}/mitmproxy.rst (100%) rename {docs => mitmproxy/docs}/modes.rst (100%) rename {docs => mitmproxy/docs}/schematics/_explicit.graffle/data.plist (100%) rename {docs => mitmproxy/docs}/schematics/_explicit.graffle/image3.icns (100%) rename {docs => mitmproxy/docs}/schematics/_explicit.graffle/image6.tiff (100%) rename {docs => mitmproxy/docs}/schematics/_explicit_https.graffle/data.plist (100%) rename {docs => mitmproxy/docs}/schematics/_explicit_https.graffle/image3.icns (100%) rename {docs => mitmproxy/docs}/schematics/_explicit_https.graffle/image6.tiff (100%) rename {docs => mitmproxy/docs}/schematics/_transparent.graffle/data.plist (100%) rename {docs => mitmproxy/docs}/schematics/_transparent.graffle/image3.icns (100%) rename {docs => mitmproxy/docs}/schematics/_transparent.graffle/image6.tiff (100%) rename {docs => mitmproxy/docs}/schematics/_transparent_https.graffle/data.plist (100%) rename {docs => mitmproxy/docs}/schematics/_transparent_https.graffle/image3.icns (100%) rename {docs => mitmproxy/docs}/schematics/_transparent_https.graffle/image6.tiff (100%) rename {docs => mitmproxy/docs}/schematics/architecture.pdf (100%) rename {docs => mitmproxy/docs}/schematics/architecture.png (100%) rename {docs => mitmproxy/docs}/schematics/architecture.vsdx (100%) rename {docs => mitmproxy/docs}/schematics/how-mitmproxy-works-explicit-https.png (100%) rename {docs => mitmproxy/docs}/schematics/how-mitmproxy-works-explicit.png (100%) rename {docs => mitmproxy/docs}/schematics/how-mitmproxy-works-transparent-https.png (100%) rename {docs => mitmproxy/docs}/schematics/how-mitmproxy-works-transparent.png (100%) rename {docs => mitmproxy/docs}/schematics/proxy-modes-flowchart.png (100%) rename {docs => mitmproxy/docs}/schematics/proxy-modes-regular.png (100%) rename {docs => mitmproxy/docs}/schematics/proxy-modes-reverse.png (100%) rename {docs => mitmproxy/docs}/schematics/proxy-modes-transparent-1.png (100%) rename {docs => mitmproxy/docs}/schematics/proxy-modes-transparent-2.png (100%) rename {docs => mitmproxy/docs}/schematics/proxy-modes-transparent-3.png (100%) rename {docs => mitmproxy/docs}/schematics/proxy-modes-transparent-wrong.png (100%) rename {docs => mitmproxy/docs}/schematics/proxy-modes-upstream.png (100%) rename {docs => mitmproxy/docs}/schematics/proxy-modes.pdf (100%) rename {docs => mitmproxy/docs}/schematics/proxy-modes.vsdx (100%) rename {docs => mitmproxy/docs}/screenshots/firefox3-import.jpg (100%) rename {docs => mitmproxy/docs}/screenshots/firefox3-trust.jpg (100%) rename {docs => mitmproxy/docs}/screenshots/firefox3.jpg (100%) rename {docs => mitmproxy/docs}/screenshots/ios-gateway.png (100%) rename {docs => mitmproxy/docs}/screenshots/ios-installed.png (100%) rename {docs => mitmproxy/docs}/screenshots/ios-manual.png (100%) rename {docs => mitmproxy/docs}/screenshots/ios-profile.png (100%) rename {docs => mitmproxy/docs}/screenshots/ios-reverse.png (100%) rename {docs => mitmproxy/docs}/screenshots/ios-warning.png (100%) rename {docs => mitmproxy/docs}/screenshots/mitmproxy-flowview.png (100%) rename {docs => mitmproxy/docs}/screenshots/mitmproxy-intercept-filt.png (100%) rename {docs => mitmproxy/docs}/screenshots/mitmproxy-intercept-mid.png (100%) rename {docs => mitmproxy/docs}/screenshots/mitmproxy-intercept-options.png (100%) rename {docs => mitmproxy/docs}/screenshots/mitmproxy-intercept-result.png (100%) rename {docs => mitmproxy/docs}/screenshots/mitmproxy-kveditor-editmode.png (100%) rename {docs => mitmproxy/docs}/screenshots/mitmproxy-kveditor.png (100%) rename {docs => mitmproxy/docs}/screenshots/mitmproxy.png (100%) rename {docs => mitmproxy/docs}/screenshots/osx-addcert-alwaystrust.png (100%) rename {docs => mitmproxy/docs}/screenshots/win7-certstore-trustedroot.png (100%) rename {docs => mitmproxy/docs}/screenshots/win7-certstore.png (100%) rename {docs => mitmproxy/docs}/screenshots/win7-wizard.png (100%) rename {docs => mitmproxy/docs}/screenshots/winpythoninstaller.jpg (100%) rename {docs => mitmproxy/docs}/scripting/inlinescripts.rst (100%) rename {docs => mitmproxy/docs}/scripting/libmproxy.rst (100%) rename {docs => mitmproxy/docs}/transparent.rst (100%) rename {docs => mitmproxy/docs}/transparent/linux.rst (100%) rename {docs => mitmproxy/docs}/transparent/osx.rst (100%) rename {docs => mitmproxy/docs}/tutorials/30second.rst (100%) rename {docs => mitmproxy/docs}/tutorials/gamecenter.rst (100%) rename {docs => mitmproxy/docs}/tutorials/leaderboard.png (100%) rename {docs => mitmproxy/docs}/tutorials/one.png (100%) rename {docs => mitmproxy/docs}/tutorials/supermega.png (100%) rename {docs => mitmproxy/docs}/tutorials/transparent-dhcp.rst (100%) rename {docs => mitmproxy/docs}/tutorials/transparent-dhcp/step1_proxy.png (100%) rename {docs => mitmproxy/docs}/tutorials/transparent-dhcp/step1_vbox_eth0.png (100%) rename {docs => mitmproxy/docs}/tutorials/transparent-dhcp/step1_vbox_eth1.png (100%) rename {docs => mitmproxy/docs}/tutorials/transparent-dhcp/step2_proxied_vm.png (100%) rename {examples => mitmproxy/examples}/README (100%) rename {examples => mitmproxy/examples}/add_header.py (100%) rename {examples => mitmproxy/examples}/change_upstream_proxy.py (100%) rename {examples => mitmproxy/examples}/custom_contentviews.py (100%) rename {examples => mitmproxy/examples}/dns_spoofing.py (100%) rename {examples => mitmproxy/examples}/dup_and_replay.py (100%) rename {examples => mitmproxy/examples}/filt.py (100%) rename {examples => mitmproxy/examples}/flowbasic (100%) mode change 100755 => 100644 rename {examples => mitmproxy/examples}/flowwriter.py (100%) rename {examples => mitmproxy/examples}/har_extractor.py (100%) rename {examples => mitmproxy/examples}/iframe_injector.py (100%) rename {examples => mitmproxy/examples}/mitmproxywrapper.py (100%) mode change 100755 => 100644 rename {examples => mitmproxy/examples}/modify_form.py (100%) rename {examples => mitmproxy/examples}/modify_querystring.py (100%) rename {examples => mitmproxy/examples}/modify_response_body.py (100%) rename {examples => mitmproxy/examples}/nonblocking.py (100%) rename {examples => mitmproxy/examples}/proxapp.py (100%) rename {examples => mitmproxy/examples}/read_dumpfile (100%) mode change 100755 => 100644 rename {examples => mitmproxy/examples}/redirect_requests.py (100%) rename {examples => mitmproxy/examples}/sslstrip.py (100%) rename {examples => mitmproxy/examples}/stickycookies (100%) mode change 100755 => 100644 rename {examples => mitmproxy/examples}/stream.py (100%) rename {examples => mitmproxy/examples}/stream_modify.py (100%) rename {examples => mitmproxy/examples}/stub.py (100%) rename {examples => mitmproxy/examples}/tcp_message.py (100%) rename {examples => mitmproxy/examples}/tls_passthrough.py (100%) rename {examples => mitmproxy/examples}/upsidedownternet.py (100%) rename {libmproxy => mitmproxy/libmproxy}/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/cmdline.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/common.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/flowdetailview.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/flowlist.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/flowview.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/grideditor.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/help.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/options.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/palettepicker.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/palettes.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/pathedit.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/searchable.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/select.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/signals.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/statusbar.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/tabs.py (100%) rename {libmproxy => mitmproxy/libmproxy}/console/window.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contentviews.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/README (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/jsbeautifier/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/jsbeautifier/unpackers/README.specs.mkd (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/jsbeautifier/unpackers/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/jsbeautifier/unpackers/evalbased.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/jsbeautifier/unpackers/javascriptobfuscator.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/jsbeautifier/unpackers/myobfuscate.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/jsbeautifier/unpackers/packer.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/jsbeautifier/unpackers/urlencode.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/tls/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/tls/_constructs.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/tls/utils.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/wbxml/ASCommandResponse.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/wbxml/ASWBXML.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/wbxml/ASWBXMLByteQueue.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/wbxml/ASWBXMLCodePage.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/wbxml/GlobalTokens.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/wbxml/InvalidDataException.py (100%) rename {libmproxy => mitmproxy/libmproxy}/contrib/wbxml/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/controller.py (100%) rename {libmproxy => mitmproxy/libmproxy}/dump.py (100%) rename {libmproxy => mitmproxy/libmproxy}/exceptions.py (100%) rename {libmproxy => mitmproxy/libmproxy}/filt.py (100%) rename {libmproxy => mitmproxy/libmproxy}/flow.py (100%) rename {libmproxy => mitmproxy/libmproxy}/flow_export.py (100%) rename {libmproxy => mitmproxy/libmproxy}/flow_format_compat.py (100%) rename {libmproxy => mitmproxy/libmproxy}/main.py (100%) rename {libmproxy => mitmproxy/libmproxy}/models/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/models/connections.py (100%) rename {libmproxy => mitmproxy/libmproxy}/models/flow.py (100%) rename {libmproxy => mitmproxy/libmproxy}/models/http.py (100%) rename {libmproxy => mitmproxy/libmproxy}/onboarding/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/onboarding/app.py (100%) rename {libmproxy => mitmproxy/libmproxy}/onboarding/static/bootstrap.min.css (100%) rename {libmproxy => mitmproxy/libmproxy}/onboarding/static/fontawesome/css/font-awesome.css (100%) rename {libmproxy => mitmproxy/libmproxy}/onboarding/static/fontawesome/css/font-awesome.min.css (100%) rename {libmproxy => mitmproxy/libmproxy}/onboarding/static/fontawesome/fonts/FontAwesome.otf (100%) rename {libmproxy => mitmproxy/libmproxy}/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot (100%) mode change 100755 => 100644 rename {libmproxy => mitmproxy/libmproxy}/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg (100%) mode change 100755 => 100644 rename {libmproxy => mitmproxy/libmproxy}/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf (100%) mode change 100755 => 100644 rename {libmproxy => mitmproxy/libmproxy}/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff (100%) mode change 100755 => 100644 rename {libmproxy => mitmproxy/libmproxy}/onboarding/static/mitmproxy.css (100%) rename {libmproxy => mitmproxy/libmproxy}/onboarding/templates/frame.html (100%) rename {libmproxy => mitmproxy/libmproxy}/onboarding/templates/index.html (100%) rename {libmproxy => mitmproxy/libmproxy}/onboarding/templates/layout.html (100%) rename {libmproxy => mitmproxy/libmproxy}/platform/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/platform/linux.py (100%) rename {libmproxy => mitmproxy/libmproxy}/platform/osx.py (100%) rename {libmproxy => mitmproxy/libmproxy}/platform/pf.py (100%) rename {libmproxy => mitmproxy/libmproxy}/platform/windows.py (100%) rename {libmproxy => mitmproxy/libmproxy}/protocol/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/protocol/base.py (100%) rename {libmproxy => mitmproxy/libmproxy}/protocol/http.py (100%) rename {libmproxy => mitmproxy/libmproxy}/protocol/http1.py (100%) rename {libmproxy => mitmproxy/libmproxy}/protocol/http2.py (100%) rename {libmproxy => mitmproxy/libmproxy}/protocol/http_replay.py (100%) rename {libmproxy => mitmproxy/libmproxy}/protocol/rawtcp.py (100%) rename {libmproxy => mitmproxy/libmproxy}/protocol/tls.py (100%) rename {libmproxy => mitmproxy/libmproxy}/proxy/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/proxy/config.py (100%) rename {libmproxy => mitmproxy/libmproxy}/proxy/modes/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/proxy/modes/http_proxy.py (100%) rename {libmproxy => mitmproxy/libmproxy}/proxy/modes/reverse_proxy.py (100%) rename {libmproxy => mitmproxy/libmproxy}/proxy/modes/socks_proxy.py (100%) rename {libmproxy => mitmproxy/libmproxy}/proxy/modes/transparent_proxy.py (100%) rename {libmproxy => mitmproxy/libmproxy}/proxy/root_context.py (100%) rename {libmproxy => mitmproxy/libmproxy}/proxy/server.py (100%) rename {libmproxy => mitmproxy/libmproxy}/script/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/script/concurrent.py (100%) rename {libmproxy => mitmproxy/libmproxy}/script/reloader.py (100%) rename {libmproxy => mitmproxy/libmproxy}/script/script.py (100%) rename {libmproxy => mitmproxy/libmproxy}/script/script_context.py (100%) rename {libmproxy => mitmproxy/libmproxy}/stateobject.py (100%) rename {libmproxy => mitmproxy/libmproxy}/tnetstring.py (100%) rename {libmproxy => mitmproxy/libmproxy}/utils.py (100%) rename {libmproxy => mitmproxy/libmproxy}/version.py (100%) rename {libmproxy => mitmproxy/libmproxy}/web/__init__.py (100%) rename {libmproxy => mitmproxy/libmproxy}/web/app.py (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/app.css (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/app.js (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/fonts/fontawesome-webfont.eot (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/fonts/fontawesome-webfont.svg (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/fonts/fontawesome-webfont.ttf (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/fonts/fontawesome-webfont.woff (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/images/chrome-devtools/LICENSE (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/images/chrome-devtools/resourceCSSIcon.png (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/images/chrome-devtools/resourceDocumentIcon.png (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/images/chrome-devtools/resourceJSIcon.png (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/images/chrome-devtools/resourcePlainIcon.png (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/images/resourceExecutableIcon.png (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/images/resourceFlashIcon.png (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/images/resourceImageIcon.png (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/images/resourceJavaIcon.png (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/images/resourceNotModifiedIcon.png (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/images/resourceRedirectIcon.png (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/vendor.css (100%) rename {libmproxy => mitmproxy/libmproxy}/web/static/vendor.js (100%) rename {libmproxy => mitmproxy/libmproxy}/web/templates/index.html (100%) rename {libmproxy => mitmproxy/libmproxy}/webfonts/fontawesome-webfont.eot (100%) rename {libmproxy => mitmproxy/libmproxy}/webfonts/fontawesome-webfont.svg (100%) rename {libmproxy => mitmproxy/libmproxy}/webfonts/fontawesome-webfont.ttf (100%) rename {libmproxy => mitmproxy/libmproxy}/webfonts/fontawesome-webfont.woff (100%) rename mitmdump => mitmproxy/mitmdump (100%) mode change 100755 => 100644 rename mitmproxy => mitmproxy/mitmproxy (100%) mode change 100755 => 100644 rename mitmweb => mitmproxy/mitmweb (100%) mode change 100755 => 100644 rename {release => mitmproxy/release}/mitmdump.spec (100%) rename {release => mitmproxy/release}/mitmproxy.spec (100%) rename {release => mitmproxy/release}/mitmweb.spec (100%) rename requirements.txt => mitmproxy/requirements.txt (100%) rename setup.cfg => mitmproxy/setup.cfg (100%) rename setup.py => mitmproxy/setup.py (100%) rename {test => mitmproxy/test}/__init__.py (100%) rename {test => mitmproxy/test}/completion/aaa (100%) rename {test => mitmproxy/test}/completion/aab (100%) rename {test => mitmproxy/test}/completion/aac (100%) rename {test => mitmproxy/test}/data/1.css (100%) rename {test => mitmproxy/test}/data/amf01 (100%) rename {test => mitmproxy/test}/data/amf02 (100%) rename {test => mitmproxy/test}/data/amf03 (100%) rename {test => mitmproxy/test}/data/clientcert/.gitignore (100%) rename {test => mitmproxy/test}/data/clientcert/127.0.0.1.pem (100%) rename {test => mitmproxy/test}/data/clientcert/client.cnf (100%) rename {test => mitmproxy/test}/data/clientcert/client.pem (100%) rename {test => mitmproxy/test}/data/clientcert/make (100%) mode change 100755 => 100644 rename {test => mitmproxy/test}/data/confdir/mitmproxy-ca-cert.cer (100%) rename {test => mitmproxy/test}/data/confdir/mitmproxy-ca-cert.p12 (100%) rename {test => mitmproxy/test}/data/confdir/mitmproxy-ca-cert.pem (100%) rename {test => mitmproxy/test}/data/confdir/mitmproxy-ca.pem (100%) rename {test => mitmproxy/test}/data/dercert (100%) rename {test => mitmproxy/test}/data/dumpfile-012 (100%) rename {test => mitmproxy/test}/data/dumpfile-013 (100%) rename {test => mitmproxy/test}/data/htpasswd (100%) rename {test => mitmproxy/test}/data/htpasswd.invalid (100%) rename {test => mitmproxy/test}/data/image-err1.jpg (100%) rename {test => mitmproxy/test}/data/image.gif (100%) rename {test => mitmproxy/test}/data/image.ico (100%) rename {test => mitmproxy/test}/data/image.jpg (100%) rename {test => mitmproxy/test}/data/image.png (100%) rename {test => mitmproxy/test}/data/no_common_name.pem (100%) rename {test => mitmproxy/test}/data/pf01 (100%) rename {test => mitmproxy/test}/data/pf02 (100%) rename {test => mitmproxy/test}/data/protobuf01 (100%) rename {test => mitmproxy/test}/data/replace (100%) rename {test => mitmproxy/test}/data/testkey.pem (100%) rename {test => mitmproxy/test}/data/trusted-cadir/8117bdb9.0 (100%) rename {test => mitmproxy/test}/data/trusted-cadir/9d45e6a9.0 (100%) rename {test => mitmproxy/test}/data/trusted-cadir/trusted-ca.pem (100%) rename {test => mitmproxy/test}/data/trusted-server.crt (100%) rename {test => mitmproxy/test}/data/untrusted-server.crt (100%) rename {test => mitmproxy/test}/fuzzing/.env (100%) rename {test => mitmproxy/test}/fuzzing/README (100%) rename {test => mitmproxy/test}/fuzzing/client_patterns (100%) rename {test => mitmproxy/test}/fuzzing/go_proxy (100%) mode change 100755 => 100644 rename {test => mitmproxy/test}/fuzzing/reverse_patterns (100%) rename {test => mitmproxy/test}/fuzzing/straight_stream (100%) rename {test => mitmproxy/test}/fuzzing/straight_stream_patterns (100%) rename {test => mitmproxy/test}/fuzzing/straight_stream_ssl (100%) rename {test => mitmproxy/test}/mock_urwid.py (100%) rename {test => mitmproxy/test}/scripts/a.py (100%) rename {test => mitmproxy/test}/scripts/a_helper.py (100%) rename {test => mitmproxy/test}/scripts/all.py (100%) rename {test => mitmproxy/test}/scripts/concurrent_decorator.py (100%) rename {test => mitmproxy/test}/scripts/concurrent_decorator_err.py (100%) rename {test => mitmproxy/test}/scripts/duplicate_flow.py (100%) rename {test => mitmproxy/test}/scripts/loaderr.py (100%) rename {test => mitmproxy/test}/scripts/reqerr.py (100%) rename {test => mitmproxy/test}/scripts/starterr.py (100%) rename {test => mitmproxy/test}/scripts/stream_modify.py (100%) rename {test => mitmproxy/test}/scripts/syntaxerr.py (100%) rename {test => mitmproxy/test}/scripts/tcp_stream_modify.py (100%) rename {test => mitmproxy/test}/scripts/unloaderr.py (100%) rename {test => mitmproxy/test}/test_app.py (100%) rename {test => mitmproxy/test}/test_cmdline.py (100%) rename {test => mitmproxy/test}/test_console.py (100%) rename {test => mitmproxy/test}/test_console_common.py (100%) rename {test => mitmproxy/test}/test_console_help.py (100%) rename {test => mitmproxy/test}/test_console_palettes.py (100%) rename {test => mitmproxy/test}/test_console_pathedit.py (100%) rename {test => mitmproxy/test}/test_contentview.py (100%) rename {test => mitmproxy/test}/test_controller.py (100%) rename {test => mitmproxy/test}/test_custom_contentview.py (100%) rename {test => mitmproxy/test}/test_dump.py (100%) rename {test => mitmproxy/test}/test_examples.py (100%) rename {test => mitmproxy/test}/test_filt.py (100%) rename {test => mitmproxy/test}/test_flow.py (100%) rename {test => mitmproxy/test}/test_flow_export.py (100%) rename {test => mitmproxy/test}/test_flow_format_compat.py (100%) rename {test => mitmproxy/test}/test_fuzzing.py (100%) rename {test => mitmproxy/test}/test_platform_pf.py (100%) rename {test => mitmproxy/test}/test_protocol_http1.py (100%) rename {test => mitmproxy/test}/test_protocol_http2.py (100%) rename {test => mitmproxy/test}/test_proxy.py (100%) rename {test => mitmproxy/test}/test_script.py (100%) rename {test => mitmproxy/test}/test_server.py (100%) rename {test => mitmproxy/test}/test_utils.py (100%) rename {test => mitmproxy/test}/tools/1024example (100%) rename {test => mitmproxy/test}/tools/ab.exe (100%) rename {test => mitmproxy/test}/tools/bench.py (100%) rename {test => mitmproxy/test}/tools/benchtool.py (100%) rename {test => mitmproxy/test}/tools/getcert (100%) mode change 100755 => 100644 rename {test => mitmproxy/test}/tools/inspect_dumpfile.py (100%) rename {test => mitmproxy/test}/tools/memoryleak.py (100%) rename {test => mitmproxy/test}/tools/passive_close.py (100%) rename {test => mitmproxy/test}/tools/testpatt (100%) mode change 100755 => 100644 rename {test => mitmproxy/test}/tservers.py (100%) rename {test => mitmproxy/test}/tutils.py (100%) rename {web => mitmproxy/web}/.bowerrc (100%) rename {web => mitmproxy/web}/.eslintrc (100%) rename {web => mitmproxy/web}/README (100%) rename {web => mitmproxy/web}/conf.js (100%) rename {web => mitmproxy/web}/gulpfile.js (100%) rename {web => mitmproxy/web}/package.json (100%) rename {web => mitmproxy/web}/src/css/app.less (100%) rename {web => mitmproxy/web}/src/css/eventlog.less (100%) rename {web => mitmproxy/web}/src/css/flowdetail.less (100%) rename {web => mitmproxy/web}/src/css/flowtable.less (100%) rename {web => mitmproxy/web}/src/css/flowview.less (100%) rename {web => mitmproxy/web}/src/css/footer.less (100%) rename {web => mitmproxy/web}/src/css/header.less (100%) rename {web => mitmproxy/web}/src/css/layout.less (100%) rename {web => mitmproxy/web}/src/css/prompt.less (100%) rename {web => mitmproxy/web}/src/css/sprites.less (100%) rename {web => mitmproxy/web}/src/css/tabs.less (100%) rename {web => mitmproxy/web}/src/css/vendor-bootstrap-variables.less (100%) rename {web => mitmproxy/web}/src/css/vendor-bootstrap.less (100%) rename {web => mitmproxy/web}/src/css/vendor.less (100%) rename {web => mitmproxy/web}/src/fonts/FontAwesome.otf (100%) rename {web => mitmproxy/web}/src/fonts/README (100%) rename {web => mitmproxy/web}/src/fonts/font-awesome.css (100%) rename {web => mitmproxy/web}/src/fonts/fontawesome-webfont.eot (100%) rename {web => mitmproxy/web}/src/fonts/fontawesome-webfont.svg (100%) rename {web => mitmproxy/web}/src/fonts/fontawesome-webfont.ttf (100%) rename {web => mitmproxy/web}/src/fonts/fontawesome-webfont.woff (100%) rename {web => mitmproxy/web}/src/images/chrome-devtools/LICENSE (100%) rename {web => mitmproxy/web}/src/images/chrome-devtools/resourceCSSIcon.png (100%) rename {web => mitmproxy/web}/src/images/chrome-devtools/resourceDocumentIcon.png (100%) rename {web => mitmproxy/web}/src/images/chrome-devtools/resourceJSIcon.png (100%) rename {web => mitmproxy/web}/src/images/chrome-devtools/resourcePlainIcon.png (100%) rename {web => mitmproxy/web}/src/images/resourceExecutableIcon.png (100%) rename {web => mitmproxy/web}/src/images/resourceFlashIcon.png (100%) rename {web => mitmproxy/web}/src/images/resourceImageIcon.png (100%) rename {web => mitmproxy/web}/src/images/resourceJavaIcon.png (100%) rename {web => mitmproxy/web}/src/images/resourceNotModifiedIcon.png (100%) rename {web => mitmproxy/web}/src/images/resourceRedirectIcon.png (100%) rename {web => mitmproxy/web}/src/js/actions.js (100%) rename {web => mitmproxy/web}/src/js/app.js (100%) rename {web => mitmproxy/web}/src/js/components/common.js (100%) rename {web => mitmproxy/web}/src/js/components/editor.js (100%) rename {web => mitmproxy/web}/src/js/components/eventlog.js (100%) rename {web => mitmproxy/web}/src/js/components/flowtable-columns.js (100%) rename {web => mitmproxy/web}/src/js/components/flowtable.js (100%) rename {web => mitmproxy/web}/src/js/components/flowview/contentview.js (100%) rename {web => mitmproxy/web}/src/js/components/flowview/details.js (100%) rename {web => mitmproxy/web}/src/js/components/flowview/index.js (100%) rename {web => mitmproxy/web}/src/js/components/flowview/messages.js (100%) rename {web => mitmproxy/web}/src/js/components/flowview/nav.js (100%) rename {web => mitmproxy/web}/src/js/components/footer.js (100%) rename {web => mitmproxy/web}/src/js/components/header.js (100%) rename {web => mitmproxy/web}/src/js/components/mainview.js (100%) rename {web => mitmproxy/web}/src/js/components/prompt.js (100%) rename {web => mitmproxy/web}/src/js/components/proxyapp.js (100%) rename {web => mitmproxy/web}/src/js/components/virtualscroll.js (100%) rename {web => mitmproxy/web}/src/js/connection.js (100%) rename {web => mitmproxy/web}/src/js/dispatcher.js (100%) rename {web => mitmproxy/web}/src/js/filt/filt.js (100%) rename {web => mitmproxy/web}/src/js/filt/filt.peg (100%) rename {web => mitmproxy/web}/src/js/flow/utils.js (100%) rename {web => mitmproxy/web}/src/js/store/store.js (100%) rename {web => mitmproxy/web}/src/js/store/view.js (100%) rename {web => mitmproxy/web}/src/js/tests/utils.js (100%) rename {web => mitmproxy/web}/src/js/utils.js (100%) rename {web => mitmproxy/web}/src/templates/index.html (100%) diff --git a/.appveyor.yml b/mitmproxy/.appveyor.yml similarity index 100% rename from .appveyor.yml rename to mitmproxy/.appveyor.yml diff --git a/.coveragerc b/mitmproxy/.coveragerc similarity index 100% rename from .coveragerc rename to mitmproxy/.coveragerc diff --git a/.dockerignore b/mitmproxy/.dockerignore similarity index 100% rename from .dockerignore rename to mitmproxy/.dockerignore diff --git a/.env b/mitmproxy/.env similarity index 100% rename from .env rename to mitmproxy/.env diff --git a/.gitattributes b/mitmproxy/.gitattributes similarity index 100% rename from .gitattributes rename to mitmproxy/.gitattributes diff --git a/.gitignore b/mitmproxy/.gitignore similarity index 100% rename from .gitignore rename to mitmproxy/.gitignore diff --git a/.landscape.yml b/mitmproxy/.landscape.yml similarity index 100% rename from .landscape.yml rename to mitmproxy/.landscape.yml diff --git a/.travis.yml b/mitmproxy/.travis.yml similarity index 100% rename from .travis.yml rename to mitmproxy/.travis.yml diff --git a/CHANGELOG b/mitmproxy/CHANGELOG similarity index 100% rename from CHANGELOG rename to mitmproxy/CHANGELOG diff --git a/CONTRIBUTING.md b/mitmproxy/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to mitmproxy/CONTRIBUTING.md diff --git a/CONTRIBUTORS b/mitmproxy/CONTRIBUTORS similarity index 100% rename from CONTRIBUTORS rename to mitmproxy/CONTRIBUTORS diff --git a/Dockerfile b/mitmproxy/Dockerfile similarity index 100% rename from Dockerfile rename to mitmproxy/Dockerfile diff --git a/LICENSE b/mitmproxy/LICENSE similarity index 100% rename from LICENSE rename to mitmproxy/LICENSE diff --git a/MANIFEST.in b/mitmproxy/MANIFEST.in similarity index 100% rename from MANIFEST.in rename to mitmproxy/MANIFEST.in diff --git a/README.rst b/mitmproxy/README.rst similarity index 100% rename from README.rst rename to mitmproxy/README.rst diff --git a/dev b/mitmproxy/dev old mode 100755 new mode 100644 similarity index 100% rename from dev rename to mitmproxy/dev diff --git a/dev.bat b/mitmproxy/dev.bat similarity index 100% rename from dev.bat rename to mitmproxy/dev.bat diff --git a/docs/.gitignore b/mitmproxy/docs/.gitignore similarity index 100% rename from docs/.gitignore rename to mitmproxy/docs/.gitignore diff --git a/docs/Makefile b/mitmproxy/docs/Makefile similarity index 100% rename from docs/Makefile rename to mitmproxy/docs/Makefile diff --git a/docs/_templates/page.html b/mitmproxy/docs/_templates/page.html similarity index 100% rename from docs/_templates/page.html rename to mitmproxy/docs/_templates/page.html diff --git a/docs/certinstall-webapp.png b/mitmproxy/docs/certinstall-webapp.png similarity index 100% rename from docs/certinstall-webapp.png rename to mitmproxy/docs/certinstall-webapp.png diff --git a/docs/certinstall.rst b/mitmproxy/docs/certinstall.rst similarity index 100% rename from docs/certinstall.rst rename to mitmproxy/docs/certinstall.rst diff --git a/docs/conf.py b/mitmproxy/docs/conf.py similarity index 100% rename from docs/conf.py rename to mitmproxy/docs/conf.py diff --git a/docs/config.rst b/mitmproxy/docs/config.rst similarity index 100% rename from docs/config.rst rename to mitmproxy/docs/config.rst diff --git a/docs/custom-routing.txt b/mitmproxy/docs/custom-routing.txt similarity index 100% rename from docs/custom-routing.txt rename to mitmproxy/docs/custom-routing.txt diff --git a/docs/dev/addingviews.html b/mitmproxy/docs/dev/addingviews.html similarity index 100% rename from docs/dev/addingviews.html rename to mitmproxy/docs/dev/addingviews.html diff --git a/docs/dev/architecture.rst b/mitmproxy/docs/dev/architecture.rst similarity index 100% rename from docs/dev/architecture.rst rename to mitmproxy/docs/dev/architecture.rst diff --git a/docs/dev/exceptions.rst b/mitmproxy/docs/dev/exceptions.rst similarity index 100% rename from docs/dev/exceptions.rst rename to mitmproxy/docs/dev/exceptions.rst diff --git a/docs/dev/models.rst b/mitmproxy/docs/dev/models.rst similarity index 100% rename from docs/dev/models.rst rename to mitmproxy/docs/dev/models.rst diff --git a/docs/dev/protocols.rst b/mitmproxy/docs/dev/protocols.rst similarity index 100% rename from docs/dev/protocols.rst rename to mitmproxy/docs/dev/protocols.rst diff --git a/docs/dev/proxy.rst b/mitmproxy/docs/dev/proxy.rst similarity index 100% rename from docs/dev/proxy.rst rename to mitmproxy/docs/dev/proxy.rst diff --git a/docs/dev/sslkeylogfile.rst b/mitmproxy/docs/dev/sslkeylogfile.rst similarity index 100% rename from docs/dev/sslkeylogfile.rst rename to mitmproxy/docs/dev/sslkeylogfile.rst diff --git a/docs/dev/testing.rst b/mitmproxy/docs/dev/testing.rst similarity index 100% rename from docs/dev/testing.rst rename to mitmproxy/docs/dev/testing.rst diff --git a/docs/favicon.ico b/mitmproxy/docs/favicon.ico similarity index 100% rename from docs/favicon.ico rename to mitmproxy/docs/favicon.ico diff --git a/docs/features/anticache.rst b/mitmproxy/docs/features/anticache.rst similarity index 100% rename from docs/features/anticache.rst rename to mitmproxy/docs/features/anticache.rst diff --git a/docs/features/clientreplay.rst b/mitmproxy/docs/features/clientreplay.rst similarity index 100% rename from docs/features/clientreplay.rst rename to mitmproxy/docs/features/clientreplay.rst diff --git a/docs/features/filters.rst b/mitmproxy/docs/features/filters.rst similarity index 100% rename from docs/features/filters.rst rename to mitmproxy/docs/features/filters.rst diff --git a/docs/features/passthrough.rst b/mitmproxy/docs/features/passthrough.rst similarity index 100% rename from docs/features/passthrough.rst rename to mitmproxy/docs/features/passthrough.rst diff --git a/docs/features/proxyauth.rst b/mitmproxy/docs/features/proxyauth.rst similarity index 100% rename from docs/features/proxyauth.rst rename to mitmproxy/docs/features/proxyauth.rst diff --git a/docs/features/replacements.rst b/mitmproxy/docs/features/replacements.rst similarity index 100% rename from docs/features/replacements.rst rename to mitmproxy/docs/features/replacements.rst diff --git a/docs/features/responsestreaming.rst b/mitmproxy/docs/features/responsestreaming.rst similarity index 100% rename from docs/features/responsestreaming.rst rename to mitmproxy/docs/features/responsestreaming.rst diff --git a/docs/features/reverseproxy.rst b/mitmproxy/docs/features/reverseproxy.rst similarity index 100% rename from docs/features/reverseproxy.rst rename to mitmproxy/docs/features/reverseproxy.rst diff --git a/docs/features/serverreplay.rst b/mitmproxy/docs/features/serverreplay.rst similarity index 100% rename from docs/features/serverreplay.rst rename to mitmproxy/docs/features/serverreplay.rst diff --git a/docs/features/setheaders.rst b/mitmproxy/docs/features/setheaders.rst similarity index 100% rename from docs/features/setheaders.rst rename to mitmproxy/docs/features/setheaders.rst diff --git a/docs/features/socksproxy.rst b/mitmproxy/docs/features/socksproxy.rst similarity index 100% rename from docs/features/socksproxy.rst rename to mitmproxy/docs/features/socksproxy.rst diff --git a/docs/features/sticky.rst b/mitmproxy/docs/features/sticky.rst similarity index 100% rename from docs/features/sticky.rst rename to mitmproxy/docs/features/sticky.rst diff --git a/docs/features/tcpproxy.rst b/mitmproxy/docs/features/tcpproxy.rst similarity index 100% rename from docs/features/tcpproxy.rst rename to mitmproxy/docs/features/tcpproxy.rst diff --git a/docs/features/upstreamcerts.rst b/mitmproxy/docs/features/upstreamcerts.rst similarity index 100% rename from docs/features/upstreamcerts.rst rename to mitmproxy/docs/features/upstreamcerts.rst diff --git a/docs/features/upstreamproxy.rst b/mitmproxy/docs/features/upstreamproxy.rst similarity index 100% rename from docs/features/upstreamproxy.rst rename to mitmproxy/docs/features/upstreamproxy.rst diff --git a/docs/howmitmproxy.rst b/mitmproxy/docs/howmitmproxy.rst similarity index 100% rename from docs/howmitmproxy.rst rename to mitmproxy/docs/howmitmproxy.rst diff --git a/docs/index.rst b/mitmproxy/docs/index.rst similarity index 100% rename from docs/index.rst rename to mitmproxy/docs/index.rst diff --git a/docs/install.rst b/mitmproxy/docs/install.rst similarity index 100% rename from docs/install.rst rename to mitmproxy/docs/install.rst diff --git a/docs/introduction.rst b/mitmproxy/docs/introduction.rst similarity index 100% rename from docs/introduction.rst rename to mitmproxy/docs/introduction.rst diff --git a/docs/mitmdump.rst b/mitmproxy/docs/mitmdump.rst similarity index 100% rename from docs/mitmdump.rst rename to mitmproxy/docs/mitmdump.rst diff --git a/docs/mitmproxy-docs.png b/mitmproxy/docs/mitmproxy-docs.png similarity index 100% rename from docs/mitmproxy-docs.png rename to mitmproxy/docs/mitmproxy-docs.png diff --git a/docs/mitmproxy-long.png b/mitmproxy/docs/mitmproxy-long.png similarity index 100% rename from docs/mitmproxy-long.png rename to mitmproxy/docs/mitmproxy-long.png diff --git a/docs/mitmproxy.rst b/mitmproxy/docs/mitmproxy.rst similarity index 100% rename from docs/mitmproxy.rst rename to mitmproxy/docs/mitmproxy.rst diff --git a/docs/modes.rst b/mitmproxy/docs/modes.rst similarity index 100% rename from docs/modes.rst rename to mitmproxy/docs/modes.rst diff --git a/docs/schematics/_explicit.graffle/data.plist b/mitmproxy/docs/schematics/_explicit.graffle/data.plist similarity index 100% rename from docs/schematics/_explicit.graffle/data.plist rename to mitmproxy/docs/schematics/_explicit.graffle/data.plist diff --git a/docs/schematics/_explicit.graffle/image3.icns b/mitmproxy/docs/schematics/_explicit.graffle/image3.icns similarity index 100% rename from docs/schematics/_explicit.graffle/image3.icns rename to mitmproxy/docs/schematics/_explicit.graffle/image3.icns diff --git a/docs/schematics/_explicit.graffle/image6.tiff b/mitmproxy/docs/schematics/_explicit.graffle/image6.tiff similarity index 100% rename from docs/schematics/_explicit.graffle/image6.tiff rename to mitmproxy/docs/schematics/_explicit.graffle/image6.tiff diff --git a/docs/schematics/_explicit_https.graffle/data.plist b/mitmproxy/docs/schematics/_explicit_https.graffle/data.plist similarity index 100% rename from docs/schematics/_explicit_https.graffle/data.plist rename to mitmproxy/docs/schematics/_explicit_https.graffle/data.plist diff --git a/docs/schematics/_explicit_https.graffle/image3.icns b/mitmproxy/docs/schematics/_explicit_https.graffle/image3.icns similarity index 100% rename from docs/schematics/_explicit_https.graffle/image3.icns rename to mitmproxy/docs/schematics/_explicit_https.graffle/image3.icns diff --git a/docs/schematics/_explicit_https.graffle/image6.tiff b/mitmproxy/docs/schematics/_explicit_https.graffle/image6.tiff similarity index 100% rename from docs/schematics/_explicit_https.graffle/image6.tiff rename to mitmproxy/docs/schematics/_explicit_https.graffle/image6.tiff diff --git a/docs/schematics/_transparent.graffle/data.plist b/mitmproxy/docs/schematics/_transparent.graffle/data.plist similarity index 100% rename from docs/schematics/_transparent.graffle/data.plist rename to mitmproxy/docs/schematics/_transparent.graffle/data.plist diff --git a/docs/schematics/_transparent.graffle/image3.icns b/mitmproxy/docs/schematics/_transparent.graffle/image3.icns similarity index 100% rename from docs/schematics/_transparent.graffle/image3.icns rename to mitmproxy/docs/schematics/_transparent.graffle/image3.icns diff --git a/docs/schematics/_transparent.graffle/image6.tiff b/mitmproxy/docs/schematics/_transparent.graffle/image6.tiff similarity index 100% rename from docs/schematics/_transparent.graffle/image6.tiff rename to mitmproxy/docs/schematics/_transparent.graffle/image6.tiff diff --git a/docs/schematics/_transparent_https.graffle/data.plist b/mitmproxy/docs/schematics/_transparent_https.graffle/data.plist similarity index 100% rename from docs/schematics/_transparent_https.graffle/data.plist rename to mitmproxy/docs/schematics/_transparent_https.graffle/data.plist diff --git a/docs/schematics/_transparent_https.graffle/image3.icns b/mitmproxy/docs/schematics/_transparent_https.graffle/image3.icns similarity index 100% rename from docs/schematics/_transparent_https.graffle/image3.icns rename to mitmproxy/docs/schematics/_transparent_https.graffle/image3.icns diff --git a/docs/schematics/_transparent_https.graffle/image6.tiff b/mitmproxy/docs/schematics/_transparent_https.graffle/image6.tiff similarity index 100% rename from docs/schematics/_transparent_https.graffle/image6.tiff rename to mitmproxy/docs/schematics/_transparent_https.graffle/image6.tiff diff --git a/docs/schematics/architecture.pdf b/mitmproxy/docs/schematics/architecture.pdf similarity index 100% rename from docs/schematics/architecture.pdf rename to mitmproxy/docs/schematics/architecture.pdf diff --git a/docs/schematics/architecture.png b/mitmproxy/docs/schematics/architecture.png similarity index 100% rename from docs/schematics/architecture.png rename to mitmproxy/docs/schematics/architecture.png diff --git a/docs/schematics/architecture.vsdx b/mitmproxy/docs/schematics/architecture.vsdx similarity index 100% rename from docs/schematics/architecture.vsdx rename to mitmproxy/docs/schematics/architecture.vsdx diff --git a/docs/schematics/how-mitmproxy-works-explicit-https.png b/mitmproxy/docs/schematics/how-mitmproxy-works-explicit-https.png similarity index 100% rename from docs/schematics/how-mitmproxy-works-explicit-https.png rename to mitmproxy/docs/schematics/how-mitmproxy-works-explicit-https.png diff --git a/docs/schematics/how-mitmproxy-works-explicit.png b/mitmproxy/docs/schematics/how-mitmproxy-works-explicit.png similarity index 100% rename from docs/schematics/how-mitmproxy-works-explicit.png rename to mitmproxy/docs/schematics/how-mitmproxy-works-explicit.png diff --git a/docs/schematics/how-mitmproxy-works-transparent-https.png b/mitmproxy/docs/schematics/how-mitmproxy-works-transparent-https.png similarity index 100% rename from docs/schematics/how-mitmproxy-works-transparent-https.png rename to mitmproxy/docs/schematics/how-mitmproxy-works-transparent-https.png diff --git a/docs/schematics/how-mitmproxy-works-transparent.png b/mitmproxy/docs/schematics/how-mitmproxy-works-transparent.png similarity index 100% rename from docs/schematics/how-mitmproxy-works-transparent.png rename to mitmproxy/docs/schematics/how-mitmproxy-works-transparent.png diff --git a/docs/schematics/proxy-modes-flowchart.png b/mitmproxy/docs/schematics/proxy-modes-flowchart.png similarity index 100% rename from docs/schematics/proxy-modes-flowchart.png rename to mitmproxy/docs/schematics/proxy-modes-flowchart.png diff --git a/docs/schematics/proxy-modes-regular.png b/mitmproxy/docs/schematics/proxy-modes-regular.png similarity index 100% rename from docs/schematics/proxy-modes-regular.png rename to mitmproxy/docs/schematics/proxy-modes-regular.png diff --git a/docs/schematics/proxy-modes-reverse.png b/mitmproxy/docs/schematics/proxy-modes-reverse.png similarity index 100% rename from docs/schematics/proxy-modes-reverse.png rename to mitmproxy/docs/schematics/proxy-modes-reverse.png diff --git a/docs/schematics/proxy-modes-transparent-1.png b/mitmproxy/docs/schematics/proxy-modes-transparent-1.png similarity index 100% rename from docs/schematics/proxy-modes-transparent-1.png rename to mitmproxy/docs/schematics/proxy-modes-transparent-1.png diff --git a/docs/schematics/proxy-modes-transparent-2.png b/mitmproxy/docs/schematics/proxy-modes-transparent-2.png similarity index 100% rename from docs/schematics/proxy-modes-transparent-2.png rename to mitmproxy/docs/schematics/proxy-modes-transparent-2.png diff --git a/docs/schematics/proxy-modes-transparent-3.png b/mitmproxy/docs/schematics/proxy-modes-transparent-3.png similarity index 100% rename from docs/schematics/proxy-modes-transparent-3.png rename to mitmproxy/docs/schematics/proxy-modes-transparent-3.png diff --git a/docs/schematics/proxy-modes-transparent-wrong.png b/mitmproxy/docs/schematics/proxy-modes-transparent-wrong.png similarity index 100% rename from docs/schematics/proxy-modes-transparent-wrong.png rename to mitmproxy/docs/schematics/proxy-modes-transparent-wrong.png diff --git a/docs/schematics/proxy-modes-upstream.png b/mitmproxy/docs/schematics/proxy-modes-upstream.png similarity index 100% rename from docs/schematics/proxy-modes-upstream.png rename to mitmproxy/docs/schematics/proxy-modes-upstream.png diff --git a/docs/schematics/proxy-modes.pdf b/mitmproxy/docs/schematics/proxy-modes.pdf similarity index 100% rename from docs/schematics/proxy-modes.pdf rename to mitmproxy/docs/schematics/proxy-modes.pdf diff --git a/docs/schematics/proxy-modes.vsdx b/mitmproxy/docs/schematics/proxy-modes.vsdx similarity index 100% rename from docs/schematics/proxy-modes.vsdx rename to mitmproxy/docs/schematics/proxy-modes.vsdx diff --git a/docs/screenshots/firefox3-import.jpg b/mitmproxy/docs/screenshots/firefox3-import.jpg similarity index 100% rename from docs/screenshots/firefox3-import.jpg rename to mitmproxy/docs/screenshots/firefox3-import.jpg diff --git a/docs/screenshots/firefox3-trust.jpg b/mitmproxy/docs/screenshots/firefox3-trust.jpg similarity index 100% rename from docs/screenshots/firefox3-trust.jpg rename to mitmproxy/docs/screenshots/firefox3-trust.jpg diff --git a/docs/screenshots/firefox3.jpg b/mitmproxy/docs/screenshots/firefox3.jpg similarity index 100% rename from docs/screenshots/firefox3.jpg rename to mitmproxy/docs/screenshots/firefox3.jpg diff --git a/docs/screenshots/ios-gateway.png b/mitmproxy/docs/screenshots/ios-gateway.png similarity index 100% rename from docs/screenshots/ios-gateway.png rename to mitmproxy/docs/screenshots/ios-gateway.png diff --git a/docs/screenshots/ios-installed.png b/mitmproxy/docs/screenshots/ios-installed.png similarity index 100% rename from docs/screenshots/ios-installed.png rename to mitmproxy/docs/screenshots/ios-installed.png diff --git a/docs/screenshots/ios-manual.png b/mitmproxy/docs/screenshots/ios-manual.png similarity index 100% rename from docs/screenshots/ios-manual.png rename to mitmproxy/docs/screenshots/ios-manual.png diff --git a/docs/screenshots/ios-profile.png b/mitmproxy/docs/screenshots/ios-profile.png similarity index 100% rename from docs/screenshots/ios-profile.png rename to mitmproxy/docs/screenshots/ios-profile.png diff --git a/docs/screenshots/ios-reverse.png b/mitmproxy/docs/screenshots/ios-reverse.png similarity index 100% rename from docs/screenshots/ios-reverse.png rename to mitmproxy/docs/screenshots/ios-reverse.png diff --git a/docs/screenshots/ios-warning.png b/mitmproxy/docs/screenshots/ios-warning.png similarity index 100% rename from docs/screenshots/ios-warning.png rename to mitmproxy/docs/screenshots/ios-warning.png diff --git a/docs/screenshots/mitmproxy-flowview.png b/mitmproxy/docs/screenshots/mitmproxy-flowview.png similarity index 100% rename from docs/screenshots/mitmproxy-flowview.png rename to mitmproxy/docs/screenshots/mitmproxy-flowview.png diff --git a/docs/screenshots/mitmproxy-intercept-filt.png b/mitmproxy/docs/screenshots/mitmproxy-intercept-filt.png similarity index 100% rename from docs/screenshots/mitmproxy-intercept-filt.png rename to mitmproxy/docs/screenshots/mitmproxy-intercept-filt.png diff --git a/docs/screenshots/mitmproxy-intercept-mid.png b/mitmproxy/docs/screenshots/mitmproxy-intercept-mid.png similarity index 100% rename from docs/screenshots/mitmproxy-intercept-mid.png rename to mitmproxy/docs/screenshots/mitmproxy-intercept-mid.png diff --git a/docs/screenshots/mitmproxy-intercept-options.png b/mitmproxy/docs/screenshots/mitmproxy-intercept-options.png similarity index 100% rename from docs/screenshots/mitmproxy-intercept-options.png rename to mitmproxy/docs/screenshots/mitmproxy-intercept-options.png diff --git a/docs/screenshots/mitmproxy-intercept-result.png b/mitmproxy/docs/screenshots/mitmproxy-intercept-result.png similarity index 100% rename from docs/screenshots/mitmproxy-intercept-result.png rename to mitmproxy/docs/screenshots/mitmproxy-intercept-result.png diff --git a/docs/screenshots/mitmproxy-kveditor-editmode.png b/mitmproxy/docs/screenshots/mitmproxy-kveditor-editmode.png similarity index 100% rename from docs/screenshots/mitmproxy-kveditor-editmode.png rename to mitmproxy/docs/screenshots/mitmproxy-kveditor-editmode.png diff --git a/docs/screenshots/mitmproxy-kveditor.png b/mitmproxy/docs/screenshots/mitmproxy-kveditor.png similarity index 100% rename from docs/screenshots/mitmproxy-kveditor.png rename to mitmproxy/docs/screenshots/mitmproxy-kveditor.png diff --git a/docs/screenshots/mitmproxy.png b/mitmproxy/docs/screenshots/mitmproxy.png similarity index 100% rename from docs/screenshots/mitmproxy.png rename to mitmproxy/docs/screenshots/mitmproxy.png diff --git a/docs/screenshots/osx-addcert-alwaystrust.png b/mitmproxy/docs/screenshots/osx-addcert-alwaystrust.png similarity index 100% rename from docs/screenshots/osx-addcert-alwaystrust.png rename to mitmproxy/docs/screenshots/osx-addcert-alwaystrust.png diff --git a/docs/screenshots/win7-certstore-trustedroot.png b/mitmproxy/docs/screenshots/win7-certstore-trustedroot.png similarity index 100% rename from docs/screenshots/win7-certstore-trustedroot.png rename to mitmproxy/docs/screenshots/win7-certstore-trustedroot.png diff --git a/docs/screenshots/win7-certstore.png b/mitmproxy/docs/screenshots/win7-certstore.png similarity index 100% rename from docs/screenshots/win7-certstore.png rename to mitmproxy/docs/screenshots/win7-certstore.png diff --git a/docs/screenshots/win7-wizard.png b/mitmproxy/docs/screenshots/win7-wizard.png similarity index 100% rename from docs/screenshots/win7-wizard.png rename to mitmproxy/docs/screenshots/win7-wizard.png diff --git a/docs/screenshots/winpythoninstaller.jpg b/mitmproxy/docs/screenshots/winpythoninstaller.jpg similarity index 100% rename from docs/screenshots/winpythoninstaller.jpg rename to mitmproxy/docs/screenshots/winpythoninstaller.jpg diff --git a/docs/scripting/inlinescripts.rst b/mitmproxy/docs/scripting/inlinescripts.rst similarity index 100% rename from docs/scripting/inlinescripts.rst rename to mitmproxy/docs/scripting/inlinescripts.rst diff --git a/docs/scripting/libmproxy.rst b/mitmproxy/docs/scripting/libmproxy.rst similarity index 100% rename from docs/scripting/libmproxy.rst rename to mitmproxy/docs/scripting/libmproxy.rst diff --git a/docs/transparent.rst b/mitmproxy/docs/transparent.rst similarity index 100% rename from docs/transparent.rst rename to mitmproxy/docs/transparent.rst diff --git a/docs/transparent/linux.rst b/mitmproxy/docs/transparent/linux.rst similarity index 100% rename from docs/transparent/linux.rst rename to mitmproxy/docs/transparent/linux.rst diff --git a/docs/transparent/osx.rst b/mitmproxy/docs/transparent/osx.rst similarity index 100% rename from docs/transparent/osx.rst rename to mitmproxy/docs/transparent/osx.rst diff --git a/docs/tutorials/30second.rst b/mitmproxy/docs/tutorials/30second.rst similarity index 100% rename from docs/tutorials/30second.rst rename to mitmproxy/docs/tutorials/30second.rst diff --git a/docs/tutorials/gamecenter.rst b/mitmproxy/docs/tutorials/gamecenter.rst similarity index 100% rename from docs/tutorials/gamecenter.rst rename to mitmproxy/docs/tutorials/gamecenter.rst diff --git a/docs/tutorials/leaderboard.png b/mitmproxy/docs/tutorials/leaderboard.png similarity index 100% rename from docs/tutorials/leaderboard.png rename to mitmproxy/docs/tutorials/leaderboard.png diff --git a/docs/tutorials/one.png b/mitmproxy/docs/tutorials/one.png similarity index 100% rename from docs/tutorials/one.png rename to mitmproxy/docs/tutorials/one.png diff --git a/docs/tutorials/supermega.png b/mitmproxy/docs/tutorials/supermega.png similarity index 100% rename from docs/tutorials/supermega.png rename to mitmproxy/docs/tutorials/supermega.png diff --git a/docs/tutorials/transparent-dhcp.rst b/mitmproxy/docs/tutorials/transparent-dhcp.rst similarity index 100% rename from docs/tutorials/transparent-dhcp.rst rename to mitmproxy/docs/tutorials/transparent-dhcp.rst diff --git a/docs/tutorials/transparent-dhcp/step1_proxy.png b/mitmproxy/docs/tutorials/transparent-dhcp/step1_proxy.png similarity index 100% rename from docs/tutorials/transparent-dhcp/step1_proxy.png rename to mitmproxy/docs/tutorials/transparent-dhcp/step1_proxy.png diff --git a/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png b/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png similarity index 100% rename from docs/tutorials/transparent-dhcp/step1_vbox_eth0.png rename to mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png diff --git a/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png b/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png similarity index 100% rename from docs/tutorials/transparent-dhcp/step1_vbox_eth1.png rename to mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png diff --git a/docs/tutorials/transparent-dhcp/step2_proxied_vm.png b/mitmproxy/docs/tutorials/transparent-dhcp/step2_proxied_vm.png similarity index 100% rename from docs/tutorials/transparent-dhcp/step2_proxied_vm.png rename to mitmproxy/docs/tutorials/transparent-dhcp/step2_proxied_vm.png diff --git a/examples/README b/mitmproxy/examples/README similarity index 100% rename from examples/README rename to mitmproxy/examples/README diff --git a/examples/add_header.py b/mitmproxy/examples/add_header.py similarity index 100% rename from examples/add_header.py rename to mitmproxy/examples/add_header.py diff --git a/examples/change_upstream_proxy.py b/mitmproxy/examples/change_upstream_proxy.py similarity index 100% rename from examples/change_upstream_proxy.py rename to mitmproxy/examples/change_upstream_proxy.py diff --git a/examples/custom_contentviews.py b/mitmproxy/examples/custom_contentviews.py similarity index 100% rename from examples/custom_contentviews.py rename to mitmproxy/examples/custom_contentviews.py diff --git a/examples/dns_spoofing.py b/mitmproxy/examples/dns_spoofing.py similarity index 100% rename from examples/dns_spoofing.py rename to mitmproxy/examples/dns_spoofing.py diff --git a/examples/dup_and_replay.py b/mitmproxy/examples/dup_and_replay.py similarity index 100% rename from examples/dup_and_replay.py rename to mitmproxy/examples/dup_and_replay.py diff --git a/examples/filt.py b/mitmproxy/examples/filt.py similarity index 100% rename from examples/filt.py rename to mitmproxy/examples/filt.py diff --git a/examples/flowbasic b/mitmproxy/examples/flowbasic old mode 100755 new mode 100644 similarity index 100% rename from examples/flowbasic rename to mitmproxy/examples/flowbasic diff --git a/examples/flowwriter.py b/mitmproxy/examples/flowwriter.py similarity index 100% rename from examples/flowwriter.py rename to mitmproxy/examples/flowwriter.py diff --git a/examples/har_extractor.py b/mitmproxy/examples/har_extractor.py similarity index 100% rename from examples/har_extractor.py rename to mitmproxy/examples/har_extractor.py diff --git a/examples/iframe_injector.py b/mitmproxy/examples/iframe_injector.py similarity index 100% rename from examples/iframe_injector.py rename to mitmproxy/examples/iframe_injector.py diff --git a/examples/mitmproxywrapper.py b/mitmproxy/examples/mitmproxywrapper.py old mode 100755 new mode 100644 similarity index 100% rename from examples/mitmproxywrapper.py rename to mitmproxy/examples/mitmproxywrapper.py diff --git a/examples/modify_form.py b/mitmproxy/examples/modify_form.py similarity index 100% rename from examples/modify_form.py rename to mitmproxy/examples/modify_form.py diff --git a/examples/modify_querystring.py b/mitmproxy/examples/modify_querystring.py similarity index 100% rename from examples/modify_querystring.py rename to mitmproxy/examples/modify_querystring.py diff --git a/examples/modify_response_body.py b/mitmproxy/examples/modify_response_body.py similarity index 100% rename from examples/modify_response_body.py rename to mitmproxy/examples/modify_response_body.py diff --git a/examples/nonblocking.py b/mitmproxy/examples/nonblocking.py similarity index 100% rename from examples/nonblocking.py rename to mitmproxy/examples/nonblocking.py diff --git a/examples/proxapp.py b/mitmproxy/examples/proxapp.py similarity index 100% rename from examples/proxapp.py rename to mitmproxy/examples/proxapp.py diff --git a/examples/read_dumpfile b/mitmproxy/examples/read_dumpfile old mode 100755 new mode 100644 similarity index 100% rename from examples/read_dumpfile rename to mitmproxy/examples/read_dumpfile diff --git a/examples/redirect_requests.py b/mitmproxy/examples/redirect_requests.py similarity index 100% rename from examples/redirect_requests.py rename to mitmproxy/examples/redirect_requests.py diff --git a/examples/sslstrip.py b/mitmproxy/examples/sslstrip.py similarity index 100% rename from examples/sslstrip.py rename to mitmproxy/examples/sslstrip.py diff --git a/examples/stickycookies b/mitmproxy/examples/stickycookies old mode 100755 new mode 100644 similarity index 100% rename from examples/stickycookies rename to mitmproxy/examples/stickycookies diff --git a/examples/stream.py b/mitmproxy/examples/stream.py similarity index 100% rename from examples/stream.py rename to mitmproxy/examples/stream.py diff --git a/examples/stream_modify.py b/mitmproxy/examples/stream_modify.py similarity index 100% rename from examples/stream_modify.py rename to mitmproxy/examples/stream_modify.py diff --git a/examples/stub.py b/mitmproxy/examples/stub.py similarity index 100% rename from examples/stub.py rename to mitmproxy/examples/stub.py diff --git a/examples/tcp_message.py b/mitmproxy/examples/tcp_message.py similarity index 100% rename from examples/tcp_message.py rename to mitmproxy/examples/tcp_message.py diff --git a/examples/tls_passthrough.py b/mitmproxy/examples/tls_passthrough.py similarity index 100% rename from examples/tls_passthrough.py rename to mitmproxy/examples/tls_passthrough.py diff --git a/examples/upsidedownternet.py b/mitmproxy/examples/upsidedownternet.py similarity index 100% rename from examples/upsidedownternet.py rename to mitmproxy/examples/upsidedownternet.py diff --git a/libmproxy/__init__.py b/mitmproxy/libmproxy/__init__.py similarity index 100% rename from libmproxy/__init__.py rename to mitmproxy/libmproxy/__init__.py diff --git a/libmproxy/cmdline.py b/mitmproxy/libmproxy/cmdline.py similarity index 100% rename from libmproxy/cmdline.py rename to mitmproxy/libmproxy/cmdline.py diff --git a/libmproxy/console/__init__.py b/mitmproxy/libmproxy/console/__init__.py similarity index 100% rename from libmproxy/console/__init__.py rename to mitmproxy/libmproxy/console/__init__.py diff --git a/libmproxy/console/common.py b/mitmproxy/libmproxy/console/common.py similarity index 100% rename from libmproxy/console/common.py rename to mitmproxy/libmproxy/console/common.py diff --git a/libmproxy/console/flowdetailview.py b/mitmproxy/libmproxy/console/flowdetailview.py similarity index 100% rename from libmproxy/console/flowdetailview.py rename to mitmproxy/libmproxy/console/flowdetailview.py diff --git a/libmproxy/console/flowlist.py b/mitmproxy/libmproxy/console/flowlist.py similarity index 100% rename from libmproxy/console/flowlist.py rename to mitmproxy/libmproxy/console/flowlist.py diff --git a/libmproxy/console/flowview.py b/mitmproxy/libmproxy/console/flowview.py similarity index 100% rename from libmproxy/console/flowview.py rename to mitmproxy/libmproxy/console/flowview.py diff --git a/libmproxy/console/grideditor.py b/mitmproxy/libmproxy/console/grideditor.py similarity index 100% rename from libmproxy/console/grideditor.py rename to mitmproxy/libmproxy/console/grideditor.py diff --git a/libmproxy/console/help.py b/mitmproxy/libmproxy/console/help.py similarity index 100% rename from libmproxy/console/help.py rename to mitmproxy/libmproxy/console/help.py diff --git a/libmproxy/console/options.py b/mitmproxy/libmproxy/console/options.py similarity index 100% rename from libmproxy/console/options.py rename to mitmproxy/libmproxy/console/options.py diff --git a/libmproxy/console/palettepicker.py b/mitmproxy/libmproxy/console/palettepicker.py similarity index 100% rename from libmproxy/console/palettepicker.py rename to mitmproxy/libmproxy/console/palettepicker.py diff --git a/libmproxy/console/palettes.py b/mitmproxy/libmproxy/console/palettes.py similarity index 100% rename from libmproxy/console/palettes.py rename to mitmproxy/libmproxy/console/palettes.py diff --git a/libmproxy/console/pathedit.py b/mitmproxy/libmproxy/console/pathedit.py similarity index 100% rename from libmproxy/console/pathedit.py rename to mitmproxy/libmproxy/console/pathedit.py diff --git a/libmproxy/console/searchable.py b/mitmproxy/libmproxy/console/searchable.py similarity index 100% rename from libmproxy/console/searchable.py rename to mitmproxy/libmproxy/console/searchable.py diff --git a/libmproxy/console/select.py b/mitmproxy/libmproxy/console/select.py similarity index 100% rename from libmproxy/console/select.py rename to mitmproxy/libmproxy/console/select.py diff --git a/libmproxy/console/signals.py b/mitmproxy/libmproxy/console/signals.py similarity index 100% rename from libmproxy/console/signals.py rename to mitmproxy/libmproxy/console/signals.py diff --git a/libmproxy/console/statusbar.py b/mitmproxy/libmproxy/console/statusbar.py similarity index 100% rename from libmproxy/console/statusbar.py rename to mitmproxy/libmproxy/console/statusbar.py diff --git a/libmproxy/console/tabs.py b/mitmproxy/libmproxy/console/tabs.py similarity index 100% rename from libmproxy/console/tabs.py rename to mitmproxy/libmproxy/console/tabs.py diff --git a/libmproxy/console/window.py b/mitmproxy/libmproxy/console/window.py similarity index 100% rename from libmproxy/console/window.py rename to mitmproxy/libmproxy/console/window.py diff --git a/libmproxy/contentviews.py b/mitmproxy/libmproxy/contentviews.py similarity index 100% rename from libmproxy/contentviews.py rename to mitmproxy/libmproxy/contentviews.py diff --git a/libmproxy/contrib/README b/mitmproxy/libmproxy/contrib/README similarity index 100% rename from libmproxy/contrib/README rename to mitmproxy/libmproxy/contrib/README diff --git a/libmproxy/contrib/__init__.py b/mitmproxy/libmproxy/contrib/__init__.py similarity index 100% rename from libmproxy/contrib/__init__.py rename to mitmproxy/libmproxy/contrib/__init__.py diff --git a/libmproxy/contrib/jsbeautifier/__init__.py b/mitmproxy/libmproxy/contrib/jsbeautifier/__init__.py similarity index 100% rename from libmproxy/contrib/jsbeautifier/__init__.py rename to mitmproxy/libmproxy/contrib/jsbeautifier/__init__.py diff --git a/libmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd similarity index 100% rename from libmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd rename to mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd diff --git a/libmproxy/contrib/jsbeautifier/unpackers/__init__.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/__init__.py similarity index 100% rename from libmproxy/contrib/jsbeautifier/unpackers/__init__.py rename to mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/__init__.py diff --git a/libmproxy/contrib/jsbeautifier/unpackers/evalbased.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/evalbased.py similarity index 100% rename from libmproxy/contrib/jsbeautifier/unpackers/evalbased.py rename to mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/evalbased.py diff --git a/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py similarity index 100% rename from libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py rename to mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py diff --git a/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py similarity index 100% rename from libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py rename to mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py diff --git a/libmproxy/contrib/jsbeautifier/unpackers/packer.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/packer.py similarity index 100% rename from libmproxy/contrib/jsbeautifier/unpackers/packer.py rename to mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/packer.py diff --git a/libmproxy/contrib/jsbeautifier/unpackers/urlencode.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/urlencode.py similarity index 100% rename from libmproxy/contrib/jsbeautifier/unpackers/urlencode.py rename to mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/urlencode.py diff --git a/libmproxy/contrib/tls/__init__.py b/mitmproxy/libmproxy/contrib/tls/__init__.py similarity index 100% rename from libmproxy/contrib/tls/__init__.py rename to mitmproxy/libmproxy/contrib/tls/__init__.py diff --git a/libmproxy/contrib/tls/_constructs.py b/mitmproxy/libmproxy/contrib/tls/_constructs.py similarity index 100% rename from libmproxy/contrib/tls/_constructs.py rename to mitmproxy/libmproxy/contrib/tls/_constructs.py diff --git a/libmproxy/contrib/tls/utils.py b/mitmproxy/libmproxy/contrib/tls/utils.py similarity index 100% rename from libmproxy/contrib/tls/utils.py rename to mitmproxy/libmproxy/contrib/tls/utils.py diff --git a/libmproxy/contrib/wbxml/ASCommandResponse.py b/mitmproxy/libmproxy/contrib/wbxml/ASCommandResponse.py similarity index 100% rename from libmproxy/contrib/wbxml/ASCommandResponse.py rename to mitmproxy/libmproxy/contrib/wbxml/ASCommandResponse.py diff --git a/libmproxy/contrib/wbxml/ASWBXML.py b/mitmproxy/libmproxy/contrib/wbxml/ASWBXML.py similarity index 100% rename from libmproxy/contrib/wbxml/ASWBXML.py rename to mitmproxy/libmproxy/contrib/wbxml/ASWBXML.py diff --git a/libmproxy/contrib/wbxml/ASWBXMLByteQueue.py b/mitmproxy/libmproxy/contrib/wbxml/ASWBXMLByteQueue.py similarity index 100% rename from libmproxy/contrib/wbxml/ASWBXMLByteQueue.py rename to mitmproxy/libmproxy/contrib/wbxml/ASWBXMLByteQueue.py diff --git a/libmproxy/contrib/wbxml/ASWBXMLCodePage.py b/mitmproxy/libmproxy/contrib/wbxml/ASWBXMLCodePage.py similarity index 100% rename from libmproxy/contrib/wbxml/ASWBXMLCodePage.py rename to mitmproxy/libmproxy/contrib/wbxml/ASWBXMLCodePage.py diff --git a/libmproxy/contrib/wbxml/GlobalTokens.py b/mitmproxy/libmproxy/contrib/wbxml/GlobalTokens.py similarity index 100% rename from libmproxy/contrib/wbxml/GlobalTokens.py rename to mitmproxy/libmproxy/contrib/wbxml/GlobalTokens.py diff --git a/libmproxy/contrib/wbxml/InvalidDataException.py b/mitmproxy/libmproxy/contrib/wbxml/InvalidDataException.py similarity index 100% rename from libmproxy/contrib/wbxml/InvalidDataException.py rename to mitmproxy/libmproxy/contrib/wbxml/InvalidDataException.py diff --git a/libmproxy/contrib/wbxml/__init__.py b/mitmproxy/libmproxy/contrib/wbxml/__init__.py similarity index 100% rename from libmproxy/contrib/wbxml/__init__.py rename to mitmproxy/libmproxy/contrib/wbxml/__init__.py diff --git a/libmproxy/controller.py b/mitmproxy/libmproxy/controller.py similarity index 100% rename from libmproxy/controller.py rename to mitmproxy/libmproxy/controller.py diff --git a/libmproxy/dump.py b/mitmproxy/libmproxy/dump.py similarity index 100% rename from libmproxy/dump.py rename to mitmproxy/libmproxy/dump.py diff --git a/libmproxy/exceptions.py b/mitmproxy/libmproxy/exceptions.py similarity index 100% rename from libmproxy/exceptions.py rename to mitmproxy/libmproxy/exceptions.py diff --git a/libmproxy/filt.py b/mitmproxy/libmproxy/filt.py similarity index 100% rename from libmproxy/filt.py rename to mitmproxy/libmproxy/filt.py diff --git a/libmproxy/flow.py b/mitmproxy/libmproxy/flow.py similarity index 100% rename from libmproxy/flow.py rename to mitmproxy/libmproxy/flow.py diff --git a/libmproxy/flow_export.py b/mitmproxy/libmproxy/flow_export.py similarity index 100% rename from libmproxy/flow_export.py rename to mitmproxy/libmproxy/flow_export.py diff --git a/libmproxy/flow_format_compat.py b/mitmproxy/libmproxy/flow_format_compat.py similarity index 100% rename from libmproxy/flow_format_compat.py rename to mitmproxy/libmproxy/flow_format_compat.py diff --git a/libmproxy/main.py b/mitmproxy/libmproxy/main.py similarity index 100% rename from libmproxy/main.py rename to mitmproxy/libmproxy/main.py diff --git a/libmproxy/models/__init__.py b/mitmproxy/libmproxy/models/__init__.py similarity index 100% rename from libmproxy/models/__init__.py rename to mitmproxy/libmproxy/models/__init__.py diff --git a/libmproxy/models/connections.py b/mitmproxy/libmproxy/models/connections.py similarity index 100% rename from libmproxy/models/connections.py rename to mitmproxy/libmproxy/models/connections.py diff --git a/libmproxy/models/flow.py b/mitmproxy/libmproxy/models/flow.py similarity index 100% rename from libmproxy/models/flow.py rename to mitmproxy/libmproxy/models/flow.py diff --git a/libmproxy/models/http.py b/mitmproxy/libmproxy/models/http.py similarity index 100% rename from libmproxy/models/http.py rename to mitmproxy/libmproxy/models/http.py diff --git a/libmproxy/onboarding/__init__.py b/mitmproxy/libmproxy/onboarding/__init__.py similarity index 100% rename from libmproxy/onboarding/__init__.py rename to mitmproxy/libmproxy/onboarding/__init__.py diff --git a/libmproxy/onboarding/app.py b/mitmproxy/libmproxy/onboarding/app.py similarity index 100% rename from libmproxy/onboarding/app.py rename to mitmproxy/libmproxy/onboarding/app.py diff --git a/libmproxy/onboarding/static/bootstrap.min.css b/mitmproxy/libmproxy/onboarding/static/bootstrap.min.css similarity index 100% rename from libmproxy/onboarding/static/bootstrap.min.css rename to mitmproxy/libmproxy/onboarding/static/bootstrap.min.css diff --git a/libmproxy/onboarding/static/fontawesome/css/font-awesome.css b/mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.css similarity index 100% rename from libmproxy/onboarding/static/fontawesome/css/font-awesome.css rename to mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.css diff --git a/libmproxy/onboarding/static/fontawesome/css/font-awesome.min.css b/mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.min.css similarity index 100% rename from libmproxy/onboarding/static/fontawesome/css/font-awesome.min.css rename to mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.min.css diff --git a/libmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf similarity index 100% rename from libmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf rename to mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf diff --git a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot old mode 100755 new mode 100644 similarity index 100% rename from libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot rename to mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot diff --git a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg old mode 100755 new mode 100644 similarity index 100% rename from libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg rename to mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg diff --git a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf old mode 100755 new mode 100644 similarity index 100% rename from libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf rename to mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf diff --git a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff old mode 100755 new mode 100644 similarity index 100% rename from libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff rename to mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff diff --git a/libmproxy/onboarding/static/mitmproxy.css b/mitmproxy/libmproxy/onboarding/static/mitmproxy.css similarity index 100% rename from libmproxy/onboarding/static/mitmproxy.css rename to mitmproxy/libmproxy/onboarding/static/mitmproxy.css diff --git a/libmproxy/onboarding/templates/frame.html b/mitmproxy/libmproxy/onboarding/templates/frame.html similarity index 100% rename from libmproxy/onboarding/templates/frame.html rename to mitmproxy/libmproxy/onboarding/templates/frame.html diff --git a/libmproxy/onboarding/templates/index.html b/mitmproxy/libmproxy/onboarding/templates/index.html similarity index 100% rename from libmproxy/onboarding/templates/index.html rename to mitmproxy/libmproxy/onboarding/templates/index.html diff --git a/libmproxy/onboarding/templates/layout.html b/mitmproxy/libmproxy/onboarding/templates/layout.html similarity index 100% rename from libmproxy/onboarding/templates/layout.html rename to mitmproxy/libmproxy/onboarding/templates/layout.html diff --git a/libmproxy/platform/__init__.py b/mitmproxy/libmproxy/platform/__init__.py similarity index 100% rename from libmproxy/platform/__init__.py rename to mitmproxy/libmproxy/platform/__init__.py diff --git a/libmproxy/platform/linux.py b/mitmproxy/libmproxy/platform/linux.py similarity index 100% rename from libmproxy/platform/linux.py rename to mitmproxy/libmproxy/platform/linux.py diff --git a/libmproxy/platform/osx.py b/mitmproxy/libmproxy/platform/osx.py similarity index 100% rename from libmproxy/platform/osx.py rename to mitmproxy/libmproxy/platform/osx.py diff --git a/libmproxy/platform/pf.py b/mitmproxy/libmproxy/platform/pf.py similarity index 100% rename from libmproxy/platform/pf.py rename to mitmproxy/libmproxy/platform/pf.py diff --git a/libmproxy/platform/windows.py b/mitmproxy/libmproxy/platform/windows.py similarity index 100% rename from libmproxy/platform/windows.py rename to mitmproxy/libmproxy/platform/windows.py diff --git a/libmproxy/protocol/__init__.py b/mitmproxy/libmproxy/protocol/__init__.py similarity index 100% rename from libmproxy/protocol/__init__.py rename to mitmproxy/libmproxy/protocol/__init__.py diff --git a/libmproxy/protocol/base.py b/mitmproxy/libmproxy/protocol/base.py similarity index 100% rename from libmproxy/protocol/base.py rename to mitmproxy/libmproxy/protocol/base.py diff --git a/libmproxy/protocol/http.py b/mitmproxy/libmproxy/protocol/http.py similarity index 100% rename from libmproxy/protocol/http.py rename to mitmproxy/libmproxy/protocol/http.py diff --git a/libmproxy/protocol/http1.py b/mitmproxy/libmproxy/protocol/http1.py similarity index 100% rename from libmproxy/protocol/http1.py rename to mitmproxy/libmproxy/protocol/http1.py diff --git a/libmproxy/protocol/http2.py b/mitmproxy/libmproxy/protocol/http2.py similarity index 100% rename from libmproxy/protocol/http2.py rename to mitmproxy/libmproxy/protocol/http2.py diff --git a/libmproxy/protocol/http_replay.py b/mitmproxy/libmproxy/protocol/http_replay.py similarity index 100% rename from libmproxy/protocol/http_replay.py rename to mitmproxy/libmproxy/protocol/http_replay.py diff --git a/libmproxy/protocol/rawtcp.py b/mitmproxy/libmproxy/protocol/rawtcp.py similarity index 100% rename from libmproxy/protocol/rawtcp.py rename to mitmproxy/libmproxy/protocol/rawtcp.py diff --git a/libmproxy/protocol/tls.py b/mitmproxy/libmproxy/protocol/tls.py similarity index 100% rename from libmproxy/protocol/tls.py rename to mitmproxy/libmproxy/protocol/tls.py diff --git a/libmproxy/proxy/__init__.py b/mitmproxy/libmproxy/proxy/__init__.py similarity index 100% rename from libmproxy/proxy/__init__.py rename to mitmproxy/libmproxy/proxy/__init__.py diff --git a/libmproxy/proxy/config.py b/mitmproxy/libmproxy/proxy/config.py similarity index 100% rename from libmproxy/proxy/config.py rename to mitmproxy/libmproxy/proxy/config.py diff --git a/libmproxy/proxy/modes/__init__.py b/mitmproxy/libmproxy/proxy/modes/__init__.py similarity index 100% rename from libmproxy/proxy/modes/__init__.py rename to mitmproxy/libmproxy/proxy/modes/__init__.py diff --git a/libmproxy/proxy/modes/http_proxy.py b/mitmproxy/libmproxy/proxy/modes/http_proxy.py similarity index 100% rename from libmproxy/proxy/modes/http_proxy.py rename to mitmproxy/libmproxy/proxy/modes/http_proxy.py diff --git a/libmproxy/proxy/modes/reverse_proxy.py b/mitmproxy/libmproxy/proxy/modes/reverse_proxy.py similarity index 100% rename from libmproxy/proxy/modes/reverse_proxy.py rename to mitmproxy/libmproxy/proxy/modes/reverse_proxy.py diff --git a/libmproxy/proxy/modes/socks_proxy.py b/mitmproxy/libmproxy/proxy/modes/socks_proxy.py similarity index 100% rename from libmproxy/proxy/modes/socks_proxy.py rename to mitmproxy/libmproxy/proxy/modes/socks_proxy.py diff --git a/libmproxy/proxy/modes/transparent_proxy.py b/mitmproxy/libmproxy/proxy/modes/transparent_proxy.py similarity index 100% rename from libmproxy/proxy/modes/transparent_proxy.py rename to mitmproxy/libmproxy/proxy/modes/transparent_proxy.py diff --git a/libmproxy/proxy/root_context.py b/mitmproxy/libmproxy/proxy/root_context.py similarity index 100% rename from libmproxy/proxy/root_context.py rename to mitmproxy/libmproxy/proxy/root_context.py diff --git a/libmproxy/proxy/server.py b/mitmproxy/libmproxy/proxy/server.py similarity index 100% rename from libmproxy/proxy/server.py rename to mitmproxy/libmproxy/proxy/server.py diff --git a/libmproxy/script/__init__.py b/mitmproxy/libmproxy/script/__init__.py similarity index 100% rename from libmproxy/script/__init__.py rename to mitmproxy/libmproxy/script/__init__.py diff --git a/libmproxy/script/concurrent.py b/mitmproxy/libmproxy/script/concurrent.py similarity index 100% rename from libmproxy/script/concurrent.py rename to mitmproxy/libmproxy/script/concurrent.py diff --git a/libmproxy/script/reloader.py b/mitmproxy/libmproxy/script/reloader.py similarity index 100% rename from libmproxy/script/reloader.py rename to mitmproxy/libmproxy/script/reloader.py diff --git a/libmproxy/script/script.py b/mitmproxy/libmproxy/script/script.py similarity index 100% rename from libmproxy/script/script.py rename to mitmproxy/libmproxy/script/script.py diff --git a/libmproxy/script/script_context.py b/mitmproxy/libmproxy/script/script_context.py similarity index 100% rename from libmproxy/script/script_context.py rename to mitmproxy/libmproxy/script/script_context.py diff --git a/libmproxy/stateobject.py b/mitmproxy/libmproxy/stateobject.py similarity index 100% rename from libmproxy/stateobject.py rename to mitmproxy/libmproxy/stateobject.py diff --git a/libmproxy/tnetstring.py b/mitmproxy/libmproxy/tnetstring.py similarity index 100% rename from libmproxy/tnetstring.py rename to mitmproxy/libmproxy/tnetstring.py diff --git a/libmproxy/utils.py b/mitmproxy/libmproxy/utils.py similarity index 100% rename from libmproxy/utils.py rename to mitmproxy/libmproxy/utils.py diff --git a/libmproxy/version.py b/mitmproxy/libmproxy/version.py similarity index 100% rename from libmproxy/version.py rename to mitmproxy/libmproxy/version.py diff --git a/libmproxy/web/__init__.py b/mitmproxy/libmproxy/web/__init__.py similarity index 100% rename from libmproxy/web/__init__.py rename to mitmproxy/libmproxy/web/__init__.py diff --git a/libmproxy/web/app.py b/mitmproxy/libmproxy/web/app.py similarity index 100% rename from libmproxy/web/app.py rename to mitmproxy/libmproxy/web/app.py diff --git a/libmproxy/web/static/app.css b/mitmproxy/libmproxy/web/static/app.css similarity index 100% rename from libmproxy/web/static/app.css rename to mitmproxy/libmproxy/web/static/app.css diff --git a/libmproxy/web/static/app.js b/mitmproxy/libmproxy/web/static/app.js similarity index 100% rename from libmproxy/web/static/app.js rename to mitmproxy/libmproxy/web/static/app.js diff --git a/libmproxy/web/static/fonts/fontawesome-webfont.eot b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.eot similarity index 100% rename from libmproxy/web/static/fonts/fontawesome-webfont.eot rename to mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.eot diff --git a/libmproxy/web/static/fonts/fontawesome-webfont.svg b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.svg similarity index 100% rename from libmproxy/web/static/fonts/fontawesome-webfont.svg rename to mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.svg diff --git a/libmproxy/web/static/fonts/fontawesome-webfont.ttf b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.ttf similarity index 100% rename from libmproxy/web/static/fonts/fontawesome-webfont.ttf rename to mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.ttf diff --git a/libmproxy/web/static/fonts/fontawesome-webfont.woff b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.woff similarity index 100% rename from libmproxy/web/static/fonts/fontawesome-webfont.woff rename to mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.woff diff --git a/libmproxy/web/static/images/chrome-devtools/LICENSE b/mitmproxy/libmproxy/web/static/images/chrome-devtools/LICENSE similarity index 100% rename from libmproxy/web/static/images/chrome-devtools/LICENSE rename to mitmproxy/libmproxy/web/static/images/chrome-devtools/LICENSE diff --git a/libmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png similarity index 100% rename from libmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png rename to mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png diff --git a/libmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png similarity index 100% rename from libmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png rename to mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png diff --git a/libmproxy/web/static/images/chrome-devtools/resourceJSIcon.png b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceJSIcon.png similarity index 100% rename from libmproxy/web/static/images/chrome-devtools/resourceJSIcon.png rename to mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceJSIcon.png diff --git a/libmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png similarity index 100% rename from libmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png rename to mitmproxy/libmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png diff --git a/libmproxy/web/static/images/resourceExecutableIcon.png b/mitmproxy/libmproxy/web/static/images/resourceExecutableIcon.png similarity index 100% rename from libmproxy/web/static/images/resourceExecutableIcon.png rename to mitmproxy/libmproxy/web/static/images/resourceExecutableIcon.png diff --git a/libmproxy/web/static/images/resourceFlashIcon.png b/mitmproxy/libmproxy/web/static/images/resourceFlashIcon.png similarity index 100% rename from libmproxy/web/static/images/resourceFlashIcon.png rename to mitmproxy/libmproxy/web/static/images/resourceFlashIcon.png diff --git a/libmproxy/web/static/images/resourceImageIcon.png b/mitmproxy/libmproxy/web/static/images/resourceImageIcon.png similarity index 100% rename from libmproxy/web/static/images/resourceImageIcon.png rename to mitmproxy/libmproxy/web/static/images/resourceImageIcon.png diff --git a/libmproxy/web/static/images/resourceJavaIcon.png b/mitmproxy/libmproxy/web/static/images/resourceJavaIcon.png similarity index 100% rename from libmproxy/web/static/images/resourceJavaIcon.png rename to mitmproxy/libmproxy/web/static/images/resourceJavaIcon.png diff --git a/libmproxy/web/static/images/resourceNotModifiedIcon.png b/mitmproxy/libmproxy/web/static/images/resourceNotModifiedIcon.png similarity index 100% rename from libmproxy/web/static/images/resourceNotModifiedIcon.png rename to mitmproxy/libmproxy/web/static/images/resourceNotModifiedIcon.png diff --git a/libmproxy/web/static/images/resourceRedirectIcon.png b/mitmproxy/libmproxy/web/static/images/resourceRedirectIcon.png similarity index 100% rename from libmproxy/web/static/images/resourceRedirectIcon.png rename to mitmproxy/libmproxy/web/static/images/resourceRedirectIcon.png diff --git a/libmproxy/web/static/vendor.css b/mitmproxy/libmproxy/web/static/vendor.css similarity index 100% rename from libmproxy/web/static/vendor.css rename to mitmproxy/libmproxy/web/static/vendor.css diff --git a/libmproxy/web/static/vendor.js b/mitmproxy/libmproxy/web/static/vendor.js similarity index 100% rename from libmproxy/web/static/vendor.js rename to mitmproxy/libmproxy/web/static/vendor.js diff --git a/libmproxy/web/templates/index.html b/mitmproxy/libmproxy/web/templates/index.html similarity index 100% rename from libmproxy/web/templates/index.html rename to mitmproxy/libmproxy/web/templates/index.html diff --git a/libmproxy/webfonts/fontawesome-webfont.eot b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.eot similarity index 100% rename from libmproxy/webfonts/fontawesome-webfont.eot rename to mitmproxy/libmproxy/webfonts/fontawesome-webfont.eot diff --git a/libmproxy/webfonts/fontawesome-webfont.svg b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.svg similarity index 100% rename from libmproxy/webfonts/fontawesome-webfont.svg rename to mitmproxy/libmproxy/webfonts/fontawesome-webfont.svg diff --git a/libmproxy/webfonts/fontawesome-webfont.ttf b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.ttf similarity index 100% rename from libmproxy/webfonts/fontawesome-webfont.ttf rename to mitmproxy/libmproxy/webfonts/fontawesome-webfont.ttf diff --git a/libmproxy/webfonts/fontawesome-webfont.woff b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.woff similarity index 100% rename from libmproxy/webfonts/fontawesome-webfont.woff rename to mitmproxy/libmproxy/webfonts/fontawesome-webfont.woff diff --git a/mitmdump b/mitmproxy/mitmdump old mode 100755 new mode 100644 similarity index 100% rename from mitmdump rename to mitmproxy/mitmdump diff --git a/mitmproxy b/mitmproxy/mitmproxy old mode 100755 new mode 100644 similarity index 100% rename from mitmproxy rename to mitmproxy/mitmproxy diff --git a/mitmweb b/mitmproxy/mitmweb old mode 100755 new mode 100644 similarity index 100% rename from mitmweb rename to mitmproxy/mitmweb diff --git a/release/mitmdump.spec b/mitmproxy/release/mitmdump.spec similarity index 100% rename from release/mitmdump.spec rename to mitmproxy/release/mitmdump.spec diff --git a/release/mitmproxy.spec b/mitmproxy/release/mitmproxy.spec similarity index 100% rename from release/mitmproxy.spec rename to mitmproxy/release/mitmproxy.spec diff --git a/release/mitmweb.spec b/mitmproxy/release/mitmweb.spec similarity index 100% rename from release/mitmweb.spec rename to mitmproxy/release/mitmweb.spec diff --git a/requirements.txt b/mitmproxy/requirements.txt similarity index 100% rename from requirements.txt rename to mitmproxy/requirements.txt diff --git a/setup.cfg b/mitmproxy/setup.cfg similarity index 100% rename from setup.cfg rename to mitmproxy/setup.cfg diff --git a/setup.py b/mitmproxy/setup.py similarity index 100% rename from setup.py rename to mitmproxy/setup.py diff --git a/test/__init__.py b/mitmproxy/test/__init__.py similarity index 100% rename from test/__init__.py rename to mitmproxy/test/__init__.py diff --git a/test/completion/aaa b/mitmproxy/test/completion/aaa similarity index 100% rename from test/completion/aaa rename to mitmproxy/test/completion/aaa diff --git a/test/completion/aab b/mitmproxy/test/completion/aab similarity index 100% rename from test/completion/aab rename to mitmproxy/test/completion/aab diff --git a/test/completion/aac b/mitmproxy/test/completion/aac similarity index 100% rename from test/completion/aac rename to mitmproxy/test/completion/aac diff --git a/test/data/1.css b/mitmproxy/test/data/1.css similarity index 100% rename from test/data/1.css rename to mitmproxy/test/data/1.css diff --git a/test/data/amf01 b/mitmproxy/test/data/amf01 similarity index 100% rename from test/data/amf01 rename to mitmproxy/test/data/amf01 diff --git a/test/data/amf02 b/mitmproxy/test/data/amf02 similarity index 100% rename from test/data/amf02 rename to mitmproxy/test/data/amf02 diff --git a/test/data/amf03 b/mitmproxy/test/data/amf03 similarity index 100% rename from test/data/amf03 rename to mitmproxy/test/data/amf03 diff --git a/test/data/clientcert/.gitignore b/mitmproxy/test/data/clientcert/.gitignore similarity index 100% rename from test/data/clientcert/.gitignore rename to mitmproxy/test/data/clientcert/.gitignore diff --git a/test/data/clientcert/127.0.0.1.pem b/mitmproxy/test/data/clientcert/127.0.0.1.pem similarity index 100% rename from test/data/clientcert/127.0.0.1.pem rename to mitmproxy/test/data/clientcert/127.0.0.1.pem diff --git a/test/data/clientcert/client.cnf b/mitmproxy/test/data/clientcert/client.cnf similarity index 100% rename from test/data/clientcert/client.cnf rename to mitmproxy/test/data/clientcert/client.cnf diff --git a/test/data/clientcert/client.pem b/mitmproxy/test/data/clientcert/client.pem similarity index 100% rename from test/data/clientcert/client.pem rename to mitmproxy/test/data/clientcert/client.pem diff --git a/test/data/clientcert/make b/mitmproxy/test/data/clientcert/make old mode 100755 new mode 100644 similarity index 100% rename from test/data/clientcert/make rename to mitmproxy/test/data/clientcert/make diff --git a/test/data/confdir/mitmproxy-ca-cert.cer b/mitmproxy/test/data/confdir/mitmproxy-ca-cert.cer similarity index 100% rename from test/data/confdir/mitmproxy-ca-cert.cer rename to mitmproxy/test/data/confdir/mitmproxy-ca-cert.cer diff --git a/test/data/confdir/mitmproxy-ca-cert.p12 b/mitmproxy/test/data/confdir/mitmproxy-ca-cert.p12 similarity index 100% rename from test/data/confdir/mitmproxy-ca-cert.p12 rename to mitmproxy/test/data/confdir/mitmproxy-ca-cert.p12 diff --git a/test/data/confdir/mitmproxy-ca-cert.pem b/mitmproxy/test/data/confdir/mitmproxy-ca-cert.pem similarity index 100% rename from test/data/confdir/mitmproxy-ca-cert.pem rename to mitmproxy/test/data/confdir/mitmproxy-ca-cert.pem diff --git a/test/data/confdir/mitmproxy-ca.pem b/mitmproxy/test/data/confdir/mitmproxy-ca.pem similarity index 100% rename from test/data/confdir/mitmproxy-ca.pem rename to mitmproxy/test/data/confdir/mitmproxy-ca.pem diff --git a/test/data/dercert b/mitmproxy/test/data/dercert similarity index 100% rename from test/data/dercert rename to mitmproxy/test/data/dercert diff --git a/test/data/dumpfile-012 b/mitmproxy/test/data/dumpfile-012 similarity index 100% rename from test/data/dumpfile-012 rename to mitmproxy/test/data/dumpfile-012 diff --git a/test/data/dumpfile-013 b/mitmproxy/test/data/dumpfile-013 similarity index 100% rename from test/data/dumpfile-013 rename to mitmproxy/test/data/dumpfile-013 diff --git a/test/data/htpasswd b/mitmproxy/test/data/htpasswd similarity index 100% rename from test/data/htpasswd rename to mitmproxy/test/data/htpasswd diff --git a/test/data/htpasswd.invalid b/mitmproxy/test/data/htpasswd.invalid similarity index 100% rename from test/data/htpasswd.invalid rename to mitmproxy/test/data/htpasswd.invalid diff --git a/test/data/image-err1.jpg b/mitmproxy/test/data/image-err1.jpg similarity index 100% rename from test/data/image-err1.jpg rename to mitmproxy/test/data/image-err1.jpg diff --git a/test/data/image.gif b/mitmproxy/test/data/image.gif similarity index 100% rename from test/data/image.gif rename to mitmproxy/test/data/image.gif diff --git a/test/data/image.ico b/mitmproxy/test/data/image.ico similarity index 100% rename from test/data/image.ico rename to mitmproxy/test/data/image.ico diff --git a/test/data/image.jpg b/mitmproxy/test/data/image.jpg similarity index 100% rename from test/data/image.jpg rename to mitmproxy/test/data/image.jpg diff --git a/test/data/image.png b/mitmproxy/test/data/image.png similarity index 100% rename from test/data/image.png rename to mitmproxy/test/data/image.png diff --git a/test/data/no_common_name.pem b/mitmproxy/test/data/no_common_name.pem similarity index 100% rename from test/data/no_common_name.pem rename to mitmproxy/test/data/no_common_name.pem diff --git a/test/data/pf01 b/mitmproxy/test/data/pf01 similarity index 100% rename from test/data/pf01 rename to mitmproxy/test/data/pf01 diff --git a/test/data/pf02 b/mitmproxy/test/data/pf02 similarity index 100% rename from test/data/pf02 rename to mitmproxy/test/data/pf02 diff --git a/test/data/protobuf01 b/mitmproxy/test/data/protobuf01 similarity index 100% rename from test/data/protobuf01 rename to mitmproxy/test/data/protobuf01 diff --git a/test/data/replace b/mitmproxy/test/data/replace similarity index 100% rename from test/data/replace rename to mitmproxy/test/data/replace diff --git a/test/data/testkey.pem b/mitmproxy/test/data/testkey.pem similarity index 100% rename from test/data/testkey.pem rename to mitmproxy/test/data/testkey.pem diff --git a/test/data/trusted-cadir/8117bdb9.0 b/mitmproxy/test/data/trusted-cadir/8117bdb9.0 similarity index 100% rename from test/data/trusted-cadir/8117bdb9.0 rename to mitmproxy/test/data/trusted-cadir/8117bdb9.0 diff --git a/test/data/trusted-cadir/9d45e6a9.0 b/mitmproxy/test/data/trusted-cadir/9d45e6a9.0 similarity index 100% rename from test/data/trusted-cadir/9d45e6a9.0 rename to mitmproxy/test/data/trusted-cadir/9d45e6a9.0 diff --git a/test/data/trusted-cadir/trusted-ca.pem b/mitmproxy/test/data/trusted-cadir/trusted-ca.pem similarity index 100% rename from test/data/trusted-cadir/trusted-ca.pem rename to mitmproxy/test/data/trusted-cadir/trusted-ca.pem diff --git a/test/data/trusted-server.crt b/mitmproxy/test/data/trusted-server.crt similarity index 100% rename from test/data/trusted-server.crt rename to mitmproxy/test/data/trusted-server.crt diff --git a/test/data/untrusted-server.crt b/mitmproxy/test/data/untrusted-server.crt similarity index 100% rename from test/data/untrusted-server.crt rename to mitmproxy/test/data/untrusted-server.crt diff --git a/test/fuzzing/.env b/mitmproxy/test/fuzzing/.env similarity index 100% rename from test/fuzzing/.env rename to mitmproxy/test/fuzzing/.env diff --git a/test/fuzzing/README b/mitmproxy/test/fuzzing/README similarity index 100% rename from test/fuzzing/README rename to mitmproxy/test/fuzzing/README diff --git a/test/fuzzing/client_patterns b/mitmproxy/test/fuzzing/client_patterns similarity index 100% rename from test/fuzzing/client_patterns rename to mitmproxy/test/fuzzing/client_patterns diff --git a/test/fuzzing/go_proxy b/mitmproxy/test/fuzzing/go_proxy old mode 100755 new mode 100644 similarity index 100% rename from test/fuzzing/go_proxy rename to mitmproxy/test/fuzzing/go_proxy diff --git a/test/fuzzing/reverse_patterns b/mitmproxy/test/fuzzing/reverse_patterns similarity index 100% rename from test/fuzzing/reverse_patterns rename to mitmproxy/test/fuzzing/reverse_patterns diff --git a/test/fuzzing/straight_stream b/mitmproxy/test/fuzzing/straight_stream similarity index 100% rename from test/fuzzing/straight_stream rename to mitmproxy/test/fuzzing/straight_stream diff --git a/test/fuzzing/straight_stream_patterns b/mitmproxy/test/fuzzing/straight_stream_patterns similarity index 100% rename from test/fuzzing/straight_stream_patterns rename to mitmproxy/test/fuzzing/straight_stream_patterns diff --git a/test/fuzzing/straight_stream_ssl b/mitmproxy/test/fuzzing/straight_stream_ssl similarity index 100% rename from test/fuzzing/straight_stream_ssl rename to mitmproxy/test/fuzzing/straight_stream_ssl diff --git a/test/mock_urwid.py b/mitmproxy/test/mock_urwid.py similarity index 100% rename from test/mock_urwid.py rename to mitmproxy/test/mock_urwid.py diff --git a/test/scripts/a.py b/mitmproxy/test/scripts/a.py similarity index 100% rename from test/scripts/a.py rename to mitmproxy/test/scripts/a.py diff --git a/test/scripts/a_helper.py b/mitmproxy/test/scripts/a_helper.py similarity index 100% rename from test/scripts/a_helper.py rename to mitmproxy/test/scripts/a_helper.py diff --git a/test/scripts/all.py b/mitmproxy/test/scripts/all.py similarity index 100% rename from test/scripts/all.py rename to mitmproxy/test/scripts/all.py diff --git a/test/scripts/concurrent_decorator.py b/mitmproxy/test/scripts/concurrent_decorator.py similarity index 100% rename from test/scripts/concurrent_decorator.py rename to mitmproxy/test/scripts/concurrent_decorator.py diff --git a/test/scripts/concurrent_decorator_err.py b/mitmproxy/test/scripts/concurrent_decorator_err.py similarity index 100% rename from test/scripts/concurrent_decorator_err.py rename to mitmproxy/test/scripts/concurrent_decorator_err.py diff --git a/test/scripts/duplicate_flow.py b/mitmproxy/test/scripts/duplicate_flow.py similarity index 100% rename from test/scripts/duplicate_flow.py rename to mitmproxy/test/scripts/duplicate_flow.py diff --git a/test/scripts/loaderr.py b/mitmproxy/test/scripts/loaderr.py similarity index 100% rename from test/scripts/loaderr.py rename to mitmproxy/test/scripts/loaderr.py diff --git a/test/scripts/reqerr.py b/mitmproxy/test/scripts/reqerr.py similarity index 100% rename from test/scripts/reqerr.py rename to mitmproxy/test/scripts/reqerr.py diff --git a/test/scripts/starterr.py b/mitmproxy/test/scripts/starterr.py similarity index 100% rename from test/scripts/starterr.py rename to mitmproxy/test/scripts/starterr.py diff --git a/test/scripts/stream_modify.py b/mitmproxy/test/scripts/stream_modify.py similarity index 100% rename from test/scripts/stream_modify.py rename to mitmproxy/test/scripts/stream_modify.py diff --git a/test/scripts/syntaxerr.py b/mitmproxy/test/scripts/syntaxerr.py similarity index 100% rename from test/scripts/syntaxerr.py rename to mitmproxy/test/scripts/syntaxerr.py diff --git a/test/scripts/tcp_stream_modify.py b/mitmproxy/test/scripts/tcp_stream_modify.py similarity index 100% rename from test/scripts/tcp_stream_modify.py rename to mitmproxy/test/scripts/tcp_stream_modify.py diff --git a/test/scripts/unloaderr.py b/mitmproxy/test/scripts/unloaderr.py similarity index 100% rename from test/scripts/unloaderr.py rename to mitmproxy/test/scripts/unloaderr.py diff --git a/test/test_app.py b/mitmproxy/test/test_app.py similarity index 100% rename from test/test_app.py rename to mitmproxy/test/test_app.py diff --git a/test/test_cmdline.py b/mitmproxy/test/test_cmdline.py similarity index 100% rename from test/test_cmdline.py rename to mitmproxy/test/test_cmdline.py diff --git a/test/test_console.py b/mitmproxy/test/test_console.py similarity index 100% rename from test/test_console.py rename to mitmproxy/test/test_console.py diff --git a/test/test_console_common.py b/mitmproxy/test/test_console_common.py similarity index 100% rename from test/test_console_common.py rename to mitmproxy/test/test_console_common.py diff --git a/test/test_console_help.py b/mitmproxy/test/test_console_help.py similarity index 100% rename from test/test_console_help.py rename to mitmproxy/test/test_console_help.py diff --git a/test/test_console_palettes.py b/mitmproxy/test/test_console_palettes.py similarity index 100% rename from test/test_console_palettes.py rename to mitmproxy/test/test_console_palettes.py diff --git a/test/test_console_pathedit.py b/mitmproxy/test/test_console_pathedit.py similarity index 100% rename from test/test_console_pathedit.py rename to mitmproxy/test/test_console_pathedit.py diff --git a/test/test_contentview.py b/mitmproxy/test/test_contentview.py similarity index 100% rename from test/test_contentview.py rename to mitmproxy/test/test_contentview.py diff --git a/test/test_controller.py b/mitmproxy/test/test_controller.py similarity index 100% rename from test/test_controller.py rename to mitmproxy/test/test_controller.py diff --git a/test/test_custom_contentview.py b/mitmproxy/test/test_custom_contentview.py similarity index 100% rename from test/test_custom_contentview.py rename to mitmproxy/test/test_custom_contentview.py diff --git a/test/test_dump.py b/mitmproxy/test/test_dump.py similarity index 100% rename from test/test_dump.py rename to mitmproxy/test/test_dump.py diff --git a/test/test_examples.py b/mitmproxy/test/test_examples.py similarity index 100% rename from test/test_examples.py rename to mitmproxy/test/test_examples.py diff --git a/test/test_filt.py b/mitmproxy/test/test_filt.py similarity index 100% rename from test/test_filt.py rename to mitmproxy/test/test_filt.py diff --git a/test/test_flow.py b/mitmproxy/test/test_flow.py similarity index 100% rename from test/test_flow.py rename to mitmproxy/test/test_flow.py diff --git a/test/test_flow_export.py b/mitmproxy/test/test_flow_export.py similarity index 100% rename from test/test_flow_export.py rename to mitmproxy/test/test_flow_export.py diff --git a/test/test_flow_format_compat.py b/mitmproxy/test/test_flow_format_compat.py similarity index 100% rename from test/test_flow_format_compat.py rename to mitmproxy/test/test_flow_format_compat.py diff --git a/test/test_fuzzing.py b/mitmproxy/test/test_fuzzing.py similarity index 100% rename from test/test_fuzzing.py rename to mitmproxy/test/test_fuzzing.py diff --git a/test/test_platform_pf.py b/mitmproxy/test/test_platform_pf.py similarity index 100% rename from test/test_platform_pf.py rename to mitmproxy/test/test_platform_pf.py diff --git a/test/test_protocol_http1.py b/mitmproxy/test/test_protocol_http1.py similarity index 100% rename from test/test_protocol_http1.py rename to mitmproxy/test/test_protocol_http1.py diff --git a/test/test_protocol_http2.py b/mitmproxy/test/test_protocol_http2.py similarity index 100% rename from test/test_protocol_http2.py rename to mitmproxy/test/test_protocol_http2.py diff --git a/test/test_proxy.py b/mitmproxy/test/test_proxy.py similarity index 100% rename from test/test_proxy.py rename to mitmproxy/test/test_proxy.py diff --git a/test/test_script.py b/mitmproxy/test/test_script.py similarity index 100% rename from test/test_script.py rename to mitmproxy/test/test_script.py diff --git a/test/test_server.py b/mitmproxy/test/test_server.py similarity index 100% rename from test/test_server.py rename to mitmproxy/test/test_server.py diff --git a/test/test_utils.py b/mitmproxy/test/test_utils.py similarity index 100% rename from test/test_utils.py rename to mitmproxy/test/test_utils.py diff --git a/test/tools/1024example b/mitmproxy/test/tools/1024example similarity index 100% rename from test/tools/1024example rename to mitmproxy/test/tools/1024example diff --git a/test/tools/ab.exe b/mitmproxy/test/tools/ab.exe similarity index 100% rename from test/tools/ab.exe rename to mitmproxy/test/tools/ab.exe diff --git a/test/tools/bench.py b/mitmproxy/test/tools/bench.py similarity index 100% rename from test/tools/bench.py rename to mitmproxy/test/tools/bench.py diff --git a/test/tools/benchtool.py b/mitmproxy/test/tools/benchtool.py similarity index 100% rename from test/tools/benchtool.py rename to mitmproxy/test/tools/benchtool.py diff --git a/test/tools/getcert b/mitmproxy/test/tools/getcert old mode 100755 new mode 100644 similarity index 100% rename from test/tools/getcert rename to mitmproxy/test/tools/getcert diff --git a/test/tools/inspect_dumpfile.py b/mitmproxy/test/tools/inspect_dumpfile.py similarity index 100% rename from test/tools/inspect_dumpfile.py rename to mitmproxy/test/tools/inspect_dumpfile.py diff --git a/test/tools/memoryleak.py b/mitmproxy/test/tools/memoryleak.py similarity index 100% rename from test/tools/memoryleak.py rename to mitmproxy/test/tools/memoryleak.py diff --git a/test/tools/passive_close.py b/mitmproxy/test/tools/passive_close.py similarity index 100% rename from test/tools/passive_close.py rename to mitmproxy/test/tools/passive_close.py diff --git a/test/tools/testpatt b/mitmproxy/test/tools/testpatt old mode 100755 new mode 100644 similarity index 100% rename from test/tools/testpatt rename to mitmproxy/test/tools/testpatt diff --git a/test/tservers.py b/mitmproxy/test/tservers.py similarity index 100% rename from test/tservers.py rename to mitmproxy/test/tservers.py diff --git a/test/tutils.py b/mitmproxy/test/tutils.py similarity index 100% rename from test/tutils.py rename to mitmproxy/test/tutils.py diff --git a/web/.bowerrc b/mitmproxy/web/.bowerrc similarity index 100% rename from web/.bowerrc rename to mitmproxy/web/.bowerrc diff --git a/web/.eslintrc b/mitmproxy/web/.eslintrc similarity index 100% rename from web/.eslintrc rename to mitmproxy/web/.eslintrc diff --git a/web/README b/mitmproxy/web/README similarity index 100% rename from web/README rename to mitmproxy/web/README diff --git a/web/conf.js b/mitmproxy/web/conf.js similarity index 100% rename from web/conf.js rename to mitmproxy/web/conf.js diff --git a/web/gulpfile.js b/mitmproxy/web/gulpfile.js similarity index 100% rename from web/gulpfile.js rename to mitmproxy/web/gulpfile.js diff --git a/web/package.json b/mitmproxy/web/package.json similarity index 100% rename from web/package.json rename to mitmproxy/web/package.json diff --git a/web/src/css/app.less b/mitmproxy/web/src/css/app.less similarity index 100% rename from web/src/css/app.less rename to mitmproxy/web/src/css/app.less diff --git a/web/src/css/eventlog.less b/mitmproxy/web/src/css/eventlog.less similarity index 100% rename from web/src/css/eventlog.less rename to mitmproxy/web/src/css/eventlog.less diff --git a/web/src/css/flowdetail.less b/mitmproxy/web/src/css/flowdetail.less similarity index 100% rename from web/src/css/flowdetail.less rename to mitmproxy/web/src/css/flowdetail.less diff --git a/web/src/css/flowtable.less b/mitmproxy/web/src/css/flowtable.less similarity index 100% rename from web/src/css/flowtable.less rename to mitmproxy/web/src/css/flowtable.less diff --git a/web/src/css/flowview.less b/mitmproxy/web/src/css/flowview.less similarity index 100% rename from web/src/css/flowview.less rename to mitmproxy/web/src/css/flowview.less diff --git a/web/src/css/footer.less b/mitmproxy/web/src/css/footer.less similarity index 100% rename from web/src/css/footer.less rename to mitmproxy/web/src/css/footer.less diff --git a/web/src/css/header.less b/mitmproxy/web/src/css/header.less similarity index 100% rename from web/src/css/header.less rename to mitmproxy/web/src/css/header.less diff --git a/web/src/css/layout.less b/mitmproxy/web/src/css/layout.less similarity index 100% rename from web/src/css/layout.less rename to mitmproxy/web/src/css/layout.less diff --git a/web/src/css/prompt.less b/mitmproxy/web/src/css/prompt.less similarity index 100% rename from web/src/css/prompt.less rename to mitmproxy/web/src/css/prompt.less diff --git a/web/src/css/sprites.less b/mitmproxy/web/src/css/sprites.less similarity index 100% rename from web/src/css/sprites.less rename to mitmproxy/web/src/css/sprites.less diff --git a/web/src/css/tabs.less b/mitmproxy/web/src/css/tabs.less similarity index 100% rename from web/src/css/tabs.less rename to mitmproxy/web/src/css/tabs.less diff --git a/web/src/css/vendor-bootstrap-variables.less b/mitmproxy/web/src/css/vendor-bootstrap-variables.less similarity index 100% rename from web/src/css/vendor-bootstrap-variables.less rename to mitmproxy/web/src/css/vendor-bootstrap-variables.less diff --git a/web/src/css/vendor-bootstrap.less b/mitmproxy/web/src/css/vendor-bootstrap.less similarity index 100% rename from web/src/css/vendor-bootstrap.less rename to mitmproxy/web/src/css/vendor-bootstrap.less diff --git a/web/src/css/vendor.less b/mitmproxy/web/src/css/vendor.less similarity index 100% rename from web/src/css/vendor.less rename to mitmproxy/web/src/css/vendor.less diff --git a/web/src/fonts/FontAwesome.otf b/mitmproxy/web/src/fonts/FontAwesome.otf similarity index 100% rename from web/src/fonts/FontAwesome.otf rename to mitmproxy/web/src/fonts/FontAwesome.otf diff --git a/web/src/fonts/README b/mitmproxy/web/src/fonts/README similarity index 100% rename from web/src/fonts/README rename to mitmproxy/web/src/fonts/README diff --git a/web/src/fonts/font-awesome.css b/mitmproxy/web/src/fonts/font-awesome.css similarity index 100% rename from web/src/fonts/font-awesome.css rename to mitmproxy/web/src/fonts/font-awesome.css diff --git a/web/src/fonts/fontawesome-webfont.eot b/mitmproxy/web/src/fonts/fontawesome-webfont.eot similarity index 100% rename from web/src/fonts/fontawesome-webfont.eot rename to mitmproxy/web/src/fonts/fontawesome-webfont.eot diff --git a/web/src/fonts/fontawesome-webfont.svg b/mitmproxy/web/src/fonts/fontawesome-webfont.svg similarity index 100% rename from web/src/fonts/fontawesome-webfont.svg rename to mitmproxy/web/src/fonts/fontawesome-webfont.svg diff --git a/web/src/fonts/fontawesome-webfont.ttf b/mitmproxy/web/src/fonts/fontawesome-webfont.ttf similarity index 100% rename from web/src/fonts/fontawesome-webfont.ttf rename to mitmproxy/web/src/fonts/fontawesome-webfont.ttf diff --git a/web/src/fonts/fontawesome-webfont.woff b/mitmproxy/web/src/fonts/fontawesome-webfont.woff similarity index 100% rename from web/src/fonts/fontawesome-webfont.woff rename to mitmproxy/web/src/fonts/fontawesome-webfont.woff diff --git a/web/src/images/chrome-devtools/LICENSE b/mitmproxy/web/src/images/chrome-devtools/LICENSE similarity index 100% rename from web/src/images/chrome-devtools/LICENSE rename to mitmproxy/web/src/images/chrome-devtools/LICENSE diff --git a/web/src/images/chrome-devtools/resourceCSSIcon.png b/mitmproxy/web/src/images/chrome-devtools/resourceCSSIcon.png similarity index 100% rename from web/src/images/chrome-devtools/resourceCSSIcon.png rename to mitmproxy/web/src/images/chrome-devtools/resourceCSSIcon.png diff --git a/web/src/images/chrome-devtools/resourceDocumentIcon.png b/mitmproxy/web/src/images/chrome-devtools/resourceDocumentIcon.png similarity index 100% rename from web/src/images/chrome-devtools/resourceDocumentIcon.png rename to mitmproxy/web/src/images/chrome-devtools/resourceDocumentIcon.png diff --git a/web/src/images/chrome-devtools/resourceJSIcon.png b/mitmproxy/web/src/images/chrome-devtools/resourceJSIcon.png similarity index 100% rename from web/src/images/chrome-devtools/resourceJSIcon.png rename to mitmproxy/web/src/images/chrome-devtools/resourceJSIcon.png diff --git a/web/src/images/chrome-devtools/resourcePlainIcon.png b/mitmproxy/web/src/images/chrome-devtools/resourcePlainIcon.png similarity index 100% rename from web/src/images/chrome-devtools/resourcePlainIcon.png rename to mitmproxy/web/src/images/chrome-devtools/resourcePlainIcon.png diff --git a/web/src/images/resourceExecutableIcon.png b/mitmproxy/web/src/images/resourceExecutableIcon.png similarity index 100% rename from web/src/images/resourceExecutableIcon.png rename to mitmproxy/web/src/images/resourceExecutableIcon.png diff --git a/web/src/images/resourceFlashIcon.png b/mitmproxy/web/src/images/resourceFlashIcon.png similarity index 100% rename from web/src/images/resourceFlashIcon.png rename to mitmproxy/web/src/images/resourceFlashIcon.png diff --git a/web/src/images/resourceImageIcon.png b/mitmproxy/web/src/images/resourceImageIcon.png similarity index 100% rename from web/src/images/resourceImageIcon.png rename to mitmproxy/web/src/images/resourceImageIcon.png diff --git a/web/src/images/resourceJavaIcon.png b/mitmproxy/web/src/images/resourceJavaIcon.png similarity index 100% rename from web/src/images/resourceJavaIcon.png rename to mitmproxy/web/src/images/resourceJavaIcon.png diff --git a/web/src/images/resourceNotModifiedIcon.png b/mitmproxy/web/src/images/resourceNotModifiedIcon.png similarity index 100% rename from web/src/images/resourceNotModifiedIcon.png rename to mitmproxy/web/src/images/resourceNotModifiedIcon.png diff --git a/web/src/images/resourceRedirectIcon.png b/mitmproxy/web/src/images/resourceRedirectIcon.png similarity index 100% rename from web/src/images/resourceRedirectIcon.png rename to mitmproxy/web/src/images/resourceRedirectIcon.png diff --git a/web/src/js/actions.js b/mitmproxy/web/src/js/actions.js similarity index 100% rename from web/src/js/actions.js rename to mitmproxy/web/src/js/actions.js diff --git a/web/src/js/app.js b/mitmproxy/web/src/js/app.js similarity index 100% rename from web/src/js/app.js rename to mitmproxy/web/src/js/app.js diff --git a/web/src/js/components/common.js b/mitmproxy/web/src/js/components/common.js similarity index 100% rename from web/src/js/components/common.js rename to mitmproxy/web/src/js/components/common.js diff --git a/web/src/js/components/editor.js b/mitmproxy/web/src/js/components/editor.js similarity index 100% rename from web/src/js/components/editor.js rename to mitmproxy/web/src/js/components/editor.js diff --git a/web/src/js/components/eventlog.js b/mitmproxy/web/src/js/components/eventlog.js similarity index 100% rename from web/src/js/components/eventlog.js rename to mitmproxy/web/src/js/components/eventlog.js diff --git a/web/src/js/components/flowtable-columns.js b/mitmproxy/web/src/js/components/flowtable-columns.js similarity index 100% rename from web/src/js/components/flowtable-columns.js rename to mitmproxy/web/src/js/components/flowtable-columns.js diff --git a/web/src/js/components/flowtable.js b/mitmproxy/web/src/js/components/flowtable.js similarity index 100% rename from web/src/js/components/flowtable.js rename to mitmproxy/web/src/js/components/flowtable.js diff --git a/web/src/js/components/flowview/contentview.js b/mitmproxy/web/src/js/components/flowview/contentview.js similarity index 100% rename from web/src/js/components/flowview/contentview.js rename to mitmproxy/web/src/js/components/flowview/contentview.js diff --git a/web/src/js/components/flowview/details.js b/mitmproxy/web/src/js/components/flowview/details.js similarity index 100% rename from web/src/js/components/flowview/details.js rename to mitmproxy/web/src/js/components/flowview/details.js diff --git a/web/src/js/components/flowview/index.js b/mitmproxy/web/src/js/components/flowview/index.js similarity index 100% rename from web/src/js/components/flowview/index.js rename to mitmproxy/web/src/js/components/flowview/index.js diff --git a/web/src/js/components/flowview/messages.js b/mitmproxy/web/src/js/components/flowview/messages.js similarity index 100% rename from web/src/js/components/flowview/messages.js rename to mitmproxy/web/src/js/components/flowview/messages.js diff --git a/web/src/js/components/flowview/nav.js b/mitmproxy/web/src/js/components/flowview/nav.js similarity index 100% rename from web/src/js/components/flowview/nav.js rename to mitmproxy/web/src/js/components/flowview/nav.js diff --git a/web/src/js/components/footer.js b/mitmproxy/web/src/js/components/footer.js similarity index 100% rename from web/src/js/components/footer.js rename to mitmproxy/web/src/js/components/footer.js diff --git a/web/src/js/components/header.js b/mitmproxy/web/src/js/components/header.js similarity index 100% rename from web/src/js/components/header.js rename to mitmproxy/web/src/js/components/header.js diff --git a/web/src/js/components/mainview.js b/mitmproxy/web/src/js/components/mainview.js similarity index 100% rename from web/src/js/components/mainview.js rename to mitmproxy/web/src/js/components/mainview.js diff --git a/web/src/js/components/prompt.js b/mitmproxy/web/src/js/components/prompt.js similarity index 100% rename from web/src/js/components/prompt.js rename to mitmproxy/web/src/js/components/prompt.js diff --git a/web/src/js/components/proxyapp.js b/mitmproxy/web/src/js/components/proxyapp.js similarity index 100% rename from web/src/js/components/proxyapp.js rename to mitmproxy/web/src/js/components/proxyapp.js diff --git a/web/src/js/components/virtualscroll.js b/mitmproxy/web/src/js/components/virtualscroll.js similarity index 100% rename from web/src/js/components/virtualscroll.js rename to mitmproxy/web/src/js/components/virtualscroll.js diff --git a/web/src/js/connection.js b/mitmproxy/web/src/js/connection.js similarity index 100% rename from web/src/js/connection.js rename to mitmproxy/web/src/js/connection.js diff --git a/web/src/js/dispatcher.js b/mitmproxy/web/src/js/dispatcher.js similarity index 100% rename from web/src/js/dispatcher.js rename to mitmproxy/web/src/js/dispatcher.js diff --git a/web/src/js/filt/filt.js b/mitmproxy/web/src/js/filt/filt.js similarity index 100% rename from web/src/js/filt/filt.js rename to mitmproxy/web/src/js/filt/filt.js diff --git a/web/src/js/filt/filt.peg b/mitmproxy/web/src/js/filt/filt.peg similarity index 100% rename from web/src/js/filt/filt.peg rename to mitmproxy/web/src/js/filt/filt.peg diff --git a/web/src/js/flow/utils.js b/mitmproxy/web/src/js/flow/utils.js similarity index 100% rename from web/src/js/flow/utils.js rename to mitmproxy/web/src/js/flow/utils.js diff --git a/web/src/js/store/store.js b/mitmproxy/web/src/js/store/store.js similarity index 100% rename from web/src/js/store/store.js rename to mitmproxy/web/src/js/store/store.js diff --git a/web/src/js/store/view.js b/mitmproxy/web/src/js/store/view.js similarity index 100% rename from web/src/js/store/view.js rename to mitmproxy/web/src/js/store/view.js diff --git a/web/src/js/tests/utils.js b/mitmproxy/web/src/js/tests/utils.js similarity index 100% rename from web/src/js/tests/utils.js rename to mitmproxy/web/src/js/tests/utils.js diff --git a/web/src/js/utils.js b/mitmproxy/web/src/js/utils.js similarity index 100% rename from web/src/js/utils.js rename to mitmproxy/web/src/js/utils.js diff --git a/web/src/templates/index.html b/mitmproxy/web/src/templates/index.html similarity index 100% rename from web/src/templates/index.html rename to mitmproxy/web/src/templates/index.html