From 7b9c48fbc40b3cd7a5a4f9337d29eef7aa8e69d3 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Wed, 20 Apr 2016 19:18:31 -0700
Subject: [PATCH] unsplit: last fixups

---
 .coveragerc | 3 ---
 NEWS.md     | 5 -----
 setup.py    | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 2e724d7..7f5f766 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -2,9 +2,6 @@
 # only record trace data for wormhole.*
 source =
    wormhole
-   txwormhole
-   wormhole_cli
-   wormhole_server
 # and don't trace the test files themselves, or Versioneer's stuff
 omit =
    src/wormhole/test/*
diff --git a/NEWS.md b/NEWS.md
index 8473c63..f8baac7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -16,11 +16,6 @@ User-visible changes in "magic-wormhole":
   the CLI tool.
 * Twisted-flavor input_code() now does readline-based code entry, with
   tab completion.
-* The code has been split into four separate importable packages:
-  * "wormhole", this contains the blocking library and shared code
-  * "txwormhole": twisted lbirary
-  * "wormhole_cli": CLI scripts
-  * "wormhole_server": code for the Rendezvous and Transit Relay servers
 * The package now installs two executables: "wormhole" (for send and
   receive), and "wormhole-server" (to start and manage the relay
   servers).
diff --git a/setup.py b/setup.py
index 650d472..95c90e5 100644
--- a/setup.py
+++ b/setup.py
@@ -15,10 +15,10 @@ setup(name="magic-wormhole",
       package_dir={"": "src"},
       packages=["wormhole",
                 "wormhole.blocking",
-                "wormhole.twisted",
                 "wormhole.cli",
                 "wormhole.server",
                 "wormhole.test",
+                "wormhole.twisted",
                 ],
       package_data={"wormhole.server": ["db-schemas/*.sql"]},
       entry_points={"console_scripts":