From cf25d39058ecff1feea9aa179eaddeea53fe8b0e Mon Sep 17 00:00:00 2001
From: Ryan Beck-Buysse <rbuysse@bitwise.io>
Date: Fri, 15 Feb 2019 16:16:15 -0600
Subject: [PATCH] Move SDK to top-level

Signed-off-by: Ryan Beck-Buysse <rbuysse@bitwise.io>
---
 sdk/python/Dockerfile => Dockerfile                         | 3 +--
 ...ckerfile-installed-bionic => Dockerfile-installed-bionic | 6 +++---
 ...ckerfile-installed-xenial => Dockerfile-installed-xenial | 6 +++---
 bin/intkey                                                  | 2 +-
 bin/intkey-tp-python                                        | 2 +-
 bin/noop                                                    | 2 +-
 bin/protogen                                                | 2 +-
 bin/run_bandit                                              | 4 ++--
 bin/run_lint                                                | 4 ++--
 bin/run_tests                                               | 2 +-
 bin/xo                                                      | 2 +-
 bin/xo-tp-python                                            | 2 +-
 ci/sawtooth-publish-python-sdk                              | 2 +-
 docker-compose-installed.yaml                               | 2 +-
 docker/compose/sawtooth-build.yaml                          | 2 +-
 .../docker/test_intkey_smoke_python.yaml                    | 2 +-
 .../sawtooth_integration/docker/test_two_families.yaml      | 2 +-
 integration/sawtooth_integration/docker/test_workload.yaml  | 2 +-
 .../sawtooth_integration/docker/test_xo_smoke_python.yaml   | 2 +-
 sdk/python/nose2.cfg => nose2.cfg                           | 0
 {sdk/python/packaging => packaging}/log_config.toml.example | 0
 {sdk/python/packaging => packaging}/path.toml.example       | 0
 {sdk/python/packaging => packaging}/ubuntu/postinst         | 0
 .../__init__.py                                             | 0
 .../message_factory.py                                      | 0
 .../message_types.py                                        | 0
 .../mock_validator.py                                       | 0
 .../transaction_processor_test_case.py                      | 0
 {sdk/python/sawtooth_sdk => sawtooth_sdk}/__init__.py       | 0
 .../sawtooth_sdk => sawtooth_sdk}/consensus/__init__.py     | 0
 .../sawtooth_sdk => sawtooth_sdk}/consensus/driver.py       | 0
 .../sawtooth_sdk => sawtooth_sdk}/consensus/engine.py       | 0
 .../sawtooth_sdk => sawtooth_sdk}/consensus/exceptions.py   | 0
 .../sawtooth_sdk => sawtooth_sdk}/consensus/service.py      | 0
 .../sawtooth_sdk => sawtooth_sdk}/consensus/zmq_driver.py   | 0
 .../sawtooth_sdk => sawtooth_sdk}/consensus/zmq_service.py  | 0
 .../sawtooth_sdk => sawtooth_sdk}/messaging/__init__.py     | 0
 .../sawtooth_sdk => sawtooth_sdk}/messaging/exceptions.py   | 0
 .../sawtooth_sdk => sawtooth_sdk}/messaging/future.py       | 0
 .../sawtooth_sdk => sawtooth_sdk}/messaging/stream.py       | 0
 .../sawtooth_sdk => sawtooth_sdk}/processor/__init__.py     | 0
 .../sawtooth_sdk => sawtooth_sdk}/processor/config.py       | 0
 .../sawtooth_sdk => sawtooth_sdk}/processor/context.py      | 0
 {sdk/python/sawtooth_sdk => sawtooth_sdk}/processor/core.py | 0
 .../sawtooth_sdk => sawtooth_sdk}/processor/exceptions.py   | 0
 .../sawtooth_sdk => sawtooth_sdk}/processor/handler.py      | 0
 {sdk/python/sawtooth_sdk => sawtooth_sdk}/processor/log.py  | 0
 sdk/examples/intkey_python/Dockerfile-installed-bionic      | 4 ++--
 sdk/examples/intkey_python/Dockerfile-installed-xenial      | 4 ++--
 sdk/examples/intkey_python/Dockerfile-tests-installed       | 4 ++--
 sdk/examples/xo_python/Dockerfile-installed-bionic          | 4 ++--
 sdk/examples/xo_python/Dockerfile-installed-xenial          | 4 ++--
 sdk/examples/xo_python/Dockerfile-tests-installed           | 4 ++--
 sdk/python/setup.py => setup.py                             | 2 +-
 {sdk/python/tests => tests}/python-sdk-tests.dockerfile     | 0
 {sdk/python/tests => tests}/test_context.py                 | 0
 {sdk/python/tests => tests}/test_zmq_driver.py              | 0
 {sdk/python/tests => tests}/test_zmq_service.py             | 0
 {sdk/python/tests => tests}/unit_python_sdk.yaml            | 0
 59 files changed, 38 insertions(+), 39 deletions(-)
 rename sdk/python/Dockerfile => Dockerfile (93%)
 rename sdk/python/Dockerfile-installed-bionic => Dockerfile-installed-bionic (94%)
 rename sdk/python/Dockerfile-installed-xenial => Dockerfile-installed-xenial (94%)
 rename sdk/python/nose2.cfg => nose2.cfg (100%)
 rename {sdk/python/packaging => packaging}/log_config.toml.example (100%)
 rename {sdk/python/packaging => packaging}/path.toml.example (100%)
 rename {sdk/python/packaging => packaging}/ubuntu/postinst (100%)
 rename {sdk/python/sawtooth_processor_test => sawtooth_processor_test}/__init__.py (100%)
 rename {sdk/python/sawtooth_processor_test => sawtooth_processor_test}/message_factory.py (100%)
 rename {sdk/python/sawtooth_processor_test => sawtooth_processor_test}/message_types.py (100%)
 rename {sdk/python/sawtooth_processor_test => sawtooth_processor_test}/mock_validator.py (100%)
 rename {sdk/python/sawtooth_processor_test => sawtooth_processor_test}/transaction_processor_test_case.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/__init__.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/consensus/__init__.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/consensus/driver.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/consensus/engine.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/consensus/exceptions.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/consensus/service.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/consensus/zmq_driver.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/consensus/zmq_service.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/messaging/__init__.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/messaging/exceptions.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/messaging/future.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/messaging/stream.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/processor/__init__.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/processor/config.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/processor/context.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/processor/core.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/processor/exceptions.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/processor/handler.py (100%)
 rename {sdk/python/sawtooth_sdk => sawtooth_sdk}/processor/log.py (100%)
 rename sdk/python/setup.py => setup.py (96%)
 rename {sdk/python/tests => tests}/python-sdk-tests.dockerfile (100%)
 rename {sdk/python/tests => tests}/test_context.py (100%)
 rename {sdk/python/tests => tests}/test_zmq_driver.py (100%)
 rename {sdk/python/tests => tests}/test_zmq_service.py (100%)
 rename {sdk/python/tests => tests}/unit_python_sdk.yaml (100%)

diff --git a/sdk/python/Dockerfile b/Dockerfile
similarity index 93%
rename from sdk/python/Dockerfile
rename to Dockerfile
index e6469007f..cf91a3009 100644
--- a/sdk/python/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# docker build -f sdk/python/Dockerfile-installed -t sawtooth-sdk-python-local .
+# docker build -f Dockerfile -t sawtooth-sdk-python-local .
 
 # -------------=== python sdk build ===-------------
 
@@ -50,6 +50,5 @@ WORKDIR /project/sawtooth-core
 
 CMD echo "\033[0;32m--- Building python sdk ---\n\033[0m" \
  && bin/protogen \
- && cd sdk/python \
  && python3 setup.py clean --all \
  && python3 setup.py build
diff --git a/sdk/python/Dockerfile-installed-bionic b/Dockerfile-installed-bionic
similarity index 94%
rename from sdk/python/Dockerfile-installed-bionic
rename to Dockerfile-installed-bionic
index c703629ef..a8ca92edd 100644
--- a/sdk/python/Dockerfile-installed-bionic
+++ b/Dockerfile-installed-bionic
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# docker build -f sdk/python/Dockerfile-installed-bionic -t sawtooth-sdk-python .
+# docker build -f Dockerfile-installed-bionic -t sawtooth-sdk-python .
 
 # -------------=== signing build ===-------------
 FROM ubuntu:bionic as sawtooth-signing-builder
@@ -77,7 +77,7 @@ COPY . /project
 RUN dpkg -i /tmp/python3-sawtooth-*.deb || true \
  && apt-get -f -y install \
  && /project/bin/protogen \
- && cd /project/sdk/python \
+ && cd /project \
  && if [ -d "debian" ]; then rm -rf debian; fi \
  && python3 setup.py clean --all \
  && python3 setup.py --command-packages=stdeb.command debianize \
@@ -92,7 +92,7 @@ RUN apt-get update \
  && apt-get install gnupg -y
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sources.list \
  && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \
diff --git a/sdk/python/Dockerfile-installed-xenial b/Dockerfile-installed-xenial
similarity index 94%
rename from sdk/python/Dockerfile-installed-xenial
rename to Dockerfile-installed-xenial
index f1a4506ec..f17b1730d 100644
--- a/sdk/python/Dockerfile-installed-xenial
+++ b/Dockerfile-installed-xenial
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# docker build -f sdk/python/Dockerfile-installed-xenial -t sawtooth-sdk-python .
+# docker build -f Dockerfile-installed-xenial -t sawtooth-sdk-python .
 
 # -------------=== signing build ===-------------
 FROM ubuntu:xenial as sawtooth-signing-builder
@@ -71,7 +71,7 @@ COPY . /project
 RUN dpkg -i /tmp/python3-sawtooth-*.deb || true \
  && apt-get -f -y install \
  && /project/bin/protogen \
- && cd /project/sdk/python \
+ && cd /project \
  && if [ -d "debian" ]; then rm -rf debian; fi \
  && python3 setup.py clean --all \
  && python3 setup.py --command-packages=stdeb.command debianize \
@@ -83,7 +83,7 @@ RUN dpkg -i /tmp/python3-sawtooth-*.deb || true \
 FROM ubuntu:xenial
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \
  && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \
diff --git a/bin/intkey b/bin/intkey
index d62703a30..866ffcb91 100755
--- a/bin/intkey
+++ b/bin/intkey
@@ -32,7 +32,7 @@ sys.path.insert(0, os.path.join(
     'sdk', 'examples', 'intkey_python'))
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
-    'sdk', 'python'))
+    ))
 
 from sawtooth_intkey.client_cli.intkey_cli import main_wrapper
 
diff --git a/bin/intkey-tp-python b/bin/intkey-tp-python
index 57def490e..ceb40a584 100755
--- a/bin/intkey-tp-python
+++ b/bin/intkey-tp-python
@@ -28,7 +28,7 @@ sys.path.insert(0, os.path.join(
     'sdk', 'examples', 'intkey_python'))
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
-    'sdk', 'python'))
+    ))
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
     'signing'))
diff --git a/bin/noop b/bin/noop
index 1c2df051e..183fa8e1b 100755
--- a/bin/noop
+++ b/bin/noop
@@ -32,7 +32,7 @@ sys.path.insert(0, os.path.join(
     'sdk', 'examples', 'noop_python'))
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
-    'sdk', 'python'))
+    ))
 
 from sawtooth_noop.client_cli.main import main_wrapper
 
diff --git a/bin/protogen b/bin/protogen
index 741b54a15..7662710b8 100755
--- a/bin/protogen
+++ b/bin/protogen
@@ -40,7 +40,7 @@ def main(args=None):
     # Generate and distribute top-level protos
     proto_dir = JOIN(TOP_DIR, "protos")
 
-    protoc(proto_dir, "sdk/python", "sawtooth_sdk/protobuf")
+    protoc(proto_dir, TOP_DIR, "sawtooth_sdk/protobuf")
 
 
 def protoc(src_dir, base_dir, pkg, language="python"):
diff --git a/bin/run_bandit b/bin/run_bandit
index 271fe5b01..d3079cf0c 100755
--- a/bin/run_bandit
+++ b/bin/run_bandit
@@ -18,8 +18,8 @@
 top_dir=$(cd $(dirname $(dirname $0)) && pwd)
 
 directories="
-    sdk/python/build
-    sdk/python/sawtooth_processor_test
+    build
+    sawtooth_processor_test
     signing/build
     signing/tests
 "
diff --git a/bin/run_lint b/bin/run_lint
index 2b6df8c9a..02b50b96e 100755
--- a/bin/run_lint
+++ b/bin/run_lint
@@ -165,12 +165,12 @@ export PYTHONPATH
 lint signing "$SINCE" || retval=1
 
 # sdk, xo, intkey
-PYTHONPATH=$top_dir/sdk/python
+PYTHONPATH=$top_dir/
 PYTHONPATH=$PYTHONPATH:$top_dir/sdk/examples/intkey_python
 PYTHONPATH=$PYTHONPATH:$top_dir/sdk/examples/xo_python
 PYTHONPATH=$PYTHONPATH:$top_dir/signing
 export PYTHONPATH
-lint sdk/python "$SINCE" || retval=1
+lint . "$SINCE" || retval=1
 lint sdk/examples/intkey_python "$SINCE" || retval=1
 lint sdk/examples/xo_python "$SINCE" || retval=1
 
diff --git a/bin/run_tests b/bin/run_tests
index 1639b0078..e1407bde0 100755
--- a/bin/run_tests
+++ b/bin/run_tests
@@ -133,7 +133,7 @@ test_signing() {
 }
 
 test_python_sdk() {
-    run_docker_test ./sdk/python/tests/unit_python_sdk.yaml
+    run_docker_test ./tests/unit_python_sdk.yaml
     copy_coverage .coverage.test_python_sdk
     run_docker_test ./sdk/examples/intkey_python/tests/test_tp_intkey_python.yaml
     copy_coverage .coverage.test_tp_intkey_python
diff --git a/bin/xo b/bin/xo
index 0a759baf4..9a1a902ca 100755
--- a/bin/xo
+++ b/bin/xo
@@ -29,7 +29,7 @@ sys.path.insert(0, os.path.join(
 
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
-    'sdk', 'python'))
+    ))
 
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
diff --git a/bin/xo-tp-python b/bin/xo-tp-python
index 870e01207..d70ad793d 100755
--- a/bin/xo-tp-python
+++ b/bin/xo-tp-python
@@ -29,7 +29,7 @@ sys.path.insert(0, os.path.join(
 
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
-    'sdk', 'python'))
+    ))
 
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
diff --git a/ci/sawtooth-publish-python-sdk b/ci/sawtooth-publish-python-sdk
index 9fa202558..4066ac9bb 100644
--- a/ci/sawtooth-publish-python-sdk
+++ b/ci/sawtooth-publish-python-sdk
@@ -42,7 +42,7 @@ password=@PASS@\n\
 
 CMD sed -i'' -e "s/@USER@/$PYPI_USER/g" /root/.pypirc \
  && sed -i'' -e "s/@PASS@/$PYPI_PASS/g" /root/.pypirc \
- && cd /project/sawtooth-core/sdk/python \
+ && cd /project/sawtooth-core/ \
  && python3 setup.py sdist upload -r pypi \
  && cd /project/sawtooth-core/signing \
  && python3 setup.py sdist upload -r pypi
diff --git a/docker-compose-installed.yaml b/docker-compose-installed.yaml
index f12008f2a..402e438a3 100644
--- a/docker-compose-installed.yaml
+++ b/docker-compose-installed.yaml
@@ -47,7 +47,7 @@ services:
   python-sdk:
     build:
       context: .
-      dockerfile: sdk/python/Dockerfile-installed-${DISTRO}
+      dockerfile: Dockerfile-installed-${DISTRO}
       args:
         - http_proxy
         - https_proxy
diff --git a/docker/compose/sawtooth-build.yaml b/docker/compose/sawtooth-build.yaml
index 70a556604..157a49d54 100644
--- a/docker/compose/sawtooth-build.yaml
+++ b/docker/compose/sawtooth-build.yaml
@@ -31,7 +31,7 @@ services:
   python-sdk:
     build:
       context: ../../
-      dockerfile: ./sdk/python/Dockerfile
+      dockerfile: ./Dockerfile
       args:
         - http_proxy
         - https_proxy
diff --git a/integration/sawtooth_integration/docker/test_intkey_smoke_python.yaml b/integration/sawtooth_integration/docker/test_intkey_smoke_python.yaml
index 182e32924..f11ba2511 100644
--- a/integration/sawtooth_integration/docker/test_intkey_smoke_python.yaml
+++ b/integration/sawtooth_integration/docker/test_intkey_smoke_python.yaml
@@ -144,7 +144,7 @@ services:
         test_intkey_smoke.TestIntkeySmoke
     stop_signal: SIGKILL
     environment:
-      PYTHONPATH: "/project/sawtooth-core/sdk/python:\
+      PYTHONPATH: "/project/sawtooth-core:\
         /project/sawtooth-core/sdk/examples/intkey_python:\
         /project/sawtooth-core/integration:\
         /project/sawtooth-core/signing"
diff --git a/integration/sawtooth_integration/docker/test_two_families.yaml b/integration/sawtooth_integration/docker/test_two_families.yaml
index 6c76b06bf..6b6fea690 100644
--- a/integration/sawtooth_integration/docker/test_two_families.yaml
+++ b/integration/sawtooth_integration/docker/test_two_families.yaml
@@ -161,7 +161,7 @@ services:
         test_two_families.TestTwoFamilies
     stop_signal: SIGKILL
     environment:
-      PYTHONPATH: "/project/sawtooth-core/sdk/python:\
+      PYTHONPATH: "/project/sawtooth-core:\
         /project/sawtooth-core/sdk/examples/intkey_python:\
         /project/sawtooth-core/integration:\
         /project/sawtooth-core/signing"
diff --git a/integration/sawtooth_integration/docker/test_workload.yaml b/integration/sawtooth_integration/docker/test_workload.yaml
index d3abee187..40abeffe9 100644
--- a/integration/sawtooth_integration/docker/test_workload.yaml
+++ b/integration/sawtooth_integration/docker/test_workload.yaml
@@ -144,7 +144,7 @@ services:
         test_workload
     stop_signal: SIGKILL
     environment:
-      PYTHONPATH: "/project/sawtooth-core/sdk/python:\
+      PYTHONPATH: "/project/sawtooth-core:\
         /project/sawtooth-core/sdk/examples/intkey_python:\
         /project/sawtooth-core/integration:\
         /project/sawtooth-core/signing:\
diff --git a/integration/sawtooth_integration/docker/test_xo_smoke_python.yaml b/integration/sawtooth_integration/docker/test_xo_smoke_python.yaml
index 97a228961..ebaa55874 100644
--- a/integration/sawtooth_integration/docker/test_xo_smoke_python.yaml
+++ b/integration/sawtooth_integration/docker/test_xo_smoke_python.yaml
@@ -145,6 +145,6 @@ services:
     stop_signal: SIGKILL
     environment:
       TP_LANG: "python"
-      PYTHONPATH: "/project/sawtooth-core/sdk/python:\
+      PYTHONPATH: "/project/sawtooth-core:\
         /project/sawtooth-core/integration:\
         /project/sawtooth-core/signing"
diff --git a/sdk/python/nose2.cfg b/nose2.cfg
similarity index 100%
rename from sdk/python/nose2.cfg
rename to nose2.cfg
diff --git a/sdk/python/packaging/log_config.toml.example b/packaging/log_config.toml.example
similarity index 100%
rename from sdk/python/packaging/log_config.toml.example
rename to packaging/log_config.toml.example
diff --git a/sdk/python/packaging/path.toml.example b/packaging/path.toml.example
similarity index 100%
rename from sdk/python/packaging/path.toml.example
rename to packaging/path.toml.example
diff --git a/sdk/python/packaging/ubuntu/postinst b/packaging/ubuntu/postinst
similarity index 100%
rename from sdk/python/packaging/ubuntu/postinst
rename to packaging/ubuntu/postinst
diff --git a/sdk/python/sawtooth_processor_test/__init__.py b/sawtooth_processor_test/__init__.py
similarity index 100%
rename from sdk/python/sawtooth_processor_test/__init__.py
rename to sawtooth_processor_test/__init__.py
diff --git a/sdk/python/sawtooth_processor_test/message_factory.py b/sawtooth_processor_test/message_factory.py
similarity index 100%
rename from sdk/python/sawtooth_processor_test/message_factory.py
rename to sawtooth_processor_test/message_factory.py
diff --git a/sdk/python/sawtooth_processor_test/message_types.py b/sawtooth_processor_test/message_types.py
similarity index 100%
rename from sdk/python/sawtooth_processor_test/message_types.py
rename to sawtooth_processor_test/message_types.py
diff --git a/sdk/python/sawtooth_processor_test/mock_validator.py b/sawtooth_processor_test/mock_validator.py
similarity index 100%
rename from sdk/python/sawtooth_processor_test/mock_validator.py
rename to sawtooth_processor_test/mock_validator.py
diff --git a/sdk/python/sawtooth_processor_test/transaction_processor_test_case.py b/sawtooth_processor_test/transaction_processor_test_case.py
similarity index 100%
rename from sdk/python/sawtooth_processor_test/transaction_processor_test_case.py
rename to sawtooth_processor_test/transaction_processor_test_case.py
diff --git a/sdk/python/sawtooth_sdk/__init__.py b/sawtooth_sdk/__init__.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/__init__.py
rename to sawtooth_sdk/__init__.py
diff --git a/sdk/python/sawtooth_sdk/consensus/__init__.py b/sawtooth_sdk/consensus/__init__.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/consensus/__init__.py
rename to sawtooth_sdk/consensus/__init__.py
diff --git a/sdk/python/sawtooth_sdk/consensus/driver.py b/sawtooth_sdk/consensus/driver.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/consensus/driver.py
rename to sawtooth_sdk/consensus/driver.py
diff --git a/sdk/python/sawtooth_sdk/consensus/engine.py b/sawtooth_sdk/consensus/engine.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/consensus/engine.py
rename to sawtooth_sdk/consensus/engine.py
diff --git a/sdk/python/sawtooth_sdk/consensus/exceptions.py b/sawtooth_sdk/consensus/exceptions.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/consensus/exceptions.py
rename to sawtooth_sdk/consensus/exceptions.py
diff --git a/sdk/python/sawtooth_sdk/consensus/service.py b/sawtooth_sdk/consensus/service.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/consensus/service.py
rename to sawtooth_sdk/consensus/service.py
diff --git a/sdk/python/sawtooth_sdk/consensus/zmq_driver.py b/sawtooth_sdk/consensus/zmq_driver.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/consensus/zmq_driver.py
rename to sawtooth_sdk/consensus/zmq_driver.py
diff --git a/sdk/python/sawtooth_sdk/consensus/zmq_service.py b/sawtooth_sdk/consensus/zmq_service.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/consensus/zmq_service.py
rename to sawtooth_sdk/consensus/zmq_service.py
diff --git a/sdk/python/sawtooth_sdk/messaging/__init__.py b/sawtooth_sdk/messaging/__init__.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/messaging/__init__.py
rename to sawtooth_sdk/messaging/__init__.py
diff --git a/sdk/python/sawtooth_sdk/messaging/exceptions.py b/sawtooth_sdk/messaging/exceptions.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/messaging/exceptions.py
rename to sawtooth_sdk/messaging/exceptions.py
diff --git a/sdk/python/sawtooth_sdk/messaging/future.py b/sawtooth_sdk/messaging/future.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/messaging/future.py
rename to sawtooth_sdk/messaging/future.py
diff --git a/sdk/python/sawtooth_sdk/messaging/stream.py b/sawtooth_sdk/messaging/stream.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/messaging/stream.py
rename to sawtooth_sdk/messaging/stream.py
diff --git a/sdk/python/sawtooth_sdk/processor/__init__.py b/sawtooth_sdk/processor/__init__.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/processor/__init__.py
rename to sawtooth_sdk/processor/__init__.py
diff --git a/sdk/python/sawtooth_sdk/processor/config.py b/sawtooth_sdk/processor/config.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/processor/config.py
rename to sawtooth_sdk/processor/config.py
diff --git a/sdk/python/sawtooth_sdk/processor/context.py b/sawtooth_sdk/processor/context.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/processor/context.py
rename to sawtooth_sdk/processor/context.py
diff --git a/sdk/python/sawtooth_sdk/processor/core.py b/sawtooth_sdk/processor/core.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/processor/core.py
rename to sawtooth_sdk/processor/core.py
diff --git a/sdk/python/sawtooth_sdk/processor/exceptions.py b/sawtooth_sdk/processor/exceptions.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/processor/exceptions.py
rename to sawtooth_sdk/processor/exceptions.py
diff --git a/sdk/python/sawtooth_sdk/processor/handler.py b/sawtooth_sdk/processor/handler.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/processor/handler.py
rename to sawtooth_sdk/processor/handler.py
diff --git a/sdk/python/sawtooth_sdk/processor/log.py b/sawtooth_sdk/processor/log.py
similarity index 100%
rename from sdk/python/sawtooth_sdk/processor/log.py
rename to sawtooth_sdk/processor/log.py
diff --git a/sdk/examples/intkey_python/Dockerfile-installed-bionic b/sdk/examples/intkey_python/Dockerfile-installed-bionic
index 280f9cd21..374b2e2a2 100644
--- a/sdk/examples/intkey_python/Dockerfile-installed-bionic
+++ b/sdk/examples/intkey_python/Dockerfile-installed-bionic
@@ -108,7 +108,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -131,7 +131,7 @@ RUN apt-get update \
  systemd
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-intkey-tp-builder /project/sdk/examples/python3-sawtooth-intkey*.deb /tmp
 
diff --git a/sdk/examples/intkey_python/Dockerfile-installed-xenial b/sdk/examples/intkey_python/Dockerfile-installed-xenial
index 4c825fcf0..09f6df1d4 100644
--- a/sdk/examples/intkey_python/Dockerfile-installed-xenial
+++ b/sdk/examples/intkey_python/Dockerfile-installed-xenial
@@ -99,7 +99,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -117,7 +117,7 @@ RUN dpkg -i /tmp/python3-sawtooth-*.deb || true \
 FROM ubuntu:xenial
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-intkey-tp-builder /project/sdk/examples/python3-sawtooth-intkey*.deb /tmp
 
diff --git a/sdk/examples/intkey_python/Dockerfile-tests-installed b/sdk/examples/intkey_python/Dockerfile-tests-installed
index b616a01da..3075f4545 100644
--- a/sdk/examples/intkey_python/Dockerfile-tests-installed
+++ b/sdk/examples/intkey_python/Dockerfile-tests-installed
@@ -107,7 +107,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -130,7 +130,7 @@ RUN apt-get update \
  && apt-get install gnupg -y
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-intkey-tests-builder /project/sdk/examples/python3-sawtooth-intkey*.deb /tmp
 
diff --git a/sdk/examples/xo_python/Dockerfile-installed-bionic b/sdk/examples/xo_python/Dockerfile-installed-bionic
index c147c2a54..7b85e05c2 100644
--- a/sdk/examples/xo_python/Dockerfile-installed-bionic
+++ b/sdk/examples/xo_python/Dockerfile-installed-bionic
@@ -107,7 +107,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -130,7 +130,7 @@ RUN apt-get update \
  systemd
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-xo-tp-builder /project/sdk/examples/python3-sawtooth-xo*.deb /tmp
 
diff --git a/sdk/examples/xo_python/Dockerfile-installed-xenial b/sdk/examples/xo_python/Dockerfile-installed-xenial
index a45dd0f4e..2d778d8a1 100644
--- a/sdk/examples/xo_python/Dockerfile-installed-xenial
+++ b/sdk/examples/xo_python/Dockerfile-installed-xenial
@@ -98,7 +98,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -116,7 +116,7 @@ RUN dpkg -i /tmp/python3-sawtooth-*.deb || true \
 FROM ubuntu:xenial
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-xo-tp-builder /project/sdk/examples/python3-sawtooth-xo*.deb /tmp
 
diff --git a/sdk/examples/xo_python/Dockerfile-tests-installed b/sdk/examples/xo_python/Dockerfile-tests-installed
index 5cd09aee3..7cce35dff 100644
--- a/sdk/examples/xo_python/Dockerfile-tests-installed
+++ b/sdk/examples/xo_python/Dockerfile-tests-installed
@@ -107,7 +107,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -130,7 +130,7 @@ RUN apt-get update \
  && apt-get install gnupg -y
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-xo-tests-builder /project/sdk/examples/python3-sawtooth-xo*.deb /tmp
 
diff --git a/sdk/python/setup.py b/setup.py
similarity index 96%
rename from sdk/python/setup.py
rename to setup.py
index 799138b4d..d06ac6a80 100644
--- a/sdk/python/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@
 setup(
     name='sawtooth-sdk',
     version=subprocess.check_output(
-        ['../../bin/get_version']).decode('utf-8').strip(),
+        ['./bin/get_version']).decode('utf-8').strip(),
     description='Sawtooth Python SDK',
     author='Hyperledger Sawtooth',
     url='https://github.com/hyperledger/sawtooth-core',
diff --git a/sdk/python/tests/python-sdk-tests.dockerfile b/tests/python-sdk-tests.dockerfile
similarity index 100%
rename from sdk/python/tests/python-sdk-tests.dockerfile
rename to tests/python-sdk-tests.dockerfile
diff --git a/sdk/python/tests/test_context.py b/tests/test_context.py
similarity index 100%
rename from sdk/python/tests/test_context.py
rename to tests/test_context.py
diff --git a/sdk/python/tests/test_zmq_driver.py b/tests/test_zmq_driver.py
similarity index 100%
rename from sdk/python/tests/test_zmq_driver.py
rename to tests/test_zmq_driver.py
diff --git a/sdk/python/tests/test_zmq_service.py b/tests/test_zmq_service.py
similarity index 100%
rename from sdk/python/tests/test_zmq_service.py
rename to tests/test_zmq_service.py
diff --git a/sdk/python/tests/unit_python_sdk.yaml b/tests/unit_python_sdk.yaml
similarity index 100%
rename from sdk/python/tests/unit_python_sdk.yaml
rename to tests/unit_python_sdk.yaml