diff --git a/go/src/firmware/e2e_coverage_summarizer/fw_e2e_coverage_summarizer.go b/go/src/firmware/cmd/e2e_coverage_summarizer/fw_e2e_coverage_summarizer.go
similarity index 98%
rename from go/src/firmware/e2e_coverage_summarizer/fw_e2e_coverage_summarizer.go
rename to go/src/firmware/cmd/e2e_coverage_summarizer/fw_e2e_coverage_summarizer.go
index a3a7d6f..2b01d57 100644
--- a/go/src/firmware/e2e_coverage_summarizer/fw_e2e_coverage_summarizer.go
+++ b/go/src/firmware/cmd/e2e_coverage_summarizer/fw_e2e_coverage_summarizer.go
@@ -5,6 +5,7 @@
 package main
 
 import (
+	"firmware/internal/pkg/monorail"
 	"flag"
 	"fmt"
 	"io/ioutil"
@@ -289,7 +290,7 @@
 	if err != nil {
 		log.Fatalf("collecting existing tests: %v", err)
 	}
-	issues, err := IssuesList(UnwrittenFwTestReqParams)
+	issues, err := monorail.IssuesList(monorail.UnwrittenFwTestReqParams)
 	if err != nil {
 		log.Fatalf("collecting unwritten tests: %v", err)
 	}
diff --git a/go/src/firmware/lab_triage_helper/fw_lab_triage_helper.go b/go/src/firmware/cmd/lab_triage_helper/fw_lab_triage_helper.go
similarity index 100%
rename from go/src/firmware/lab_triage_helper/fw_lab_triage_helper.go
rename to go/src/firmware/cmd/lab_triage_helper/fw_lab_triage_helper.go
diff --git a/go/src/firmware/e2e_coverage_summarizer/monorail.go b/go/src/firmware/internal/pkg/monorail/monorail.go
similarity index 99%
rename from go/src/firmware/e2e_coverage_summarizer/monorail.go
rename to go/src/firmware/internal/pkg/monorail/monorail.go
index 3592be5..8009406 100644
--- a/go/src/firmware/e2e_coverage_summarizer/monorail.go
+++ b/go/src/firmware/internal/pkg/monorail/monorail.go
@@ -4,7 +4,7 @@
 
 // monorail.go provides an interface to the Monorail API.
 
-package main
+package monorail
 
 import (
 	"context"