diff --git a/calib.py b/amodem/calib.py
similarity index 100%
rename from calib.py
rename to amodem/calib.py
diff --git a/colorhash.py b/amodem/colorhash.py
similarity index 100%
rename from colorhash.py
rename to amodem/colorhash.py
diff --git a/common.py b/amodem/common.py
similarity index 100%
rename from common.py
rename to amodem/common.py
diff --git a/config.py b/amodem/config.py
similarity index 100%
rename from config.py
rename to amodem/config.py
diff --git a/constellation.py b/amodem/constellation.py
similarity index 100%
rename from constellation.py
rename to amodem/constellation.py
diff --git a/drift.py b/amodem/drift.py
similarity index 100%
rename from drift.py
rename to amodem/drift.py
diff --git a/ecc.py b/amodem/ecc.py
similarity index 100%
rename from ecc.py
rename to amodem/ecc.py
diff --git a/errors.py b/amodem/errors.py
similarity index 100%
rename from errors.py
rename to amodem/errors.py
diff --git a/loop.py b/amodem/loop.py
similarity index 100%
rename from loop.py
rename to amodem/loop.py
diff --git a/pll.py b/amodem/pll.py
similarity index 100%
rename from pll.py
rename to amodem/pll.py
diff --git a/recv.py b/amodem/recv.py
similarity index 100%
rename from recv.py
rename to amodem/recv.py
diff --git a/sampling.py b/amodem/sampling.py
similarity index 100%
rename from sampling.py
rename to amodem/sampling.py
diff --git a/send.py b/amodem/send.py
similarity index 100%
rename from send.py
rename to amodem/send.py
diff --git a/show.py b/amodem/show.py
similarity index 100%
rename from show.py
rename to amodem/show.py
diff --git a/sigproc.py b/amodem/sigproc.py
similarity index 100%
rename from sigproc.py
rename to amodem/sigproc.py
diff --git a/stream.py b/amodem/stream.py
similarity index 100%
rename from stream.py
rename to amodem/stream.py
diff --git a/test_common.py b/amodem/test/test_common.py
similarity index 100%
rename from test_common.py
rename to amodem/test/test_common.py
diff --git a/amodem/test/test_ecc.py b/amodem/test/test_ecc.py
new file mode 100644
index 0000000..3fba091
--- /dev/null
+++ b/amodem/test/test_ecc.py
@@ -0,0 +1,15 @@
+import ecc
+import random
+import itertools
+
+
+def concat(chunks):
+    return bytearray(itertools.chain.from_iterable(chunks))
+
+
+def test_random():
+    r = random.Random(0)
+    x = bytearray(r.randrange(0, 256) for i in range(64 * 1024))
+    y = ecc.encode(x)
+    x_ = concat(ecc.decode(y))
+    assert x_ == x
diff --git a/test_sampling.py b/amodem/test/test_sampling.py
similarity index 100%
rename from test_sampling.py
rename to amodem/test/test_sampling.py
diff --git a/test_sigproc.py b/amodem/test/test_sigproc.py
similarity index 100%
rename from test_sigproc.py
rename to amodem/test/test_sigproc.py
diff --git a/test_stream.py b/amodem/test/test_stream.py
similarity index 100%
rename from test_stream.py
rename to amodem/test/test_stream.py
diff --git a/train.py b/amodem/train.py
similarity index 100%
rename from train.py
rename to amodem/train.py
diff --git a/wave.py b/amodem/wave.py
similarity index 100%
rename from wave.py
rename to amodem/wave.py
diff --git a/loop.sh b/loop.sh
deleted file mode 100755
index d700848..0000000
--- a/loop.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-(while [ true ]; do cat $1; done ) | aplay -q -f S16_LE -c 1 -r 32000
diff --git a/test_ecc.py b/test_ecc.py
deleted file mode 100644
index f7a51de..0000000
--- a/test_ecc.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import ecc
-import random
-import itertools
-
-
-def concat(chunks):
-    return bytearray(itertools.chain.from_iterable(chunks))
-
-
-def test_random():
-    r = random.Random(0)
-    x = bytearray(r.randrange(0, 256) for i in range(16 * 1024))
-    y = ecc.encode(x)
-    x_ = concat(ecc.decode(y))
-    assert x_[:len(x)] == x
-    assert all(v == 0 for v in x_[len(x):])
-
-
-def test_file():
-    data = open('data.send').read()
-    enc = ecc.encode(data)
-    assert concat(ecc.decode(enc)) == data