diff --git a/tests/go/src/func/broken/correct/addlinkednumbers.go b/tests/go/broken/func/correct/addlinkednumbers.go
similarity index 100%
rename from tests/go/src/func/broken/correct/addlinkednumbers.go
rename to tests/go/broken/func/correct/addlinkednumbers.go
diff --git a/tests/go/src/func/broken/correct/atoibase.go b/tests/go/broken/func/correct/atoibase.go
similarity index 100%
rename from tests/go/src/func/broken/correct/atoibase.go
rename to tests/go/broken/func/correct/atoibase.go
diff --git a/tests/go/src/func/broken/correct/base.go b/tests/go/broken/func/correct/base.go
similarity index 100%
rename from tests/go/src/func/broken/correct/base.go
rename to tests/go/broken/func/correct/base.go
diff --git a/tests/go/src/func/broken/correct/btree.go b/tests/go/broken/func/correct/btree.go
similarity index 100%
rename from tests/go/src/func/broken/correct/btree.go
rename to tests/go/broken/func/correct/btree.go
diff --git a/tests/go/src/func/broken/correct/challenge.go b/tests/go/broken/func/correct/challenge.go
similarity index 100%
rename from tests/go/src/func/broken/correct/challenge.go
rename to tests/go/broken/func/correct/challenge.go
diff --git a/tests/go/src/func/broken/correct/changeorder.go b/tests/go/broken/func/correct/changeorder.go
similarity index 100%
rename from tests/go/src/func/broken/correct/changeorder.go
rename to tests/go/broken/func/correct/changeorder.go
diff --git a/tests/go/src/func/broken/correct/convertbase.go b/tests/go/broken/func/correct/convertbase.go
similarity index 100%
rename from tests/go/src/func/broken/correct/convertbase.go
rename to tests/go/broken/func/correct/convertbase.go
diff --git a/tests/go/src/func/broken/correct/listat.go b/tests/go/broken/func/correct/listat.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listat.go
rename to tests/go/broken/func/correct/listat.go
diff --git a/tests/go/src/func/broken/correct/listclear.go b/tests/go/broken/func/correct/listclear.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listclear.go
rename to tests/go/broken/func/correct/listclear.go
diff --git a/tests/go/src/func/broken/correct/listfind.go b/tests/go/broken/func/correct/listfind.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listfind.go
rename to tests/go/broken/func/correct/listfind.go
diff --git a/tests/go/src/func/broken/correct/listforeach.go b/tests/go/broken/func/correct/listforeach.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listforeach.go
rename to tests/go/broken/func/correct/listforeach.go
diff --git a/tests/go/src/func/broken/correct/listforeachif.go b/tests/go/broken/func/correct/listforeachif.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listforeachif.go
rename to tests/go/broken/func/correct/listforeachif.go
diff --git a/tests/go/src/func/broken/correct/listlast.go b/tests/go/broken/func/correct/listlast.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listlast.go
rename to tests/go/broken/func/correct/listlast.go
diff --git a/tests/go/src/func/broken/correct/listmerge.go b/tests/go/broken/func/correct/listmerge.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listmerge.go
rename to tests/go/broken/func/correct/listmerge.go
diff --git a/tests/go/src/func/broken/correct/listpushback.go b/tests/go/broken/func/correct/listpushback.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listpushback.go
rename to tests/go/broken/func/correct/listpushback.go
diff --git a/tests/go/src/func/broken/correct/listpushfront.go b/tests/go/broken/func/correct/listpushfront.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listpushfront.go
rename to tests/go/broken/func/correct/listpushfront.go
diff --git a/tests/go/src/func/broken/correct/listremoveif.go b/tests/go/broken/func/correct/listremoveif.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listremoveif.go
rename to tests/go/broken/func/correct/listremoveif.go
diff --git a/tests/go/src/func/broken/correct/listreverse.go b/tests/go/broken/func/correct/listreverse.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listreverse.go
rename to tests/go/broken/func/correct/listreverse.go
diff --git a/tests/go/src/func/broken/correct/listsize.go b/tests/go/broken/func/correct/listsize.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listsize.go
rename to tests/go/broken/func/correct/listsize.go
diff --git a/tests/go/src/func/broken/correct/listsort.go b/tests/go/broken/func/correct/listsort.go
similarity index 100%
rename from tests/go/src/func/broken/correct/listsort.go
rename to tests/go/broken/func/correct/listsort.go
diff --git a/tests/go/src/func/broken/correct/printnbrbase.go b/tests/go/broken/func/correct/printnbrbase.go
similarity index 100%
rename from tests/go/src/func/broken/correct/printnbrbase.go
rename to tests/go/broken/func/correct/printnbrbase.go
diff --git a/tests/go/src/func/broken/correct/reverse.go b/tests/go/broken/func/correct/reverse.go
similarity index 100%
rename from tests/go/src/func/broken/correct/reverse.go
rename to tests/go/broken/func/correct/reverse.go
diff --git a/tests/go/src/func/broken/correct/sortedlistmerge.go b/tests/go/broken/func/correct/sortedlistmerge.go
similarity index 100%
rename from tests/go/src/func/broken/correct/sortedlistmerge.go
rename to tests/go/broken/func/correct/sortedlistmerge.go
diff --git a/tests/go/src/func/broken/correct/sortlistinsert.go b/tests/go/broken/func/correct/sortlistinsert.go
similarity index 100%
rename from tests/go/src/func/broken/correct/sortlistinsert.go
rename to tests/go/broken/func/correct/sortlistinsert.go
diff --git a/tests/go/src/func/broken/correct/sortll.go b/tests/go/broken/func/correct/sortll.go
similarity index 100%
rename from tests/go/src/func/broken/correct/sortll.go
rename to tests/go/broken/func/correct/sortll.go
diff --git a/tests/go/src/func/broken/test_atoibase.go b/tests/go/broken/func/test_atoibase.go
similarity index 100%
rename from tests/go/src/func/broken/test_atoibase.go
rename to tests/go/broken/func/test_atoibase.go
diff --git a/tests/go/src/func/broken/test_btreeapplybylevel.go b/tests/go/broken/func/test_btreeapplybylevel.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreeapplybylevel.go
rename to tests/go/broken/func/test_btreeapplybylevel.go
diff --git a/tests/go/src/func/broken/test_btreeapplyinorder.go b/tests/go/broken/func/test_btreeapplyinorder.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreeapplyinorder.go
rename to tests/go/broken/func/test_btreeapplyinorder.go
diff --git a/tests/go/src/func/broken/test_btreeapplypostorder.go b/tests/go/broken/func/test_btreeapplypostorder.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreeapplypostorder.go
rename to tests/go/broken/func/test_btreeapplypostorder.go
diff --git a/tests/go/src/func/broken/test_btreeapplypreorder.go b/tests/go/broken/func/test_btreeapplypreorder.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreeapplypreorder.go
rename to tests/go/broken/func/test_btreeapplypreorder.go
diff --git a/tests/go/src/func/broken/test_btreedeletenode.go b/tests/go/broken/func/test_btreedeletenode.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreedeletenode.go
rename to tests/go/broken/func/test_btreedeletenode.go
diff --git a/tests/go/src/func/broken/test_btreeinsertdata.go b/tests/go/broken/func/test_btreeinsertdata.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreeinsertdata.go
rename to tests/go/broken/func/test_btreeinsertdata.go
diff --git a/tests/go/src/func/broken/test_btreeisbinary.go b/tests/go/broken/func/test_btreeisbinary.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreeisbinary.go
rename to tests/go/broken/func/test_btreeisbinary.go
diff --git a/tests/go/src/func/broken/test_btreelevelcount.go b/tests/go/broken/func/test_btreelevelcount.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreelevelcount.go
rename to tests/go/broken/func/test_btreelevelcount.go
diff --git a/tests/go/src/func/broken/test_btreemax.go b/tests/go/broken/func/test_btreemax.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreemax.go
rename to tests/go/broken/func/test_btreemax.go
diff --git a/tests/go/src/func/broken/test_btreemin.go b/tests/go/broken/func/test_btreemin.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreemin.go
rename to tests/go/broken/func/test_btreemin.go
diff --git a/tests/go/src/func/broken/test_btreesearchitem.go b/tests/go/broken/func/test_btreesearchitem.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreesearchitem.go
rename to tests/go/broken/func/test_btreesearchitem.go
diff --git a/tests/go/src/func/broken/test_btreetransplant.go b/tests/go/broken/func/test_btreetransplant.go
similarity index 100%
rename from tests/go/src/func/broken/test_btreetransplant.go
rename to tests/go/broken/func/test_btreetransplant.go
diff --git a/tests/go/src/func/broken/test_convertbase.go b/tests/go/broken/func/test_convertbase.go
similarity index 100%
rename from tests/go/src/func/broken/test_convertbase.go
rename to tests/go/broken/func/test_convertbase.go
diff --git a/tests/go/src/func/broken/test_listat.go b/tests/go/broken/func/test_listat.go
similarity index 100%
rename from tests/go/src/func/broken/test_listat.go
rename to tests/go/broken/func/test_listat.go
diff --git a/tests/go/src/func/broken/test_listclear.go b/tests/go/broken/func/test_listclear.go
similarity index 100%
rename from tests/go/src/func/broken/test_listclear.go
rename to tests/go/broken/func/test_listclear.go
diff --git a/tests/go/src/func/broken/test_listfind.go b/tests/go/broken/func/test_listfind.go
similarity index 100%
rename from tests/go/src/func/broken/test_listfind.go
rename to tests/go/broken/func/test_listfind.go
diff --git a/tests/go/src/func/broken/test_listforeach.go b/tests/go/broken/func/test_listforeach.go
similarity index 100%
rename from tests/go/src/func/broken/test_listforeach.go
rename to tests/go/broken/func/test_listforeach.go
diff --git a/tests/go/src/func/broken/test_listforeachif.go b/tests/go/broken/func/test_listforeachif.go
similarity index 100%
rename from tests/go/src/func/broken/test_listforeachif.go
rename to tests/go/broken/func/test_listforeachif.go
diff --git a/tests/go/src/func/broken/test_listlast.go b/tests/go/broken/func/test_listlast.go
similarity index 100%
rename from tests/go/src/func/broken/test_listlast.go
rename to tests/go/broken/func/test_listlast.go
diff --git a/tests/go/src/func/broken/test_listmerge.go b/tests/go/broken/func/test_listmerge.go
similarity index 100%
rename from tests/go/src/func/broken/test_listmerge.go
rename to tests/go/broken/func/test_listmerge.go
diff --git a/tests/go/src/func/broken/test_listpushback.go b/tests/go/broken/func/test_listpushback.go
similarity index 100%
rename from tests/go/src/func/broken/test_listpushback.go
rename to tests/go/broken/func/test_listpushback.go
diff --git a/tests/go/src/func/broken/test_listpushfront.go b/tests/go/broken/func/test_listpushfront.go
similarity index 100%
rename from tests/go/src/func/broken/test_listpushfront.go
rename to tests/go/broken/func/test_listpushfront.go
diff --git a/tests/go/src/func/broken/test_listremoveif.go b/tests/go/broken/func/test_listremoveif.go
similarity index 100%
rename from tests/go/src/func/broken/test_listremoveif.go
rename to tests/go/broken/func/test_listremoveif.go
diff --git a/tests/go/src/func/broken/test_listreverse.go b/tests/go/broken/func/test_listreverse.go
similarity index 100%
rename from tests/go/src/func/broken/test_listreverse.go
rename to tests/go/broken/func/test_listreverse.go
diff --git a/tests/go/src/func/broken/test_listsize.go b/tests/go/broken/func/test_listsize.go
similarity index 100%
rename from tests/go/src/func/broken/test_listsize.go
rename to tests/go/broken/func/test_listsize.go
diff --git a/tests/go/src/func/broken/test_listsort.go b/tests/go/broken/func/test_listsort.go
similarity index 100%
rename from tests/go/src/func/broken/test_listsort.go
rename to tests/go/broken/func/test_listsort.go
diff --git a/tests/go/src/func/broken/test_printnbrbase.go b/tests/go/broken/func/test_printnbrbase.go
similarity index 100%
rename from tests/go/src/func/broken/test_printnbrbase.go
rename to tests/go/broken/func/test_printnbrbase.go
diff --git a/tests/go/src/func/broken/test_sortedlistmerge.go b/tests/go/broken/func/test_sortedlistmerge.go
similarity index 100%
rename from tests/go/src/func/broken/test_sortedlistmerge.go
rename to tests/go/broken/func/test_sortedlistmerge.go
diff --git a/tests/go/src/func/broken/test_sortlistinsert.go b/tests/go/broken/func/test_sortlistinsert.go
similarity index 100%
rename from tests/go/src/func/broken/test_sortlistinsert.go
rename to tests/go/broken/func/test_sortlistinsert.go