diff --git a/go/src/firmware/fw_e2e_coverage_summarizer.go b/go/src/firmware/e2e_coverage_summarizer/fw_e2e_coverage_summarizer.go
similarity index 100%
rename from go/src/firmware/fw_e2e_coverage_summarizer.go
rename to go/src/firmware/e2e_coverage_summarizer/fw_e2e_coverage_summarizer.go
diff --git a/go/src/firmware/fw_lab_triage_helper.go b/go/src/firmware/lab_triage_helper/fw_lab_triage_helper.go
similarity index 100%
rename from go/src/firmware/fw_lab_triage_helper.go
rename to go/src/firmware/lab_triage_helper/fw_lab_triage_helper.go