diff --git a/go/tests/tofix/func/correct/addlinkednumbers.go b/go/tofix/func/correct/addlinkednumbers.go
similarity index 100%
rename from go/tests/tofix/func/correct/addlinkednumbers.go
rename to go/tofix/func/correct/addlinkednumbers.go
diff --git a/go/tests/tofix/func/correct/changeorder.go b/go/tofix/func/correct/changeorder.go
similarity index 100%
rename from go/tests/tofix/func/correct/changeorder.go
rename to go/tofix/func/correct/changeorder.go
diff --git a/go/tests/tofix/func/correct/reverse.go b/go/tofix/func/correct/reverse.go
similarity index 100%
rename from go/tests/tofix/func/correct/reverse.go
rename to go/tofix/func/correct/reverse.go
diff --git a/go/tests/tofix/func/correct/sortll.go b/go/tofix/func/correct/sortll.go
similarity index 100%
rename from go/tests/tofix/func/correct/sortll.go
rename to go/tofix/func/correct/sortll.go
diff --git a/go/tests/tofix/func/createelem/main.go b/go/tofix/func/createelem/main.go
similarity index 100%
rename from go/tests/tofix/func/createelem/main.go
rename to go/tofix/func/createelem/main.go
diff --git a/go/tests/tofix/func/inverttree/main.go b/go/tofix/func/inverttree/main.go
similarity index 100%
rename from go/tests/tofix/func/inverttree/main.go
rename to go/tofix/func/inverttree/main.go
diff --git a/go/tests/tofix/func/merge/main.go b/go/tofix/func/merge/main.go
similarity index 100%
rename from go/tests/tofix/func/merge/main.go
rename to go/tofix/func/merge/main.go
diff --git a/go/tests/tofix/func/reverse/main.go b/go/tofix/func/reverse/main.go
similarity index 100%
rename from go/tests/tofix/func/reverse/main.go
rename to go/tofix/func/reverse/main.go
diff --git a/go/tests/tofix/func/sametree/main.go b/go/tofix/func/sametree/main.go
similarity index 100%
rename from go/tests/tofix/func/sametree/main.go
rename to go/tofix/func/sametree/main.go
diff --git a/go/tests/tofix/func/sortlist/main.go b/go/tofix/func/sortlist/main.go
similarity index 100%
rename from go/tests/tofix/func/sortlist/main.go
rename to go/tofix/func/sortlist/main.go
diff --git a/go/tests/tofix/func/test_addlinkednumbers.go b/go/tofix/func/test_addlinkednumbers.go
similarity index 100%
rename from go/tests/tofix/func/test_addlinkednumbers.go
rename to go/tofix/func/test_addlinkednumbers.go
diff --git a/go/tests/tofix/func/test_changeorder.go b/go/tofix/func/test_changeorder.go
similarity index 100%
rename from go/tests/tofix/func/test_changeorder.go
rename to go/tofix/func/test_changeorder.go
diff --git a/go/tests/tofix/func/test_sortll.go b/go/tofix/func/test_sortll.go
similarity index 100%
rename from go/tests/tofix/func/test_sortll.go
rename to go/tofix/func/test_sortll.go
diff --git a/go/tests/tofix/raid3/correct/main.go b/go/tofix/raid3/correct/main.go
similarity index 100%
rename from go/tests/tofix/raid3/correct/main.go
rename to go/tofix/raid3/correct/main.go
diff --git a/go/tests/tofix/raid3/correct/raid1aprog/raid1a.go b/go/tofix/raid3/correct/raid1aprog/raid1a.go
similarity index 100%
rename from go/tests/tofix/raid3/correct/raid1aprog/raid1a.go
rename to go/tofix/raid3/correct/raid1aprog/raid1a.go
diff --git a/go/tests/tofix/raid3/correct/raid1bprog/raid1b.go b/go/tofix/raid3/correct/raid1bprog/raid1b.go
similarity index 100%
rename from go/tests/tofix/raid3/correct/raid1bprog/raid1b.go
rename to go/tofix/raid3/correct/raid1bprog/raid1b.go
diff --git a/go/tests/tofix/raid3/correct/raid1cprog/raid1c.go b/go/tofix/raid3/correct/raid1cprog/raid1c.go
similarity index 100%
rename from go/tests/tofix/raid3/correct/raid1cprog/raid1c.go
rename to go/tofix/raid3/correct/raid1cprog/raid1c.go
diff --git a/go/tests/tofix/raid3/correct/raid1dprog/raid1d.go b/go/tofix/raid3/correct/raid1dprog/raid1d.go
similarity index 100%
rename from go/tests/tofix/raid3/correct/raid1dprog/raid1d.go
rename to go/tofix/raid3/correct/raid1dprog/raid1d.go
diff --git a/go/tests/tofix/raid3/correct/raid1eprog/raid1e.go b/go/tofix/raid3/correct/raid1eprog/raid1e.go
similarity index 100%
rename from go/tests/tofix/raid3/correct/raid1eprog/raid1e.go
rename to go/tofix/raid3/correct/raid1eprog/raid1e.go
diff --git a/go/tests/tofix/raid3/main.go b/go/tofix/raid3/main.go
similarity index 100%
rename from go/tests/tofix/raid3/main.go
rename to go/tofix/raid3/main.go
diff --git a/go/tests/tofix/ztail/correct/main.go b/go/tofix/ztail/correct/main.go
similarity index 100%
rename from go/tests/tofix/ztail/correct/main.go
rename to go/tofix/ztail/correct/main.go
diff --git a/go/tests/tofix/ztail/main.go b/go/tofix/ztail/main.go
similarity index 100%
rename from go/tests/tofix/ztail/main.go
rename to go/tofix/ztail/main.go