diff --git a/.travis.yml b/.travis.yml
index 79724aa27..9704b679b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,16 @@ jobs:
         - coverage combine lbry/
         - bash <(curl -s https://codecov.io/bash)
 
-    - name: "Torba Unit Tests"
+    - name: "LBRY Integration Tests"
+      install:
+        - pip install coverage tox-travis
+      script: cd lbry && tox
+      after_success:
+        - coverage combine lbry
+        - bash <(curl -s https://codecov.io/bash)
+
+    - &torba-tests
+      name: "Torba Unit Tests"
       env: TESTTYPE=unit
       install:
         - pip install coverage tox-travis
@@ -33,13 +42,9 @@ jobs:
         - coverage combine torba/tests
         - bash <(curl -s https://codecov.io/bash)
 
-    - name: "LBRY Integration Tests"
-      install:
-        - pip install coverage tox-travis
-      script: cd lbry && tox
-      after_success:
-        - coverage combine lbry
-        - bash <(curl -s https://codecov.io/bash)
+    - <<: *torba-tests
+      name: "Torba Integration Tests"
+      env: TESTTYPE=integration
 
     - name: "Run Examples"
       install:
@@ -59,7 +64,7 @@ jobs:
       install:
         - docker pull lbry/pyinstaller34_32bits:py371
       script:
-        - python scripts/set_build.py
+        - cd lbry && python scripts/set_build.py
         - docker run -v "$(pwd):/src/lbry" lbry/pyinstaller34_32bits:py371 lbry/scripts/wine_build.sh
         - sudo zip -j dist/lbrynet-windows.zip dist/lbrynet.exe
       deploy:
diff --git a/scripts/Dockerfile.lbry_orchstr8 b/lbry/scripts/Dockerfile.lbry_orchstr8
similarity index 100%
rename from scripts/Dockerfile.lbry_orchstr8
rename to lbry/scripts/Dockerfile.lbry_orchstr8
diff --git a/scripts/Dockerfile.wallet_server b/lbry/scripts/Dockerfile.wallet_server
similarity index 100%
rename from scripts/Dockerfile.wallet_server
rename to lbry/scripts/Dockerfile.wallet_server
diff --git a/scripts/checktrie.py b/lbry/scripts/checktrie.py
similarity index 100%
rename from scripts/checktrie.py
rename to lbry/scripts/checktrie.py
diff --git a/scripts/dht_monitor.py b/lbry/scripts/dht_monitor.py
similarity index 100%
rename from scripts/dht_monitor.py
rename to lbry/scripts/dht_monitor.py
diff --git a/scripts/docker_pyinstaller/Dockerfile b/lbry/scripts/docker_pyinstaller/Dockerfile
similarity index 100%
rename from scripts/docker_pyinstaller/Dockerfile
rename to lbry/scripts/docker_pyinstaller/Dockerfile
diff --git a/scripts/docker_pyinstaller/README.md b/lbry/scripts/docker_pyinstaller/README.md
similarity index 100%
rename from scripts/docker_pyinstaller/README.md
rename to lbry/scripts/docker_pyinstaller/README.md
diff --git a/scripts/docker_pyinstaller/entrypoint.sh b/lbry/scripts/docker_pyinstaller/entrypoint.sh
similarity index 100%
rename from scripts/docker_pyinstaller/entrypoint.sh
rename to lbry/scripts/docker_pyinstaller/entrypoint.sh
diff --git a/scripts/download_blob_from_peer.py b/lbry/scripts/download_blob_from_peer.py
similarity index 100%
rename from scripts/download_blob_from_peer.py
rename to lbry/scripts/download_blob_from_peer.py
diff --git a/scripts/generate_json_api.py b/lbry/scripts/generate_json_api.py
similarity index 100%
rename from scripts/generate_json_api.py
rename to lbry/scripts/generate_json_api.py
diff --git a/scripts/hook-coincurve.py b/lbry/scripts/hook-coincurve.py
similarity index 100%
rename from scripts/hook-coincurve.py
rename to lbry/scripts/hook-coincurve.py
diff --git a/scripts/publish_performance.py b/lbry/scripts/publish_performance.py
similarity index 100%
rename from scripts/publish_performance.py
rename to lbry/scripts/publish_performance.py
diff --git a/scripts/release.py b/lbry/scripts/release.py
similarity index 100%
rename from scripts/release.py
rename to lbry/scripts/release.py
diff --git a/scripts/repair_0_31_1_db.py b/lbry/scripts/repair_0_31_1_db.py
similarity index 100%
rename from scripts/repair_0_31_1_db.py
rename to lbry/scripts/repair_0_31_1_db.py
diff --git a/scripts/set_build.py b/lbry/scripts/set_build.py
similarity index 100%
rename from scripts/set_build.py
rename to lbry/scripts/set_build.py
diff --git a/scripts/standalone_blob_server.py b/lbry/scripts/standalone_blob_server.py
similarity index 100%
rename from scripts/standalone_blob_server.py
rename to lbry/scripts/standalone_blob_server.py
diff --git a/scripts/time_to_first_byte.py b/lbry/scripts/time_to_first_byte.py
similarity index 100%
rename from scripts/time_to_first_byte.py
rename to lbry/scripts/time_to_first_byte.py
diff --git a/scripts/wine_build.sh b/lbry/scripts/wine_build.sh
similarity index 100%
rename from scripts/wine_build.sh
rename to lbry/scripts/wine_build.sh