diff --git a/netlib/test/__init__.py b/test/__init__.py
similarity index 100%
rename from netlib/test/__init__.py
rename to test/__init__.py
diff --git a/mitmproxy/test/__init__.py b/test/mitmproxy/__init__.py
similarity index 100%
rename from mitmproxy/test/__init__.py
rename to test/mitmproxy/__init__.py
diff --git a/mitmproxy/test/completion/aaa b/test/mitmproxy/completion/aaa
similarity index 100%
rename from mitmproxy/test/completion/aaa
rename to test/mitmproxy/completion/aaa
diff --git a/mitmproxy/test/completion/aab b/test/mitmproxy/completion/aab
similarity index 100%
rename from mitmproxy/test/completion/aab
rename to test/mitmproxy/completion/aab
diff --git a/mitmproxy/test/completion/aac b/test/mitmproxy/completion/aac
similarity index 100%
rename from mitmproxy/test/completion/aac
rename to test/mitmproxy/completion/aac
diff --git a/mitmproxy/test/data/1.css b/test/mitmproxy/data/1.css
similarity index 100%
rename from mitmproxy/test/data/1.css
rename to test/mitmproxy/data/1.css
diff --git a/mitmproxy/test/data/amf01 b/test/mitmproxy/data/amf01
similarity index 100%
rename from mitmproxy/test/data/amf01
rename to test/mitmproxy/data/amf01
diff --git a/mitmproxy/test/data/amf02 b/test/mitmproxy/data/amf02
similarity index 100%
rename from mitmproxy/test/data/amf02
rename to test/mitmproxy/data/amf02
diff --git a/mitmproxy/test/data/amf03 b/test/mitmproxy/data/amf03
similarity index 100%
rename from mitmproxy/test/data/amf03
rename to test/mitmproxy/data/amf03
diff --git a/mitmproxy/test/data/clientcert/.gitignore b/test/mitmproxy/data/clientcert/.gitignore
similarity index 100%
rename from mitmproxy/test/data/clientcert/.gitignore
rename to test/mitmproxy/data/clientcert/.gitignore
diff --git a/mitmproxy/test/data/clientcert/127.0.0.1.pem b/test/mitmproxy/data/clientcert/127.0.0.1.pem
similarity index 100%
rename from mitmproxy/test/data/clientcert/127.0.0.1.pem
rename to test/mitmproxy/data/clientcert/127.0.0.1.pem
diff --git a/mitmproxy/test/data/clientcert/client.cnf b/test/mitmproxy/data/clientcert/client.cnf
similarity index 100%
rename from mitmproxy/test/data/clientcert/client.cnf
rename to test/mitmproxy/data/clientcert/client.cnf
diff --git a/mitmproxy/test/data/clientcert/client.pem b/test/mitmproxy/data/clientcert/client.pem
similarity index 100%
rename from mitmproxy/test/data/clientcert/client.pem
rename to test/mitmproxy/data/clientcert/client.pem
diff --git a/mitmproxy/test/data/clientcert/make b/test/mitmproxy/data/clientcert/make
similarity index 100%
rename from mitmproxy/test/data/clientcert/make
rename to test/mitmproxy/data/clientcert/make
diff --git a/mitmproxy/test/data/confdir/mitmproxy-ca-cert.cer b/test/mitmproxy/data/confdir/mitmproxy-ca-cert.cer
similarity index 100%
rename from mitmproxy/test/data/confdir/mitmproxy-ca-cert.cer
rename to test/mitmproxy/data/confdir/mitmproxy-ca-cert.cer
diff --git a/mitmproxy/test/data/confdir/mitmproxy-ca-cert.p12 b/test/mitmproxy/data/confdir/mitmproxy-ca-cert.p12
similarity index 100%
rename from mitmproxy/test/data/confdir/mitmproxy-ca-cert.p12
rename to test/mitmproxy/data/confdir/mitmproxy-ca-cert.p12
diff --git a/mitmproxy/test/data/confdir/mitmproxy-ca-cert.pem b/test/mitmproxy/data/confdir/mitmproxy-ca-cert.pem
similarity index 100%
rename from mitmproxy/test/data/confdir/mitmproxy-ca-cert.pem
rename to test/mitmproxy/data/confdir/mitmproxy-ca-cert.pem
diff --git a/mitmproxy/test/data/confdir/mitmproxy-ca.pem b/test/mitmproxy/data/confdir/mitmproxy-ca.pem
similarity index 100%
rename from mitmproxy/test/data/confdir/mitmproxy-ca.pem
rename to test/mitmproxy/data/confdir/mitmproxy-ca.pem
diff --git a/mitmproxy/test/data/dercert b/test/mitmproxy/data/dercert
similarity index 100%
rename from mitmproxy/test/data/dercert
rename to test/mitmproxy/data/dercert
diff --git a/mitmproxy/test/data/dumpfile-012 b/test/mitmproxy/data/dumpfile-012
similarity index 100%
rename from mitmproxy/test/data/dumpfile-012
rename to test/mitmproxy/data/dumpfile-012
diff --git a/mitmproxy/test/data/dumpfile-013 b/test/mitmproxy/data/dumpfile-013
similarity index 100%
rename from mitmproxy/test/data/dumpfile-013
rename to test/mitmproxy/data/dumpfile-013
diff --git a/mitmproxy/test/data/htpasswd b/test/mitmproxy/data/htpasswd
similarity index 100%
rename from mitmproxy/test/data/htpasswd
rename to test/mitmproxy/data/htpasswd
diff --git a/mitmproxy/test/data/htpasswd.invalid b/test/mitmproxy/data/htpasswd.invalid
similarity index 100%
rename from mitmproxy/test/data/htpasswd.invalid
rename to test/mitmproxy/data/htpasswd.invalid
diff --git a/mitmproxy/test/data/image-err1.jpg b/test/mitmproxy/data/image-err1.jpg
similarity index 100%
rename from mitmproxy/test/data/image-err1.jpg
rename to test/mitmproxy/data/image-err1.jpg
diff --git a/mitmproxy/test/data/image.gif b/test/mitmproxy/data/image.gif
similarity index 100%
rename from mitmproxy/test/data/image.gif
rename to test/mitmproxy/data/image.gif
diff --git a/mitmproxy/test/data/image.ico b/test/mitmproxy/data/image.ico
similarity index 100%
rename from mitmproxy/test/data/image.ico
rename to test/mitmproxy/data/image.ico
diff --git a/mitmproxy/test/data/image.jpg b/test/mitmproxy/data/image.jpg
similarity index 100%
rename from mitmproxy/test/data/image.jpg
rename to test/mitmproxy/data/image.jpg
diff --git a/mitmproxy/test/data/image.png b/test/mitmproxy/data/image.png
similarity index 100%
rename from mitmproxy/test/data/image.png
rename to test/mitmproxy/data/image.png
diff --git a/mitmproxy/test/data/no_common_name.pem b/test/mitmproxy/data/no_common_name.pem
similarity index 100%
rename from mitmproxy/test/data/no_common_name.pem
rename to test/mitmproxy/data/no_common_name.pem
diff --git a/mitmproxy/test/data/pf01 b/test/mitmproxy/data/pf01
similarity index 100%
rename from mitmproxy/test/data/pf01
rename to test/mitmproxy/data/pf01
diff --git a/mitmproxy/test/data/pf02 b/test/mitmproxy/data/pf02
similarity index 100%
rename from mitmproxy/test/data/pf02
rename to test/mitmproxy/data/pf02
diff --git a/mitmproxy/test/data/protobuf01 b/test/mitmproxy/data/protobuf01
similarity index 100%
rename from mitmproxy/test/data/protobuf01
rename to test/mitmproxy/data/protobuf01
diff --git a/mitmproxy/test/data/replace b/test/mitmproxy/data/replace
similarity index 100%
rename from mitmproxy/test/data/replace
rename to test/mitmproxy/data/replace
diff --git a/mitmproxy/test/data/testkey.pem b/test/mitmproxy/data/testkey.pem
similarity index 100%
rename from mitmproxy/test/data/testkey.pem
rename to test/mitmproxy/data/testkey.pem
diff --git a/mitmproxy/test/data/trusted-cadir/8117bdb9.0 b/test/mitmproxy/data/trusted-cadir/8117bdb9.0
similarity index 100%
rename from mitmproxy/test/data/trusted-cadir/8117bdb9.0
rename to test/mitmproxy/data/trusted-cadir/8117bdb9.0
diff --git a/mitmproxy/test/data/trusted-cadir/9d45e6a9.0 b/test/mitmproxy/data/trusted-cadir/9d45e6a9.0
similarity index 100%
rename from mitmproxy/test/data/trusted-cadir/9d45e6a9.0
rename to test/mitmproxy/data/trusted-cadir/9d45e6a9.0
diff --git a/mitmproxy/test/data/trusted-cadir/trusted-ca.pem b/test/mitmproxy/data/trusted-cadir/trusted-ca.pem
similarity index 100%
rename from mitmproxy/test/data/trusted-cadir/trusted-ca.pem
rename to test/mitmproxy/data/trusted-cadir/trusted-ca.pem
diff --git a/mitmproxy/test/data/trusted-server.crt b/test/mitmproxy/data/trusted-server.crt
similarity index 100%
rename from mitmproxy/test/data/trusted-server.crt
rename to test/mitmproxy/data/trusted-server.crt
diff --git a/mitmproxy/test/data/untrusted-server.crt b/test/mitmproxy/data/untrusted-server.crt
similarity index 100%
rename from mitmproxy/test/data/untrusted-server.crt
rename to test/mitmproxy/data/untrusted-server.crt
diff --git a/mitmproxy/test/fuzzing/.env b/test/mitmproxy/fuzzing/.env
similarity index 100%
rename from mitmproxy/test/fuzzing/.env
rename to test/mitmproxy/fuzzing/.env
diff --git a/mitmproxy/test/fuzzing/README b/test/mitmproxy/fuzzing/README
similarity index 100%
rename from mitmproxy/test/fuzzing/README
rename to test/mitmproxy/fuzzing/README
diff --git a/mitmproxy/test/fuzzing/client_patterns b/test/mitmproxy/fuzzing/client_patterns
similarity index 100%
rename from mitmproxy/test/fuzzing/client_patterns
rename to test/mitmproxy/fuzzing/client_patterns
diff --git a/mitmproxy/test/fuzzing/go_proxy b/test/mitmproxy/fuzzing/go_proxy
similarity index 100%
rename from mitmproxy/test/fuzzing/go_proxy
rename to test/mitmproxy/fuzzing/go_proxy
diff --git a/mitmproxy/test/fuzzing/reverse_patterns b/test/mitmproxy/fuzzing/reverse_patterns
similarity index 100%
rename from mitmproxy/test/fuzzing/reverse_patterns
rename to test/mitmproxy/fuzzing/reverse_patterns
diff --git a/mitmproxy/test/fuzzing/straight_stream b/test/mitmproxy/fuzzing/straight_stream
similarity index 100%
rename from mitmproxy/test/fuzzing/straight_stream
rename to test/mitmproxy/fuzzing/straight_stream
diff --git a/mitmproxy/test/fuzzing/straight_stream_patterns b/test/mitmproxy/fuzzing/straight_stream_patterns
similarity index 100%
rename from mitmproxy/test/fuzzing/straight_stream_patterns
rename to test/mitmproxy/fuzzing/straight_stream_patterns
diff --git a/mitmproxy/test/fuzzing/straight_stream_ssl b/test/mitmproxy/fuzzing/straight_stream_ssl
similarity index 100%
rename from mitmproxy/test/fuzzing/straight_stream_ssl
rename to test/mitmproxy/fuzzing/straight_stream_ssl
diff --git a/mitmproxy/test/mock_urwid.py b/test/mitmproxy/mock_urwid.py
similarity index 100%
rename from mitmproxy/test/mock_urwid.py
rename to test/mitmproxy/mock_urwid.py
diff --git a/mitmproxy/test/scripts/a.py b/test/mitmproxy/scripts/a.py
similarity index 100%
rename from mitmproxy/test/scripts/a.py
rename to test/mitmproxy/scripts/a.py
diff --git a/mitmproxy/test/scripts/a_helper.py b/test/mitmproxy/scripts/a_helper.py
similarity index 100%
rename from mitmproxy/test/scripts/a_helper.py
rename to test/mitmproxy/scripts/a_helper.py
diff --git a/mitmproxy/test/scripts/all.py b/test/mitmproxy/scripts/all.py
similarity index 100%
rename from mitmproxy/test/scripts/all.py
rename to test/mitmproxy/scripts/all.py
diff --git a/mitmproxy/test/scripts/concurrent_decorator.py b/test/mitmproxy/scripts/concurrent_decorator.py
similarity index 100%
rename from mitmproxy/test/scripts/concurrent_decorator.py
rename to test/mitmproxy/scripts/concurrent_decorator.py
diff --git a/mitmproxy/test/scripts/concurrent_decorator_err.py b/test/mitmproxy/scripts/concurrent_decorator_err.py
similarity index 100%
rename from mitmproxy/test/scripts/concurrent_decorator_err.py
rename to test/mitmproxy/scripts/concurrent_decorator_err.py
diff --git a/mitmproxy/test/scripts/duplicate_flow.py b/test/mitmproxy/scripts/duplicate_flow.py
similarity index 100%
rename from mitmproxy/test/scripts/duplicate_flow.py
rename to test/mitmproxy/scripts/duplicate_flow.py
diff --git a/mitmproxy/test/scripts/loaderr.py b/test/mitmproxy/scripts/loaderr.py
similarity index 100%
rename from mitmproxy/test/scripts/loaderr.py
rename to test/mitmproxy/scripts/loaderr.py
diff --git a/mitmproxy/test/scripts/reqerr.py b/test/mitmproxy/scripts/reqerr.py
similarity index 100%
rename from mitmproxy/test/scripts/reqerr.py
rename to test/mitmproxy/scripts/reqerr.py
diff --git a/mitmproxy/test/scripts/starterr.py b/test/mitmproxy/scripts/starterr.py
similarity index 100%
rename from mitmproxy/test/scripts/starterr.py
rename to test/mitmproxy/scripts/starterr.py
diff --git a/mitmproxy/test/scripts/stream_modify.py b/test/mitmproxy/scripts/stream_modify.py
similarity index 100%
rename from mitmproxy/test/scripts/stream_modify.py
rename to test/mitmproxy/scripts/stream_modify.py
diff --git a/mitmproxy/test/scripts/syntaxerr.py b/test/mitmproxy/scripts/syntaxerr.py
similarity index 100%
rename from mitmproxy/test/scripts/syntaxerr.py
rename to test/mitmproxy/scripts/syntaxerr.py
diff --git a/mitmproxy/test/scripts/tcp_stream_modify.py b/test/mitmproxy/scripts/tcp_stream_modify.py
similarity index 100%
rename from mitmproxy/test/scripts/tcp_stream_modify.py
rename to test/mitmproxy/scripts/tcp_stream_modify.py
diff --git a/mitmproxy/test/scripts/unloaderr.py b/test/mitmproxy/scripts/unloaderr.py
similarity index 100%
rename from mitmproxy/test/scripts/unloaderr.py
rename to test/mitmproxy/scripts/unloaderr.py
diff --git a/mitmproxy/test/test_app.py b/test/mitmproxy/test_app.py
similarity index 100%
rename from mitmproxy/test/test_app.py
rename to test/mitmproxy/test_app.py
diff --git a/mitmproxy/test/test_cmdline.py b/test/mitmproxy/test_cmdline.py
similarity index 100%
rename from mitmproxy/test/test_cmdline.py
rename to test/mitmproxy/test_cmdline.py
diff --git a/mitmproxy/test/test_console.py b/test/mitmproxy/test_console.py
similarity index 100%
rename from mitmproxy/test/test_console.py
rename to test/mitmproxy/test_console.py
diff --git a/mitmproxy/test/test_console_common.py b/test/mitmproxy/test_console_common.py
similarity index 100%
rename from mitmproxy/test/test_console_common.py
rename to test/mitmproxy/test_console_common.py
diff --git a/mitmproxy/test/test_console_help.py b/test/mitmproxy/test_console_help.py
similarity index 100%
rename from mitmproxy/test/test_console_help.py
rename to test/mitmproxy/test_console_help.py
diff --git a/mitmproxy/test/test_console_palettes.py b/test/mitmproxy/test_console_palettes.py
similarity index 100%
rename from mitmproxy/test/test_console_palettes.py
rename to test/mitmproxy/test_console_palettes.py
diff --git a/mitmproxy/test/test_console_pathedit.py b/test/mitmproxy/test_console_pathedit.py
similarity index 100%
rename from mitmproxy/test/test_console_pathedit.py
rename to test/mitmproxy/test_console_pathedit.py
diff --git a/mitmproxy/test/test_contentview.py b/test/mitmproxy/test_contentview.py
similarity index 100%
rename from mitmproxy/test/test_contentview.py
rename to test/mitmproxy/test_contentview.py
diff --git a/mitmproxy/test/test_controller.py b/test/mitmproxy/test_controller.py
similarity index 100%
rename from mitmproxy/test/test_controller.py
rename to test/mitmproxy/test_controller.py
diff --git a/mitmproxy/test/test_custom_contentview.py b/test/mitmproxy/test_custom_contentview.py
similarity index 100%
rename from mitmproxy/test/test_custom_contentview.py
rename to test/mitmproxy/test_custom_contentview.py
diff --git a/mitmproxy/test/test_dump.py b/test/mitmproxy/test_dump.py
similarity index 100%
rename from mitmproxy/test/test_dump.py
rename to test/mitmproxy/test_dump.py
diff --git a/mitmproxy/test/test_examples.py b/test/mitmproxy/test_examples.py
similarity index 100%
rename from mitmproxy/test/test_examples.py
rename to test/mitmproxy/test_examples.py
diff --git a/mitmproxy/test/test_filt.py b/test/mitmproxy/test_filt.py
similarity index 100%
rename from mitmproxy/test/test_filt.py
rename to test/mitmproxy/test_filt.py
diff --git a/mitmproxy/test/test_flow.py b/test/mitmproxy/test_flow.py
similarity index 100%
rename from mitmproxy/test/test_flow.py
rename to test/mitmproxy/test_flow.py
diff --git a/mitmproxy/test/test_flow_export.py b/test/mitmproxy/test_flow_export.py
similarity index 100%
rename from mitmproxy/test/test_flow_export.py
rename to test/mitmproxy/test_flow_export.py
diff --git a/mitmproxy/test/test_flow_format_compat.py b/test/mitmproxy/test_flow_format_compat.py
similarity index 100%
rename from mitmproxy/test/test_flow_format_compat.py
rename to test/mitmproxy/test_flow_format_compat.py
diff --git a/mitmproxy/test/test_fuzzing.py b/test/mitmproxy/test_fuzzing.py
similarity index 100%
rename from mitmproxy/test/test_fuzzing.py
rename to test/mitmproxy/test_fuzzing.py
diff --git a/mitmproxy/test/test_platform_pf.py b/test/mitmproxy/test_platform_pf.py
similarity index 100%
rename from mitmproxy/test/test_platform_pf.py
rename to test/mitmproxy/test_platform_pf.py
diff --git a/mitmproxy/test/test_protocol_http1.py b/test/mitmproxy/test_protocol_http1.py
similarity index 100%
rename from mitmproxy/test/test_protocol_http1.py
rename to test/mitmproxy/test_protocol_http1.py
diff --git a/mitmproxy/test/test_protocol_http2.py b/test/mitmproxy/test_protocol_http2.py
similarity index 100%
rename from mitmproxy/test/test_protocol_http2.py
rename to test/mitmproxy/test_protocol_http2.py
diff --git a/mitmproxy/test/test_proxy.py b/test/mitmproxy/test_proxy.py
similarity index 100%
rename from mitmproxy/test/test_proxy.py
rename to test/mitmproxy/test_proxy.py
diff --git a/mitmproxy/test/test_script.py b/test/mitmproxy/test_script.py
similarity index 100%
rename from mitmproxy/test/test_script.py
rename to test/mitmproxy/test_script.py
diff --git a/mitmproxy/test/test_server.py b/test/mitmproxy/test_server.py
similarity index 100%
rename from mitmproxy/test/test_server.py
rename to test/mitmproxy/test_server.py
diff --git a/mitmproxy/test/test_utils.py b/test/mitmproxy/test_utils.py
similarity index 100%
rename from mitmproxy/test/test_utils.py
rename to test/mitmproxy/test_utils.py
diff --git a/mitmproxy/test/tools/1024example b/test/mitmproxy/tools/1024example
similarity index 100%
rename from mitmproxy/test/tools/1024example
rename to test/mitmproxy/tools/1024example
diff --git a/mitmproxy/test/tools/ab.exe b/test/mitmproxy/tools/ab.exe
similarity index 100%
rename from mitmproxy/test/tools/ab.exe
rename to test/mitmproxy/tools/ab.exe
diff --git a/mitmproxy/test/tools/bench.py b/test/mitmproxy/tools/bench.py
similarity index 100%
rename from mitmproxy/test/tools/bench.py
rename to test/mitmproxy/tools/bench.py
diff --git a/mitmproxy/test/tools/benchtool.py b/test/mitmproxy/tools/benchtool.py
similarity index 100%
rename from mitmproxy/test/tools/benchtool.py
rename to test/mitmproxy/tools/benchtool.py
diff --git a/mitmproxy/test/tools/getcert b/test/mitmproxy/tools/getcert
similarity index 100%
rename from mitmproxy/test/tools/getcert
rename to test/mitmproxy/tools/getcert
diff --git a/mitmproxy/test/tools/inspect_dumpfile.py b/test/mitmproxy/tools/inspect_dumpfile.py
similarity index 100%
rename from mitmproxy/test/tools/inspect_dumpfile.py
rename to test/mitmproxy/tools/inspect_dumpfile.py
diff --git a/mitmproxy/test/tools/memoryleak.py b/test/mitmproxy/tools/memoryleak.py
similarity index 100%
rename from mitmproxy/test/tools/memoryleak.py
rename to test/mitmproxy/tools/memoryleak.py
diff --git a/mitmproxy/test/tools/passive_close.py b/test/mitmproxy/tools/passive_close.py
similarity index 100%
rename from mitmproxy/test/tools/passive_close.py
rename to test/mitmproxy/tools/passive_close.py
diff --git a/mitmproxy/test/tools/testpatt b/test/mitmproxy/tools/testpatt
similarity index 100%
rename from mitmproxy/test/tools/testpatt
rename to test/mitmproxy/tools/testpatt
diff --git a/mitmproxy/test/tservers.py b/test/mitmproxy/tservers.py
similarity index 100%
rename from mitmproxy/test/tservers.py
rename to test/mitmproxy/tservers.py
diff --git a/mitmproxy/test/tutils.py b/test/mitmproxy/tutils.py
similarity index 100%
rename from mitmproxy/test/tutils.py
rename to test/mitmproxy/tutils.py
diff --git a/netlib/test/http/__init__.py b/test/netlib/__init__.py
similarity index 100%
rename from netlib/test/http/__init__.py
rename to test/netlib/__init__.py
diff --git a/netlib/test/data/clientcert/.gitignore b/test/netlib/data/clientcert/.gitignore
similarity index 100%
rename from netlib/test/data/clientcert/.gitignore
rename to test/netlib/data/clientcert/.gitignore
diff --git a/netlib/test/data/clientcert/client.cnf b/test/netlib/data/clientcert/client.cnf
similarity index 100%
rename from netlib/test/data/clientcert/client.cnf
rename to test/netlib/data/clientcert/client.cnf
diff --git a/netlib/test/data/clientcert/client.pem b/test/netlib/data/clientcert/client.pem
similarity index 100%
rename from netlib/test/data/clientcert/client.pem
rename to test/netlib/data/clientcert/client.pem
diff --git a/netlib/test/data/clientcert/make b/test/netlib/data/clientcert/make
old mode 100755
new mode 100644
similarity index 100%
rename from netlib/test/data/clientcert/make
rename to test/netlib/data/clientcert/make
diff --git a/netlib/test/data/dercert b/test/netlib/data/dercert
similarity index 100%
rename from netlib/test/data/dercert
rename to test/netlib/data/dercert
diff --git a/netlib/test/data/dhparam.pem b/test/netlib/data/dhparam.pem
similarity index 100%
rename from netlib/test/data/dhparam.pem
rename to test/netlib/data/dhparam.pem
diff --git a/netlib/test/data/htpasswd b/test/netlib/data/htpasswd
similarity index 100%
rename from netlib/test/data/htpasswd
rename to test/netlib/data/htpasswd
diff --git a/netlib/test/data/server.crt b/test/netlib/data/server.crt
similarity index 100%
rename from netlib/test/data/server.crt
rename to test/netlib/data/server.crt
diff --git a/netlib/test/data/server.key b/test/netlib/data/server.key
similarity index 100%
rename from netlib/test/data/server.key
rename to test/netlib/data/server.key
diff --git a/netlib/test/data/text_cert b/test/netlib/data/text_cert
similarity index 100%
rename from netlib/test/data/text_cert
rename to test/netlib/data/text_cert
diff --git a/netlib/test/data/text_cert_2 b/test/netlib/data/text_cert_2
similarity index 100%
rename from netlib/test/data/text_cert_2
rename to test/netlib/data/text_cert_2
diff --git a/netlib/test/data/text_cert_weird1 b/test/netlib/data/text_cert_weird1
similarity index 100%
rename from netlib/test/data/text_cert_weird1
rename to test/netlib/data/text_cert_weird1
diff --git a/netlib/test/data/verificationcerts/9da13359.0 b/test/netlib/data/verificationcerts/9da13359.0
similarity index 100%
rename from netlib/test/data/verificationcerts/9da13359.0
rename to test/netlib/data/verificationcerts/9da13359.0
diff --git a/netlib/test/data/verificationcerts/generate.py b/test/netlib/data/verificationcerts/generate.py
similarity index 100%
rename from netlib/test/data/verificationcerts/generate.py
rename to test/netlib/data/verificationcerts/generate.py
diff --git a/netlib/test/data/verificationcerts/self-signed.crt b/test/netlib/data/verificationcerts/self-signed.crt
similarity index 100%
rename from netlib/test/data/verificationcerts/self-signed.crt
rename to test/netlib/data/verificationcerts/self-signed.crt
diff --git a/netlib/test/data/verificationcerts/self-signed.key b/test/netlib/data/verificationcerts/self-signed.key
similarity index 100%
rename from netlib/test/data/verificationcerts/self-signed.key
rename to test/netlib/data/verificationcerts/self-signed.key
diff --git a/netlib/test/data/verificationcerts/trusted-leaf.crt b/test/netlib/data/verificationcerts/trusted-leaf.crt
similarity index 100%
rename from netlib/test/data/verificationcerts/trusted-leaf.crt
rename to test/netlib/data/verificationcerts/trusted-leaf.crt
diff --git a/netlib/test/data/verificationcerts/trusted-leaf.key b/test/netlib/data/verificationcerts/trusted-leaf.key
similarity index 100%
rename from netlib/test/data/verificationcerts/trusted-leaf.key
rename to test/netlib/data/verificationcerts/trusted-leaf.key
diff --git a/netlib/test/data/verificationcerts/trusted-root.crt b/test/netlib/data/verificationcerts/trusted-root.crt
similarity index 100%
rename from netlib/test/data/verificationcerts/trusted-root.crt
rename to test/netlib/data/verificationcerts/trusted-root.crt
diff --git a/netlib/test/data/verificationcerts/trusted-root.key b/test/netlib/data/verificationcerts/trusted-root.key
similarity index 100%
rename from netlib/test/data/verificationcerts/trusted-root.key
rename to test/netlib/data/verificationcerts/trusted-root.key
diff --git a/netlib/test/data/verificationcerts/trusted-root.srl b/test/netlib/data/verificationcerts/trusted-root.srl
similarity index 100%
rename from netlib/test/data/verificationcerts/trusted-root.srl
rename to test/netlib/data/verificationcerts/trusted-root.srl
diff --git a/netlib/test/http/http1/__init__.py b/test/netlib/http/__init__.py
similarity index 100%
rename from netlib/test/http/http1/__init__.py
rename to test/netlib/http/__init__.py
diff --git a/netlib/test/http/http2/__init__.py b/test/netlib/http/http1/__init__.py
similarity index 100%
rename from netlib/test/http/http2/__init__.py
rename to test/netlib/http/http1/__init__.py
diff --git a/netlib/test/http/http1/test_assemble.py b/test/netlib/http/http1/test_assemble.py
similarity index 100%
rename from netlib/test/http/http1/test_assemble.py
rename to test/netlib/http/http1/test_assemble.py
diff --git a/netlib/test/http/http1/test_read.py b/test/netlib/http/http1/test_read.py
similarity index 100%
rename from netlib/test/http/http1/test_read.py
rename to test/netlib/http/http1/test_read.py
diff --git a/netlib/test/websockets/__init__.py b/test/netlib/http/http2/__init__.py
similarity index 100%
rename from netlib/test/websockets/__init__.py
rename to test/netlib/http/http2/__init__.py
diff --git a/netlib/test/http/http2/test_connections.py b/test/netlib/http/http2/test_connections.py
similarity index 100%
rename from netlib/test/http/http2/test_connections.py
rename to test/netlib/http/http2/test_connections.py
diff --git a/netlib/test/http/test_authentication.py b/test/netlib/http/test_authentication.py
similarity index 100%
rename from netlib/test/http/test_authentication.py
rename to test/netlib/http/test_authentication.py
diff --git a/netlib/test/http/test_cookies.py b/test/netlib/http/test_cookies.py
similarity index 100%
rename from netlib/test/http/test_cookies.py
rename to test/netlib/http/test_cookies.py
diff --git a/netlib/test/http/test_headers.py b/test/netlib/http/test_headers.py
similarity index 100%
rename from netlib/test/http/test_headers.py
rename to test/netlib/http/test_headers.py
diff --git a/netlib/test/http/test_message.py b/test/netlib/http/test_message.py
similarity index 100%
rename from netlib/test/http/test_message.py
rename to test/netlib/http/test_message.py
diff --git a/netlib/test/http/test_request.py b/test/netlib/http/test_request.py
similarity index 100%
rename from netlib/test/http/test_request.py
rename to test/netlib/http/test_request.py
diff --git a/netlib/test/http/test_response.py b/test/netlib/http/test_response.py
similarity index 100%
rename from netlib/test/http/test_response.py
rename to test/netlib/http/test_response.py
diff --git a/netlib/test/http/test_status_codes.py b/test/netlib/http/test_status_codes.py
similarity index 100%
rename from netlib/test/http/test_status_codes.py
rename to test/netlib/http/test_status_codes.py
diff --git a/netlib/test/http/test_user_agents.py b/test/netlib/http/test_user_agents.py
similarity index 100%
rename from netlib/test/http/test_user_agents.py
rename to test/netlib/http/test_user_agents.py
diff --git a/netlib/test/test_certutils.py b/test/netlib/test_certutils.py
similarity index 100%
rename from netlib/test/test_certutils.py
rename to test/netlib/test_certutils.py
diff --git a/netlib/test/test_encoding.py b/test/netlib/test_encoding.py
similarity index 100%
rename from netlib/test/test_encoding.py
rename to test/netlib/test_encoding.py
diff --git a/netlib/test/test_imports.py b/test/netlib/test_imports.py
similarity index 100%
rename from netlib/test/test_imports.py
rename to test/netlib/test_imports.py
diff --git a/netlib/test/test_odict.py b/test/netlib/test_odict.py
similarity index 100%
rename from netlib/test/test_odict.py
rename to test/netlib/test_odict.py
diff --git a/netlib/test/test_socks.py b/test/netlib/test_socks.py
similarity index 100%
rename from netlib/test/test_socks.py
rename to test/netlib/test_socks.py
diff --git a/netlib/test/test_tcp.py b/test/netlib/test_tcp.py
similarity index 100%
rename from netlib/test/test_tcp.py
rename to test/netlib/test_tcp.py
diff --git a/netlib/test/test_utils.py b/test/netlib/test_utils.py
similarity index 100%
rename from netlib/test/test_utils.py
rename to test/netlib/test_utils.py
diff --git a/netlib/test/test_version_check.py b/test/netlib/test_version_check.py
similarity index 100%
rename from netlib/test/test_version_check.py
rename to test/netlib/test_version_check.py
diff --git a/netlib/test/test_wsgi.py b/test/netlib/test_wsgi.py
similarity index 100%
rename from netlib/test/test_wsgi.py
rename to test/netlib/test_wsgi.py
diff --git a/netlib/test/tools/getcertnames b/test/netlib/tools/getcertnames
similarity index 100%
rename from netlib/test/tools/getcertnames
rename to test/netlib/tools/getcertnames
diff --git a/test/netlib/websockets/__init__.py b/test/netlib/websockets/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/netlib/test/websockets/test_websockets.py b/test/netlib/websockets/test_websockets.py
similarity index 100%
rename from netlib/test/websockets/test_websockets.py
rename to test/netlib/websockets/test_websockets.py
diff --git a/pathod/test/data/clientcert/.gitignore b/test/pathod/data/clientcert/.gitignore
similarity index 100%
rename from pathod/test/data/clientcert/.gitignore
rename to test/pathod/data/clientcert/.gitignore
diff --git a/pathod/test/data/clientcert/client.cnf b/test/pathod/data/clientcert/client.cnf
similarity index 100%
rename from pathod/test/data/clientcert/client.cnf
rename to test/pathod/data/clientcert/client.cnf
diff --git a/pathod/test/data/clientcert/client.pem b/test/pathod/data/clientcert/client.pem
similarity index 100%
rename from pathod/test/data/clientcert/client.pem
rename to test/pathod/data/clientcert/client.pem
diff --git a/pathod/test/data/clientcert/make b/test/pathod/data/clientcert/make
old mode 100755
new mode 100644
similarity index 100%
rename from pathod/test/data/clientcert/make
rename to test/pathod/data/clientcert/make
diff --git a/pathod/test/data/file b/test/pathod/data/file
similarity index 100%
rename from pathod/test/data/file
rename to test/pathod/data/file
diff --git a/pathod/test/data/request b/test/pathod/data/request
similarity index 100%
rename from pathod/test/data/request
rename to test/pathod/data/request
diff --git a/pathod/test/data/response b/test/pathod/data/response
similarity index 100%
rename from pathod/test/data/response
rename to test/pathod/data/response
diff --git a/pathod/test/data/testkey.pem b/test/pathod/data/testkey.pem
similarity index 100%
rename from pathod/test/data/testkey.pem
rename to test/pathod/data/testkey.pem
diff --git a/pathod/test/scripts/generate.sh b/test/pathod/scripts/generate.sh
old mode 100755
new mode 100644
similarity index 100%
rename from pathod/test/scripts/generate.sh
rename to test/pathod/scripts/generate.sh
diff --git a/pathod/test/scripts/openssl.cnf b/test/pathod/scripts/openssl.cnf
similarity index 100%
rename from pathod/test/scripts/openssl.cnf
rename to test/pathod/scripts/openssl.cnf
diff --git a/pathod/test/test_app.py b/test/pathod/test_app.py
similarity index 100%
rename from pathod/test/test_app.py
rename to test/pathod/test_app.py
diff --git a/pathod/test/test_language_actions.py b/test/pathod/test_language_actions.py
similarity index 100%
rename from pathod/test/test_language_actions.py
rename to test/pathod/test_language_actions.py
diff --git a/pathod/test/test_language_base.py b/test/pathod/test_language_base.py
similarity index 100%
rename from pathod/test/test_language_base.py
rename to test/pathod/test_language_base.py
diff --git a/pathod/test/test_language_generators.py b/test/pathod/test_language_generators.py
similarity index 100%
rename from pathod/test/test_language_generators.py
rename to test/pathod/test_language_generators.py
diff --git a/pathod/test/test_language_http.py b/test/pathod/test_language_http.py
similarity index 100%
rename from pathod/test/test_language_http.py
rename to test/pathod/test_language_http.py
diff --git a/pathod/test/test_language_http2.py b/test/pathod/test_language_http2.py
similarity index 100%
rename from pathod/test/test_language_http2.py
rename to test/pathod/test_language_http2.py
diff --git a/pathod/test/test_language_websocket.py b/test/pathod/test_language_websocket.py
similarity index 100%
rename from pathod/test/test_language_websocket.py
rename to test/pathod/test_language_websocket.py
diff --git a/pathod/test/test_language_writer.py b/test/pathod/test_language_writer.py
similarity index 100%
rename from pathod/test/test_language_writer.py
rename to test/pathod/test_language_writer.py
diff --git a/pathod/test/test_log.py b/test/pathod/test_log.py
similarity index 100%
rename from pathod/test/test_log.py
rename to test/pathod/test_log.py
diff --git a/pathod/test/test_pathoc.py b/test/pathod/test_pathoc.py
similarity index 100%
rename from pathod/test/test_pathoc.py
rename to test/pathod/test_pathoc.py
diff --git a/pathod/test/test_pathoc_cmdline.py b/test/pathod/test_pathoc_cmdline.py
similarity index 100%
rename from pathod/test/test_pathoc_cmdline.py
rename to test/pathod/test_pathoc_cmdline.py
diff --git a/pathod/test/test_pathod.py b/test/pathod/test_pathod.py
similarity index 100%
rename from pathod/test/test_pathod.py
rename to test/pathod/test_pathod.py
diff --git a/pathod/test/test_pathod_cmdline.py b/test/pathod/test_pathod_cmdline.py
similarity index 100%
rename from pathod/test/test_pathod_cmdline.py
rename to test/pathod/test_pathod_cmdline.py
diff --git a/pathod/test/test_test.py b/test/pathod/test_test.py
similarity index 100%
rename from pathod/test/test_test.py
rename to test/pathod/test_test.py
diff --git a/pathod/test/test_utils.py b/test/pathod/test_utils.py
similarity index 100%
rename from pathod/test/test_utils.py
rename to test/pathod/test_utils.py
diff --git a/pathod/test/tutils.py b/test/pathod/tutils.py
similarity index 100%
rename from pathod/test/tutils.py
rename to test/pathod/tutils.py