diff --git a/src/wormhole/blocking/__init__.py b/src/wormhole/blocking/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/wormhole/transcribe.py b/src/wormhole/blocking/transcribe.py
similarity index 100%
rename from src/wormhole/transcribe.py
rename to src/wormhole/blocking/transcribe.py
diff --git a/src/wormhole/relay.py b/src/wormhole/servers/relay.py
similarity index 100%
rename from src/wormhole/relay.py
rename to src/wormhole/servers/relay.py
diff --git a/src/wormhole/util/__init__.py b/src/wormhole/util/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/wormhole/eventual.py b/src/wormhole/util/eventual.py
similarity index 100%
rename from src/wormhole/eventual.py
rename to src/wormhole/util/eventual.py
diff --git a/src/wormhole/hkdf.py b/src/wormhole/util/hkdf.py
similarity index 100%
rename from src/wormhole/hkdf.py
rename to src/wormhole/util/hkdf.py
diff --git a/src/wormhole/ipaddrs.py b/src/wormhole/util/ipaddrs.py
similarity index 100%
rename from src/wormhole/ipaddrs.py
rename to src/wormhole/util/ipaddrs.py
diff --git a/src/wormhole/observer.py b/src/wormhole/util/observer.py
similarity index 100%
rename from src/wormhole/observer.py
rename to src/wormhole/util/observer.py