diff --git a/go/mlr.go b/go/mlr.go
index 5acef593b..f6c8f4c8e 100644
--- a/go/mlr.go
+++ b/go/mlr.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"runtime/pprof"
 	// Miller:
-	"stream"
+	"miller/stream"
 )
 
 // ----------------------------------------------------------------
diff --git a/go/src/containers/lrec.go b/go/src/miller/containers/lrec.go
similarity index 100%
rename from go/src/containers/lrec.go
rename to go/src/miller/containers/lrec.go
diff --git a/go/src/input/record_reader.go b/go/src/miller/input/record_reader.go
similarity index 89%
rename from go/src/input/record_reader.go
rename to go/src/miller/input/record_reader.go
index 1e38b2875..be5733395 100644
--- a/go/src/input/record_reader.go
+++ b/go/src/miller/input/record_reader.go
@@ -1,7 +1,7 @@
 package input
 
 import (
-	"containers"
+	"miller/containers"
 )
 
 // reader *bufio.Reader in constructors/factory
diff --git a/go/src/input/record_reader_dkvp.go b/go/src/miller/input/record_reader_dkvp.go
similarity index 97%
rename from go/src/input/record_reader_dkvp.go
rename to go/src/miller/input/record_reader_dkvp.go
index afb892c4f..4fb94490a 100644
--- a/go/src/input/record_reader_dkvp.go
+++ b/go/src/miller/input/record_reader_dkvp.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"strings"
 	// Miller:
-	"containers"
-	"lib"
+	"miller/containers"
+	"miller/lib"
 )
 
 type RecordReaderDKVP struct {
diff --git a/go/src/input/record_reader_factory.go b/go/src/miller/input/record_reader_factory.go
similarity index 100%
rename from go/src/input/record_reader_factory.go
rename to go/src/miller/input/record_reader_factory.go
diff --git a/go/src/lib/argf.go b/go/src/miller/lib/argf.go
similarity index 100%
rename from go/src/lib/argf.go
rename to go/src/miller/lib/argf.go
diff --git a/go/src/mapping/channel_mapper.go b/go/src/miller/mapping/channel_mapper.go
similarity index 93%
rename from go/src/mapping/channel_mapper.go
rename to go/src/miller/mapping/channel_mapper.go
index 53c014456..48ccff26a 100644
--- a/go/src/mapping/channel_mapper.go
+++ b/go/src/miller/mapping/channel_mapper.go
@@ -1,7 +1,7 @@
 package mapping
 
 import (
-	"containers"
+	"miller/containers"
 )
 
 func ChannelMapper(
diff --git a/go/src/mapping/mapper_cat.go b/go/src/miller/mapping/mapper_cat.go
similarity index 93%
rename from go/src/mapping/mapper_cat.go
rename to go/src/miller/mapping/mapper_cat.go
index 85f9a8ebb..d3653ffba 100644
--- a/go/src/mapping/mapper_cat.go
+++ b/go/src/miller/mapping/mapper_cat.go
@@ -1,7 +1,7 @@
 package mapping
 
 import (
-	"containers"
+	"miller/containers"
 )
 
 type MapperCat struct {
diff --git a/go/src/mapping/mapper_foo.go b/go/src/miller/mapping/mapper_foo.go
similarity index 95%
rename from go/src/mapping/mapper_foo.go
rename to go/src/miller/mapping/mapper_foo.go
index 52102f353..98304f85b 100644
--- a/go/src/mapping/mapper_foo.go
+++ b/go/src/miller/mapping/mapper_foo.go
@@ -1,7 +1,7 @@
 package mapping
 
 import (
-	"containers"
+	"miller/containers"
 )
 
 type MapperFoo struct {
diff --git a/go/src/mapping/mapper_nothing.go b/go/src/miller/mapping/mapper_nothing.go
similarity index 94%
rename from go/src/mapping/mapper_nothing.go
rename to go/src/miller/mapping/mapper_nothing.go
index 2d230677b..f975405f0 100644
--- a/go/src/mapping/mapper_nothing.go
+++ b/go/src/miller/mapping/mapper_nothing.go
@@ -1,7 +1,7 @@
 package mapping
 
 import (
-	"containers"
+	"miller/containers"
 )
 
 type MapperNothing struct {
diff --git a/go/src/mapping/mapper_tac.go b/go/src/miller/mapping/mapper_tac.go
similarity index 96%
rename from go/src/mapping/mapper_tac.go
rename to go/src/miller/mapping/mapper_tac.go
index 2197ab4cb..8ec46db9e 100644
--- a/go/src/mapping/mapper_tac.go
+++ b/go/src/miller/mapping/mapper_tac.go
@@ -4,7 +4,7 @@ import (
 	// System:
 	"container/list"
 	// Miller:
-	"containers"
+	"miller/containers"
 )
 
 type MapperTac struct {
diff --git a/go/src/mapping/record_mapper.go b/go/src/miller/mapping/record_mapper.go
similarity index 86%
rename from go/src/mapping/record_mapper.go
rename to go/src/miller/mapping/record_mapper.go
index cf92ca879..398c39a57 100644
--- a/go/src/mapping/record_mapper.go
+++ b/go/src/miller/mapping/record_mapper.go
@@ -1,7 +1,7 @@
 package mapping
 
 import (
-	"containers"
+	"miller/containers"
 )
 
 type RecordMapper interface {
diff --git a/go/src/mapping/record_mapper_factory.go b/go/src/miller/mapping/record_mapper_factory.go
similarity index 100%
rename from go/src/mapping/record_mapper_factory.go
rename to go/src/miller/mapping/record_mapper_factory.go
diff --git a/go/src/output/channel_writer.go b/go/src/miller/output/channel_writer.go
similarity index 93%
rename from go/src/output/channel_writer.go
rename to go/src/miller/output/channel_writer.go
index 26cc3cbd1..59e5d13aa 100644
--- a/go/src/output/channel_writer.go
+++ b/go/src/miller/output/channel_writer.go
@@ -4,7 +4,7 @@ import (
 	// System:
 	"os"
 	// Miller:
-	"containers"
+	"miller/containers"
 )
 
 func ChannelWriter(
diff --git a/go/src/output/record_writer.go b/go/src/miller/output/record_writer.go
similarity index 86%
rename from go/src/output/record_writer.go
rename to go/src/miller/output/record_writer.go
index c5173e820..57a849951 100644
--- a/go/src/output/record_writer.go
+++ b/go/src/miller/output/record_writer.go
@@ -1,7 +1,7 @@
 package output
 
 import (
-	"containers"
+	"miller/containers"
 )
 
 // ostream *os.File in constructors/factory
diff --git a/go/src/output/record_writer_csv.go b/go/src/miller/output/record_writer_csv.go
similarity index 97%
rename from go/src/output/record_writer_csv.go
rename to go/src/miller/output/record_writer_csv.go
index 154218e84..422275bd8 100644
--- a/go/src/output/record_writer_csv.go
+++ b/go/src/miller/output/record_writer_csv.go
@@ -5,7 +5,7 @@ import (
 	"encoding/csv"
 	"os"
 	// Miller:
-	"containers"
+	"miller/containers"
 )
 
 // ostream *os.File in constructors/factory
diff --git a/go/src/output/record_writer_dkvp.go b/go/src/miller/output/record_writer_dkvp.go
similarity index 97%
rename from go/src/output/record_writer_dkvp.go
rename to go/src/miller/output/record_writer_dkvp.go
index 72d1dcad0..465da7e51 100644
--- a/go/src/output/record_writer_dkvp.go
+++ b/go/src/miller/output/record_writer_dkvp.go
@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"os"
 	// Miller:
-	"containers"
+	"miller/containers"
 )
 
 // ostream *os.File in constructors/factory
diff --git a/go/src/output/record_writer_factory.go b/go/src/miller/output/record_writer_factory.go
similarity index 100%
rename from go/src/output/record_writer_factory.go
rename to go/src/miller/output/record_writer_factory.go
diff --git a/go/src/output/record_writer_nidx.go b/go/src/miller/output/record_writer_nidx.go
similarity index 96%
rename from go/src/output/record_writer_nidx.go
rename to go/src/miller/output/record_writer_nidx.go
index 231551ccb..3c58b4e2d 100644
--- a/go/src/output/record_writer_nidx.go
+++ b/go/src/miller/output/record_writer_nidx.go
@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"os"
 	// Miller:
-	"containers"
+	"miller/containers"
 )
 
 // ostream *os.File in constructors/factory
diff --git a/go/src/output/record_writer_xtab.go b/go/src/miller/output/record_writer_xtab.go
similarity index 98%
rename from go/src/output/record_writer_xtab.go
rename to go/src/miller/output/record_writer_xtab.go
index 4ac458a63..55618f783 100644
--- a/go/src/output/record_writer_xtab.go
+++ b/go/src/miller/output/record_writer_xtab.go
@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"os"
 	// Miller:
-	"containers"
+	"miller/containers"
 )
 
 // ostream *os.File in constructors/factory
diff --git a/go/src/stream/stream.go b/go/src/miller/stream/stream.go
similarity index 94%
rename from go/src/stream/stream.go
rename to go/src/miller/stream/stream.go
index 3fead5844..cbaeaa553 100644
--- a/go/src/stream/stream.go
+++ b/go/src/miller/stream/stream.go
@@ -6,10 +6,10 @@ import (
 	"log"
 	"os"
 	// Miller:
-	"containers"
-	"input"
-	"mapping"
-	"output"
+	"miller/containers"
+	"miller/input"
+	"miller/mapping"
+	"miller/output"
 )
 
 // ----------------------------------------------------------------