diff --git a/go/tests/lib/lib.go b/go/lib/lib.go
similarity index 100%
rename from go/tests/lib/lib.go
rename to go/lib/lib.go
diff --git a/go/tests/rc/README.md b/go/rc/README.md
similarity index 100%
rename from go/tests/rc/README.md
rename to go/rc/README.md
diff --git a/go/tests/rc/rc.go b/go/rc/rc.go
similarity index 100%
rename from go/tests/rc/rc.go
rename to go/rc/rc.go
diff --git a/go/tests/broken/func/correct/addlinkednumbers.go b/go/tests/FIXME/func/correct/addlinkednumbers.go
similarity index 100%
rename from go/tests/broken/func/correct/addlinkednumbers.go
rename to go/tests/FIXME/func/correct/addlinkednumbers.go
diff --git a/go/tests/broken/func/correct/atoibase.go b/go/tests/FIXME/func/correct/atoibase.go
similarity index 100%
rename from go/tests/broken/func/correct/atoibase.go
rename to go/tests/FIXME/func/correct/atoibase.go
diff --git a/go/tests/broken/func/correct/base.go b/go/tests/FIXME/func/correct/base.go
similarity index 100%
rename from go/tests/broken/func/correct/base.go
rename to go/tests/FIXME/func/correct/base.go
diff --git a/go/tests/broken/func/correct/btree.go b/go/tests/FIXME/func/correct/btree.go
similarity index 100%
rename from go/tests/broken/func/correct/btree.go
rename to go/tests/FIXME/func/correct/btree.go
diff --git a/go/tests/broken/func/correct/challenge.go b/go/tests/FIXME/func/correct/challenge.go
similarity index 100%
rename from go/tests/broken/func/correct/challenge.go
rename to go/tests/FIXME/func/correct/challenge.go
diff --git a/go/tests/broken/func/correct/changeorder.go b/go/tests/FIXME/func/correct/changeorder.go
similarity index 100%
rename from go/tests/broken/func/correct/changeorder.go
rename to go/tests/FIXME/func/correct/changeorder.go
diff --git a/go/tests/broken/func/correct/convertbase.go b/go/tests/FIXME/func/correct/convertbase.go
similarity index 100%
rename from go/tests/broken/func/correct/convertbase.go
rename to go/tests/FIXME/func/correct/convertbase.go
diff --git a/go/tests/broken/func/correct/listat.go b/go/tests/FIXME/func/correct/listat.go
similarity index 100%
rename from go/tests/broken/func/correct/listat.go
rename to go/tests/FIXME/func/correct/listat.go
diff --git a/go/tests/broken/func/correct/listclear.go b/go/tests/FIXME/func/correct/listclear.go
similarity index 100%
rename from go/tests/broken/func/correct/listclear.go
rename to go/tests/FIXME/func/correct/listclear.go
diff --git a/go/tests/broken/func/correct/listfind.go b/go/tests/FIXME/func/correct/listfind.go
similarity index 100%
rename from go/tests/broken/func/correct/listfind.go
rename to go/tests/FIXME/func/correct/listfind.go
diff --git a/go/tests/broken/func/correct/listforeach.go b/go/tests/FIXME/func/correct/listforeach.go
similarity index 100%
rename from go/tests/broken/func/correct/listforeach.go
rename to go/tests/FIXME/func/correct/listforeach.go
diff --git a/go/tests/broken/func/correct/listforeachif.go b/go/tests/FIXME/func/correct/listforeachif.go
similarity index 100%
rename from go/tests/broken/func/correct/listforeachif.go
rename to go/tests/FIXME/func/correct/listforeachif.go
diff --git a/go/tests/broken/func/correct/listlast.go b/go/tests/FIXME/func/correct/listlast.go
similarity index 100%
rename from go/tests/broken/func/correct/listlast.go
rename to go/tests/FIXME/func/correct/listlast.go
diff --git a/go/tests/broken/func/correct/listmerge.go b/go/tests/FIXME/func/correct/listmerge.go
similarity index 100%
rename from go/tests/broken/func/correct/listmerge.go
rename to go/tests/FIXME/func/correct/listmerge.go
diff --git a/go/tests/broken/func/correct/listpushback.go b/go/tests/FIXME/func/correct/listpushback.go
similarity index 100%
rename from go/tests/broken/func/correct/listpushback.go
rename to go/tests/FIXME/func/correct/listpushback.go
diff --git a/go/tests/broken/func/correct/listpushfront.go b/go/tests/FIXME/func/correct/listpushfront.go
similarity index 100%
rename from go/tests/broken/func/correct/listpushfront.go
rename to go/tests/FIXME/func/correct/listpushfront.go
diff --git a/go/tests/broken/func/correct/listremoveif.go b/go/tests/FIXME/func/correct/listremoveif.go
similarity index 100%
rename from go/tests/broken/func/correct/listremoveif.go
rename to go/tests/FIXME/func/correct/listremoveif.go
diff --git a/go/tests/broken/func/correct/listreverse.go b/go/tests/FIXME/func/correct/listreverse.go
similarity index 100%
rename from go/tests/broken/func/correct/listreverse.go
rename to go/tests/FIXME/func/correct/listreverse.go
diff --git a/go/tests/broken/func/correct/listsize.go b/go/tests/FIXME/func/correct/listsize.go
similarity index 100%
rename from go/tests/broken/func/correct/listsize.go
rename to go/tests/FIXME/func/correct/listsize.go
diff --git a/go/tests/broken/func/correct/listsort.go b/go/tests/FIXME/func/correct/listsort.go
similarity index 100%
rename from go/tests/broken/func/correct/listsort.go
rename to go/tests/FIXME/func/correct/listsort.go
diff --git a/go/tests/broken/func/correct/printnbrbase.go b/go/tests/FIXME/func/correct/printnbrbase.go
similarity index 100%
rename from go/tests/broken/func/correct/printnbrbase.go
rename to go/tests/FIXME/func/correct/printnbrbase.go
diff --git a/go/tests/broken/func/correct/reverse.go b/go/tests/FIXME/func/correct/reverse.go
similarity index 100%
rename from go/tests/broken/func/correct/reverse.go
rename to go/tests/FIXME/func/correct/reverse.go
diff --git a/go/tests/broken/func/correct/sortedlistmerge.go b/go/tests/FIXME/func/correct/sortedlistmerge.go
similarity index 100%
rename from go/tests/broken/func/correct/sortedlistmerge.go
rename to go/tests/FIXME/func/correct/sortedlistmerge.go
diff --git a/go/tests/broken/func/correct/sortlistinsert.go b/go/tests/FIXME/func/correct/sortlistinsert.go
similarity index 100%
rename from go/tests/broken/func/correct/sortlistinsert.go
rename to go/tests/FIXME/func/correct/sortlistinsert.go
diff --git a/go/tests/broken/func/correct/sortll.go b/go/tests/FIXME/func/correct/sortll.go
similarity index 100%
rename from go/tests/broken/func/correct/sortll.go
rename to go/tests/FIXME/func/correct/sortll.go
diff --git a/go/tests/broken/func/createelem/main.go b/go/tests/FIXME/func/createelem/main.go
similarity index 100%
rename from go/tests/broken/func/createelem/main.go
rename to go/tests/FIXME/func/createelem/main.go
diff --git a/go/tests/broken/func/inverttree/main.go b/go/tests/FIXME/func/inverttree/main.go
similarity index 100%
rename from go/tests/broken/func/inverttree/main.go
rename to go/tests/FIXME/func/inverttree/main.go
diff --git a/go/tests/broken/func/merge/main.go b/go/tests/FIXME/func/merge/main.go
similarity index 100%
rename from go/tests/broken/func/merge/main.go
rename to go/tests/FIXME/func/merge/main.go
diff --git a/go/tests/broken/func/reverse/main.go b/go/tests/FIXME/func/reverse/main.go
similarity index 100%
rename from go/tests/broken/func/reverse/main.go
rename to go/tests/FIXME/func/reverse/main.go
diff --git a/go/tests/broken/func/sametree/main.go b/go/tests/FIXME/func/sametree/main.go
similarity index 100%
rename from go/tests/broken/func/sametree/main.go
rename to go/tests/FIXME/func/sametree/main.go
diff --git a/go/tests/broken/func/sortlist/main.go b/go/tests/FIXME/func/sortlist/main.go
similarity index 100%
rename from go/tests/broken/func/sortlist/main.go
rename to go/tests/FIXME/func/sortlist/main.go
diff --git a/go/tests/broken/func/test_addlinkednumbers.go b/go/tests/FIXME/func/test_addlinkednumbers.go
similarity index 100%
rename from go/tests/broken/func/test_addlinkednumbers.go
rename to go/tests/FIXME/func/test_addlinkednumbers.go
diff --git a/go/tests/broken/func/test_atoibase.go b/go/tests/FIXME/func/test_atoibase.go
similarity index 100%
rename from go/tests/broken/func/test_atoibase.go
rename to go/tests/FIXME/func/test_atoibase.go
diff --git a/go/tests/broken/func/test_btreeapplybylevel.go b/go/tests/FIXME/func/test_btreeapplybylevel.go
similarity index 100%
rename from go/tests/broken/func/test_btreeapplybylevel.go
rename to go/tests/FIXME/func/test_btreeapplybylevel.go
diff --git a/go/tests/broken/func/test_btreeapplyinorder.go b/go/tests/FIXME/func/test_btreeapplyinorder.go
similarity index 100%
rename from go/tests/broken/func/test_btreeapplyinorder.go
rename to go/tests/FIXME/func/test_btreeapplyinorder.go
diff --git a/go/tests/broken/func/test_btreeapplypostorder.go b/go/tests/FIXME/func/test_btreeapplypostorder.go
similarity index 100%
rename from go/tests/broken/func/test_btreeapplypostorder.go
rename to go/tests/FIXME/func/test_btreeapplypostorder.go
diff --git a/go/tests/broken/func/test_btreeapplypreorder.go b/go/tests/FIXME/func/test_btreeapplypreorder.go
similarity index 100%
rename from go/tests/broken/func/test_btreeapplypreorder.go
rename to go/tests/FIXME/func/test_btreeapplypreorder.go
diff --git a/go/tests/broken/func/test_btreedeletenode.go b/go/tests/FIXME/func/test_btreedeletenode.go
similarity index 100%
rename from go/tests/broken/func/test_btreedeletenode.go
rename to go/tests/FIXME/func/test_btreedeletenode.go
diff --git a/go/tests/broken/func/test_btreeinsertdata.go b/go/tests/FIXME/func/test_btreeinsertdata.go
similarity index 100%
rename from go/tests/broken/func/test_btreeinsertdata.go
rename to go/tests/FIXME/func/test_btreeinsertdata.go
diff --git a/go/tests/broken/func/test_btreeisbinary.go b/go/tests/FIXME/func/test_btreeisbinary.go
similarity index 100%
rename from go/tests/broken/func/test_btreeisbinary.go
rename to go/tests/FIXME/func/test_btreeisbinary.go
diff --git a/go/tests/broken/func/test_btreelevelcount.go b/go/tests/FIXME/func/test_btreelevelcount.go
similarity index 100%
rename from go/tests/broken/func/test_btreelevelcount.go
rename to go/tests/FIXME/func/test_btreelevelcount.go
diff --git a/go/tests/broken/func/test_btreemax.go b/go/tests/FIXME/func/test_btreemax.go
similarity index 100%
rename from go/tests/broken/func/test_btreemax.go
rename to go/tests/FIXME/func/test_btreemax.go
diff --git a/go/tests/broken/func/test_btreemin.go b/go/tests/FIXME/func/test_btreemin.go
similarity index 100%
rename from go/tests/broken/func/test_btreemin.go
rename to go/tests/FIXME/func/test_btreemin.go
diff --git a/go/tests/broken/func/test_btreesearchitem.go b/go/tests/FIXME/func/test_btreesearchitem.go
similarity index 100%
rename from go/tests/broken/func/test_btreesearchitem.go
rename to go/tests/FIXME/func/test_btreesearchitem.go
diff --git a/go/tests/broken/func/test_btreetransplant.go b/go/tests/FIXME/func/test_btreetransplant.go
similarity index 100%
rename from go/tests/broken/func/test_btreetransplant.go
rename to go/tests/FIXME/func/test_btreetransplant.go
diff --git a/go/tests/broken/func/test_changeorder.go b/go/tests/FIXME/func/test_changeorder.go
similarity index 100%
rename from go/tests/broken/func/test_changeorder.go
rename to go/tests/FIXME/func/test_changeorder.go
diff --git a/go/tests/broken/func/test_convertbase.go b/go/tests/FIXME/func/test_convertbase.go
similarity index 100%
rename from go/tests/broken/func/test_convertbase.go
rename to go/tests/FIXME/func/test_convertbase.go
diff --git a/go/tests/broken/func/test_listat.go b/go/tests/FIXME/func/test_listat.go
similarity index 100%
rename from go/tests/broken/func/test_listat.go
rename to go/tests/FIXME/func/test_listat.go
diff --git a/go/tests/broken/func/test_listclear.go b/go/tests/FIXME/func/test_listclear.go
similarity index 100%
rename from go/tests/broken/func/test_listclear.go
rename to go/tests/FIXME/func/test_listclear.go
diff --git a/go/tests/broken/func/test_listfind.go b/go/tests/FIXME/func/test_listfind.go
similarity index 100%
rename from go/tests/broken/func/test_listfind.go
rename to go/tests/FIXME/func/test_listfind.go
diff --git a/go/tests/broken/func/test_listforeach.go b/go/tests/FIXME/func/test_listforeach.go
similarity index 100%
rename from go/tests/broken/func/test_listforeach.go
rename to go/tests/FIXME/func/test_listforeach.go
diff --git a/go/tests/broken/func/test_listforeachif.go b/go/tests/FIXME/func/test_listforeachif.go
similarity index 100%
rename from go/tests/broken/func/test_listforeachif.go
rename to go/tests/FIXME/func/test_listforeachif.go
diff --git a/go/tests/broken/func/test_listlast.go b/go/tests/FIXME/func/test_listlast.go
similarity index 100%
rename from go/tests/broken/func/test_listlast.go
rename to go/tests/FIXME/func/test_listlast.go
diff --git a/go/tests/broken/func/test_listmerge.go b/go/tests/FIXME/func/test_listmerge.go
similarity index 100%
rename from go/tests/broken/func/test_listmerge.go
rename to go/tests/FIXME/func/test_listmerge.go
diff --git a/go/tests/broken/func/test_listpushback.go b/go/tests/FIXME/func/test_listpushback.go
similarity index 100%
rename from go/tests/broken/func/test_listpushback.go
rename to go/tests/FIXME/func/test_listpushback.go
diff --git a/go/tests/broken/func/test_listpushfront.go b/go/tests/FIXME/func/test_listpushfront.go
similarity index 100%
rename from go/tests/broken/func/test_listpushfront.go
rename to go/tests/FIXME/func/test_listpushfront.go
diff --git a/go/tests/broken/func/test_listremoveif.go b/go/tests/FIXME/func/test_listremoveif.go
similarity index 100%
rename from go/tests/broken/func/test_listremoveif.go
rename to go/tests/FIXME/func/test_listremoveif.go
diff --git a/go/tests/broken/func/test_listreverse.go b/go/tests/FIXME/func/test_listreverse.go
similarity index 100%
rename from go/tests/broken/func/test_listreverse.go
rename to go/tests/FIXME/func/test_listreverse.go
diff --git a/go/tests/broken/func/test_listsize.go b/go/tests/FIXME/func/test_listsize.go
similarity index 100%
rename from go/tests/broken/func/test_listsize.go
rename to go/tests/FIXME/func/test_listsize.go
diff --git a/go/tests/broken/func/test_listsort.go b/go/tests/FIXME/func/test_listsort.go
similarity index 100%
rename from go/tests/broken/func/test_listsort.go
rename to go/tests/FIXME/func/test_listsort.go
diff --git a/go/tests/broken/func/test_printnbrbase.go b/go/tests/FIXME/func/test_printnbrbase.go
similarity index 100%
rename from go/tests/broken/func/test_printnbrbase.go
rename to go/tests/FIXME/func/test_printnbrbase.go
diff --git a/go/tests/broken/func/test_sortedlistmerge.go b/go/tests/FIXME/func/test_sortedlistmerge.go
similarity index 100%
rename from go/tests/broken/func/test_sortedlistmerge.go
rename to go/tests/FIXME/func/test_sortedlistmerge.go
diff --git a/go/tests/broken/func/test_sortlistinsert.go b/go/tests/FIXME/func/test_sortlistinsert.go
similarity index 100%
rename from go/tests/broken/func/test_sortlistinsert.go
rename to go/tests/FIXME/func/test_sortlistinsert.go
diff --git a/go/tests/broken/func/test_sortll.go b/go/tests/FIXME/func/test_sortll.go
similarity index 100%
rename from go/tests/broken/func/test_sortll.go
rename to go/tests/FIXME/func/test_sortll.go
diff --git a/go/tests/broken/prog/correct/pilot/main.go b/go/tests/FIXME/prog/correct/pilot/main.go
similarity index 100%
rename from go/tests/broken/prog/correct/pilot/main.go
rename to go/tests/FIXME/prog/correct/pilot/main.go
diff --git a/go/tests/broken/prog/test_pilot.go b/go/tests/FIXME/prog/test_pilot.go
similarity index 100%
rename from go/tests/broken/prog/test_pilot.go
rename to go/tests/FIXME/prog/test_pilot.go
diff --git a/go/tests/func/abort/main.go b/go/tests/abort/main.go
similarity index 100%
rename from go/tests/func/abort/main.go
rename to go/tests/abort/main.go
diff --git a/go/tests/func/activebits/main.go b/go/tests/activebits/main.go
similarity index 100%
rename from go/tests/func/activebits/main.go
rename to go/tests/activebits/main.go
diff --git a/go/tests/func/addprimesum/correct/main.go b/go/tests/addprimesum/correct/main.go
similarity index 100%
rename from go/tests/func/addprimesum/correct/main.go
rename to go/tests/addprimesum/correct/main.go
diff --git a/go/tests/func/addprimesum/main.go b/go/tests/addprimesum/main.go
similarity index 100%
rename from go/tests/func/addprimesum/main.go
rename to go/tests/addprimesum/main.go
diff --git a/go/tests/func/advancedsortwordarr/main.go b/go/tests/advancedsortwordarr/main.go
similarity index 100%
rename from go/tests/func/advancedsortwordarr/main.go
rename to go/tests/advancedsortwordarr/main.go
diff --git a/go/tests/func/alphacount/main.go b/go/tests/alphacount/main.go
similarity index 100%
rename from go/tests/func/alphacount/main.go
rename to go/tests/alphacount/main.go
diff --git a/go/tests/func/alphamirror/correct/main.go b/go/tests/alphamirror/correct/main.go
similarity index 100%
rename from go/tests/func/alphamirror/correct/main.go
rename to go/tests/alphamirror/correct/main.go
diff --git a/go/tests/func/alphamirror/main.go b/go/tests/alphamirror/main.go
similarity index 100%
rename from go/tests/func/alphamirror/main.go
rename to go/tests/alphamirror/main.go
diff --git a/go/tests/func/any/main.go b/go/tests/any/main.go
similarity index 100%
rename from go/tests/func/any/main.go
rename to go/tests/any/main.go
diff --git a/go/tests/func/appendrange/main.go b/go/tests/appendrange/main.go
similarity index 100%
rename from go/tests/func/appendrange/main.go
rename to go/tests/appendrange/main.go
diff --git a/go/tests/func/atoi/main.go b/go/tests/atoi/main.go
similarity index 100%
rename from go/tests/func/atoi/main.go
rename to go/tests/atoi/main.go
diff --git a/go/tests/func/balancedstring/correct/main.go b/go/tests/balancedstring/correct/main.go
similarity index 100%
rename from go/tests/func/balancedstring/correct/main.go
rename to go/tests/balancedstring/correct/main.go
diff --git a/go/tests/func/balancedstring/main.go b/go/tests/balancedstring/main.go
similarity index 100%
rename from go/tests/func/balancedstring/main.go
rename to go/tests/balancedstring/main.go
diff --git a/go/tests/func/basicatoi/main.go b/go/tests/basicatoi/main.go
similarity index 100%
rename from go/tests/func/basicatoi/main.go
rename to go/tests/basicatoi/main.go
diff --git a/go/tests/func/basicatoi2/main.go b/go/tests/basicatoi2/main.go
similarity index 100%
rename from go/tests/func/basicatoi2/main.go
rename to go/tests/basicatoi2/main.go
diff --git a/go/tests/func/basicjoin/main.go b/go/tests/basicjoin/main.go
similarity index 100%
rename from go/tests/func/basicjoin/main.go
rename to go/tests/basicjoin/main.go
diff --git a/go/tests/func/boolean/correct/main.go b/go/tests/boolean/correct/main.go
similarity index 100%
rename from go/tests/func/boolean/correct/main.go
rename to go/tests/boolean/correct/main.go
diff --git a/go/tests/func/boolean/main.go b/go/tests/boolean/main.go
similarity index 100%
rename from go/tests/func/boolean/main.go
rename to go/tests/boolean/main.go
diff --git a/go/tests/func/brackets/correct/main.go b/go/tests/brackets/correct/main.go
similarity index 100%
rename from go/tests/func/brackets/correct/main.go
rename to go/tests/brackets/correct/main.go
diff --git a/go/tests/func/brackets/main.go b/go/tests/brackets/main.go
similarity index 100%
rename from go/tests/func/brackets/main.go
rename to go/tests/brackets/main.go
diff --git a/go/tests/func/brainfuck/correct/main.go b/go/tests/brainfuck/correct/main.go
similarity index 100%
rename from go/tests/func/brainfuck/correct/main.go
rename to go/tests/brainfuck/correct/main.go
diff --git a/go/tests/func/brainfuck/main.go b/go/tests/brainfuck/main.go
similarity index 100%
rename from go/tests/func/brainfuck/main.go
rename to go/tests/brainfuck/main.go
diff --git a/go/tests/func/capitalize/main.go b/go/tests/capitalize/main.go
similarity index 100%
rename from go/tests/func/capitalize/main.go
rename to go/tests/capitalize/main.go
diff --git a/go/tests/func/cat/correct/main.go b/go/tests/cat/correct/main.go
similarity index 100%
rename from go/tests/func/cat/correct/main.go
rename to go/tests/cat/correct/main.go
diff --git a/go/tests/func/cat/correct/quest8.txt b/go/tests/cat/correct/quest8.txt
similarity index 100%
rename from go/tests/func/cat/correct/quest8.txt
rename to go/tests/cat/correct/quest8.txt
diff --git a/go/tests/func/cat/correct/quest8T.txt b/go/tests/cat/correct/quest8T.txt
similarity index 100%
rename from go/tests/func/cat/correct/quest8T.txt
rename to go/tests/cat/correct/quest8T.txt
diff --git a/go/tests/func/cat/main.go b/go/tests/cat/main.go
similarity index 100%
rename from go/tests/func/cat/main.go
rename to go/tests/cat/main.go
diff --git a/go/tests/func/chunk/main.go b/go/tests/chunk/main.go
similarity index 100%
rename from go/tests/func/chunk/main.go
rename to go/tests/chunk/main.go
diff --git a/go/tests/func/cleanstr/correct/main.go b/go/tests/cleanstr/correct/main.go
similarity index 100%
rename from go/tests/func/cleanstr/correct/main.go
rename to go/tests/cleanstr/correct/main.go
diff --git a/go/tests/func/cleanstr/main.go b/go/tests/cleanstr/main.go
similarity index 100%
rename from go/tests/func/cleanstr/main.go
rename to go/tests/cleanstr/main.go
diff --git a/go/tests/func/collatzcountdown/main.go b/go/tests/collatzcountdown/main.go
similarity index 100%
rename from go/tests/func/collatzcountdown/main.go
rename to go/tests/collatzcountdown/main.go
diff --git a/go/tests/func/comcheck/correct/main.go b/go/tests/comcheck/correct/main.go
similarity index 100%
rename from go/tests/func/comcheck/correct/main.go
rename to go/tests/comcheck/correct/main.go
diff --git a/go/tests/func/comcheck/main.go b/go/tests/comcheck/main.go
similarity index 100%
rename from go/tests/func/comcheck/main.go
rename to go/tests/comcheck/main.go
diff --git a/go/tests/func/common/is.go b/go/tests/common/is.go
similarity index 100%
rename from go/tests/func/common/is.go
rename to go/tests/common/is.go
diff --git a/go/tests/func/compact/main.go b/go/tests/compact/main.go
similarity index 100%
rename from go/tests/func/compact/main.go
rename to go/tests/compact/main.go
diff --git a/go/tests/func/compare/main.go b/go/tests/compare/main.go
similarity index 100%
rename from go/tests/func/compare/main.go
rename to go/tests/compare/main.go
diff --git a/go/tests/func/concat/main.go b/go/tests/concat/main.go
similarity index 100%
rename from go/tests/func/concat/main.go
rename to go/tests/concat/main.go
diff --git a/go/tests/func/concatparams/main.go b/go/tests/concatparams/main.go
similarity index 100%
rename from go/tests/func/concatparams/main.go
rename to go/tests/concatparams/main.go
diff --git a/go/tests/func/costumeprofit/correct/main.go b/go/tests/costumeprofit/correct/main.go
similarity index 100%
rename from go/tests/func/costumeprofit/correct/main.go
rename to go/tests/costumeprofit/correct/main.go
diff --git a/go/tests/func/costumeprofit/main.go b/go/tests/costumeprofit/main.go
similarity index 100%
rename from go/tests/func/costumeprofit/main.go
rename to go/tests/costumeprofit/main.go
diff --git a/go/tests/func/countdown/correct/main.go b/go/tests/countdown/correct/main.go
similarity index 100%
rename from go/tests/func/countdown/correct/main.go
rename to go/tests/countdown/correct/main.go
diff --git a/go/tests/func/countdown/main.go b/go/tests/countdown/main.go
similarity index 100%
rename from go/tests/func/countdown/main.go
rename to go/tests/countdown/main.go
diff --git a/go/tests/func/countif/main.go b/go/tests/countif/main.go
similarity index 100%
rename from go/tests/func/countif/main.go
rename to go/tests/countif/main.go
diff --git a/go/tests/func/displaya/correct/main.go b/go/tests/displaya/correct/main.go
similarity index 100%
rename from go/tests/func/displaya/correct/main.go
rename to go/tests/displaya/correct/main.go
diff --git a/go/tests/func/displaya/main.go b/go/tests/displaya/main.go
similarity index 100%
rename from go/tests/func/displaya/main.go
rename to go/tests/displaya/main.go
diff --git a/go/tests/func/displayalpham/correct/main.go b/go/tests/displayalpham/correct/main.go
similarity index 100%
rename from go/tests/func/displayalpham/correct/main.go
rename to go/tests/displayalpham/correct/main.go
diff --git a/go/tests/func/displayalpham/main.go b/go/tests/displayalpham/main.go
similarity index 100%
rename from go/tests/func/displayalpham/main.go
rename to go/tests/displayalpham/main.go
diff --git a/go/tests/func/displayalrevm/correct/main.go b/go/tests/displayalrevm/correct/main.go
similarity index 100%
rename from go/tests/func/displayalrevm/correct/main.go
rename to go/tests/displayalrevm/correct/main.go
diff --git a/go/tests/func/displayalrevm/main.go b/go/tests/displayalrevm/main.go
similarity index 100%
rename from go/tests/func/displayalrevm/main.go
rename to go/tests/displayalrevm/main.go
diff --git a/go/tests/func/displayfile/correct/main.go b/go/tests/displayfile/correct/main.go
similarity index 100%
rename from go/tests/func/displayfile/correct/main.go
rename to go/tests/displayfile/correct/main.go
diff --git a/go/tests/func/displayfile/correct/quest8.txt b/go/tests/displayfile/correct/quest8.txt
similarity index 100%
rename from go/tests/func/displayfile/correct/quest8.txt
rename to go/tests/displayfile/correct/quest8.txt
diff --git a/go/tests/func/displayfile/main.go b/go/tests/displayfile/main.go
similarity index 100%
rename from go/tests/func/displayfile/main.go
rename to go/tests/displayfile/main.go
diff --git a/go/tests/func/displayfirstparam/correct/main.go b/go/tests/displayfirstparam/correct/main.go
similarity index 100%
rename from go/tests/func/displayfirstparam/correct/main.go
rename to go/tests/displayfirstparam/correct/main.go
diff --git a/go/tests/func/displayfirstparam/main.go b/go/tests/displayfirstparam/main.go
similarity index 100%
rename from go/tests/func/displayfirstparam/main.go
rename to go/tests/displayfirstparam/main.go
diff --git a/go/tests/func/displaylastparam/correct/main.go b/go/tests/displaylastparam/correct/main.go
similarity index 100%
rename from go/tests/func/displaylastparam/correct/main.go
rename to go/tests/displaylastparam/correct/main.go
diff --git a/go/tests/func/displaylastparam/main.go b/go/tests/displaylastparam/main.go
similarity index 100%
rename from go/tests/func/displaylastparam/main.go
rename to go/tests/displaylastparam/main.go
diff --git a/go/tests/func/displayz/correct/main.go b/go/tests/displayz/correct/main.go
similarity index 100%
rename from go/tests/func/displayz/correct/main.go
rename to go/tests/displayz/correct/main.go
diff --git a/go/tests/func/displayz/main.go b/go/tests/displayz/main.go
similarity index 100%
rename from go/tests/func/displayz/main.go
rename to go/tests/displayz/main.go
diff --git a/go/tests/func/divmod/main.go b/go/tests/divmod/main.go
similarity index 100%
rename from go/tests/func/divmod/main.go
rename to go/tests/divmod/main.go
diff --git a/go/tests/func/doop/correct/main.go b/go/tests/doop/correct/main.go
similarity index 100%
rename from go/tests/func/doop/correct/main.go
rename to go/tests/doop/correct/main.go
diff --git a/go/tests/func/doop/main.go b/go/tests/doop/main.go
similarity index 100%
rename from go/tests/func/doop/main.go
rename to go/tests/doop/main.go
diff --git a/go/tests/func/doppelganger/main.go b/go/tests/doppelganger/main.go
similarity index 100%
rename from go/tests/func/doppelganger/main.go
rename to go/tests/doppelganger/main.go
diff --git a/go/tests/func/eightqueens/main.go b/go/tests/eightqueens/main.go
similarity index 100%
rename from go/tests/func/eightqueens/main.go
rename to go/tests/eightqueens/main.go
diff --git a/go/tests/func/enigma/main.go b/go/tests/enigma/main.go
similarity index 100%
rename from go/tests/func/enigma/main.go
rename to go/tests/enigma/main.go
diff --git a/go/tests/func/expandstr/correct/main.go b/go/tests/expandstr/correct/main.go
similarity index 100%
rename from go/tests/func/expandstr/correct/main.go
rename to go/tests/expandstr/correct/main.go
diff --git a/go/tests/func/expandstr/main.go b/go/tests/expandstr/main.go
similarity index 100%
rename from go/tests/func/expandstr/main.go
rename to go/tests/expandstr/main.go
diff --git a/go/tests/func/fib/main.go b/go/tests/fib/main.go
similarity index 100%
rename from go/tests/func/fib/main.go
rename to go/tests/fib/main.go
diff --git a/go/tests/func/fibonacci/main.go b/go/tests/fibonacci/main.go
similarity index 100%
rename from go/tests/func/fibonacci/main.go
rename to go/tests/fibonacci/main.go
diff --git a/go/tests/func/findnextprime/main.go b/go/tests/findnextprime/main.go
similarity index 100%
rename from go/tests/func/findnextprime/main.go
rename to go/tests/findnextprime/main.go
diff --git a/go/tests/func/findprevprime/main.go b/go/tests/findprevprime/main.go
similarity index 100%
rename from go/tests/func/findprevprime/main.go
rename to go/tests/findprevprime/main.go
diff --git a/go/tests/func/firstrune/main.go b/go/tests/firstrune/main.go
similarity index 100%
rename from go/tests/func/firstrune/main.go
rename to go/tests/firstrune/main.go
diff --git a/go/tests/func/firstword/correct/main.go b/go/tests/firstword/correct/main.go
similarity index 100%
rename from go/tests/func/firstword/correct/main.go
rename to go/tests/firstword/correct/main.go
diff --git a/go/tests/func/firstword/main.go b/go/tests/firstword/main.go
similarity index 100%
rename from go/tests/func/firstword/main.go
rename to go/tests/firstword/main.go
diff --git a/go/tests/func/fixthemain/correct/main.go b/go/tests/fixthemain/correct/main.go
similarity index 100%
rename from go/tests/func/fixthemain/correct/main.go
rename to go/tests/fixthemain/correct/main.go
diff --git a/go/tests/func/fixthemain/main.go b/go/tests/fixthemain/main.go
similarity index 100%
rename from go/tests/func/fixthemain/main.go
rename to go/tests/fixthemain/main.go
diff --git a/go/tests/func/flags/correct/main.go b/go/tests/flags/correct/main.go
similarity index 100%
rename from go/tests/func/flags/correct/main.go
rename to go/tests/flags/correct/main.go
diff --git a/go/tests/func/flags/main.go b/go/tests/flags/main.go
similarity index 100%
rename from go/tests/func/flags/main.go
rename to go/tests/flags/main.go
diff --git a/go/tests/func/foldint/main.go b/go/tests/foldint/main.go
similarity index 100%
rename from go/tests/func/foldint/main.go
rename to go/tests/foldint/main.go
diff --git a/go/tests/func/foreach/main.go b/go/tests/foreach/main.go
similarity index 100%
rename from go/tests/func/foreach/main.go
rename to go/tests/foreach/main.go
diff --git a/go/tests/func/fprime/correct/main.go b/go/tests/fprime/correct/main.go
similarity index 100%
rename from go/tests/func/fprime/correct/main.go
rename to go/tests/fprime/correct/main.go
diff --git a/go/tests/func/fprime/main.go b/go/tests/fprime/main.go
similarity index 100%
rename from go/tests/func/fprime/main.go
rename to go/tests/fprime/main.go
diff --git a/go/tests/func/game23/main.go b/go/tests/game23/main.go
similarity index 100%
rename from go/tests/func/game23/main.go
rename to go/tests/game23/main.go
diff --git a/go/tests/func/gcd/correct/main.go b/go/tests/gcd/correct/main.go
similarity index 100%
rename from go/tests/func/gcd/correct/main.go
rename to go/tests/gcd/correct/main.go
diff --git a/go/tests/func/gcd/main.go b/go/tests/gcd/main.go
similarity index 100%
rename from go/tests/func/gcd/main.go
rename to go/tests/gcd/main.go
diff --git a/go/tests/func/grouping/correct/main.go b/go/tests/grouping/correct/main.go
similarity index 100%
rename from go/tests/func/grouping/correct/main.go
rename to go/tests/grouping/correct/main.go
diff --git a/go/tests/func/grouping/main.go b/go/tests/grouping/main.go
similarity index 100%
rename from go/tests/func/grouping/main.go
rename to go/tests/grouping/main.go
diff --git a/go/tests/func/halfcontest/main.go b/go/tests/halfcontest/main.go
similarity index 100%
rename from go/tests/func/halfcontest/main.go
rename to go/tests/halfcontest/main.go
diff --git a/go/tests/func/hello/correct/main.go b/go/tests/hello/correct/main.go
similarity index 100%
rename from go/tests/func/hello/correct/main.go
rename to go/tests/hello/correct/main.go
diff --git a/go/tests/func/hello/main.go b/go/tests/hello/main.go
similarity index 100%
rename from go/tests/func/hello/main.go
rename to go/tests/hello/main.go
diff --git a/go/tests/func/hiddenp/correct/main.go b/go/tests/hiddenp/correct/main.go
similarity index 100%
rename from go/tests/func/hiddenp/correct/main.go
rename to go/tests/hiddenp/correct/main.go
diff --git a/go/tests/func/hiddenp/main.go b/go/tests/hiddenp/main.go
similarity index 100%
rename from go/tests/func/hiddenp/main.go
rename to go/tests/hiddenp/main.go
diff --git a/go/tests/func/index/main.go b/go/tests/index/main.go
similarity index 100%
rename from go/tests/func/index/main.go
rename to go/tests/index/main.go
diff --git a/go/tests/func/inter/correct/main.go b/go/tests/inter/correct/main.go
similarity index 100%
rename from go/tests/func/inter/correct/main.go
rename to go/tests/inter/correct/main.go
diff --git a/go/tests/func/inter/main.go b/go/tests/inter/main.go
similarity index 100%
rename from go/tests/func/inter/main.go
rename to go/tests/inter/main.go
diff --git a/go/tests/func/interestingnumber/main.go b/go/tests/interestingnumber/main.go
similarity index 100%
rename from go/tests/func/interestingnumber/main.go
rename to go/tests/interestingnumber/main.go
diff --git a/go/tests/func/isalpha/main.go b/go/tests/isalpha/main.go
similarity index 100%
rename from go/tests/func/isalpha/main.go
rename to go/tests/isalpha/main.go
diff --git a/go/tests/func/isanagram/main.go b/go/tests/isanagram/main.go
similarity index 100%
rename from go/tests/func/isanagram/main.go
rename to go/tests/isanagram/main.go
diff --git a/go/tests/func/islower/main.go b/go/tests/islower/main.go
similarity index 100%
rename from go/tests/func/islower/main.go
rename to go/tests/islower/main.go
diff --git a/go/tests/func/isnegative/main.go b/go/tests/isnegative/main.go
similarity index 100%
rename from go/tests/func/isnegative/main.go
rename to go/tests/isnegative/main.go
diff --git a/go/tests/func/isnumeric/main.go b/go/tests/isnumeric/main.go
similarity index 100%
rename from go/tests/func/isnumeric/main.go
rename to go/tests/isnumeric/main.go
diff --git a/go/tests/func/ispowerof2/correct/main.go b/go/tests/ispowerof2/correct/main.go
similarity index 100%
rename from go/tests/func/ispowerof2/correct/main.go
rename to go/tests/ispowerof2/correct/main.go
diff --git a/go/tests/func/ispowerof2/main.go b/go/tests/ispowerof2/main.go
similarity index 100%
rename from go/tests/func/ispowerof2/main.go
rename to go/tests/ispowerof2/main.go
diff --git a/go/tests/func/isprime/main.go b/go/tests/isprime/main.go
similarity index 100%
rename from go/tests/func/isprime/main.go
rename to go/tests/isprime/main.go
diff --git a/go/tests/func/isprintable/main.go b/go/tests/isprintable/main.go
similarity index 100%
rename from go/tests/func/isprintable/main.go
rename to go/tests/isprintable/main.go
diff --git a/go/tests/func/issorted/main.go b/go/tests/issorted/main.go
similarity index 100%
rename from go/tests/func/issorted/main.go
rename to go/tests/issorted/main.go
diff --git a/go/tests/func/isupper/main.go b/go/tests/isupper/main.go
similarity index 100%
rename from go/tests/func/isupper/main.go
rename to go/tests/isupper/main.go
diff --git a/go/tests/func/iterativefactorial/main.go b/go/tests/iterativefactorial/main.go
similarity index 100%
rename from go/tests/func/iterativefactorial/main.go
rename to go/tests/iterativefactorial/main.go
diff --git a/go/tests/func/iterativepower/main.go b/go/tests/iterativepower/main.go
similarity index 100%
rename from go/tests/func/iterativepower/main.go
rename to go/tests/iterativepower/main.go
diff --git a/go/tests/func/itoa/main.go b/go/tests/itoa/main.go
similarity index 100%
rename from go/tests/func/itoa/main.go
rename to go/tests/itoa/main.go
diff --git a/go/tests/func/itoabase/main.go b/go/tests/itoabase/main.go
similarity index 100%
rename from go/tests/func/itoabase/main.go
rename to go/tests/itoabase/main.go
diff --git a/go/tests/func/join/main.go b/go/tests/join/main.go
similarity index 100%
rename from go/tests/func/join/main.go
rename to go/tests/join/main.go
diff --git a/go/tests/func/lastrune/main.go b/go/tests/lastrune/main.go
similarity index 100%
rename from go/tests/func/lastrune/main.go
rename to go/tests/lastrune/main.go
diff --git a/go/tests/func/lastword/correct/main.go b/go/tests/lastword/correct/main.go
similarity index 100%
rename from go/tests/func/lastword/correct/main.go
rename to go/tests/lastword/correct/main.go
diff --git a/go/tests/func/lastword/main.go b/go/tests/lastword/main.go
similarity index 100%
rename from go/tests/func/lastword/main.go
rename to go/tests/lastword/main.go
diff --git a/go/tests/func/lcm/main.go b/go/tests/lcm/main.go
similarity index 100%
rename from go/tests/func/lcm/main.go
rename to go/tests/lcm/main.go
diff --git a/go/tests/func/makerange/main.go b/go/tests/makerange/main.go
similarity index 100%
rename from go/tests/func/makerange/main.go
rename to go/tests/makerange/main.go
diff --git a/go/tests/func/map/main.go b/go/tests/map/main.go
similarity index 100%
rename from go/tests/func/map/main.go
rename to go/tests/map/main.go
diff --git a/go/tests/func/max/main.go b/go/tests/max/main.go
similarity index 100%
rename from go/tests/func/max/main.go
rename to go/tests/max/main.go
diff --git a/go/tests/func/nauuo/main.go b/go/tests/nauuo/main.go
similarity index 100%
rename from go/tests/func/nauuo/main.go
rename to go/tests/nauuo/main.go
diff --git a/go/tests/func/nbrconvertalpha/correct/main.go b/go/tests/nbrconvertalpha/correct/main.go
similarity index 100%
rename from go/tests/func/nbrconvertalpha/correct/main.go
rename to go/tests/nbrconvertalpha/correct/main.go
diff --git a/go/tests/func/nbrconvertalpha/main.go b/go/tests/nbrconvertalpha/main.go
similarity index 100%
rename from go/tests/func/nbrconvertalpha/main.go
rename to go/tests/nbrconvertalpha/main.go
diff --git a/go/tests/func/nenokku/correct/main.go b/go/tests/nenokku/correct/main.go
similarity index 100%
rename from go/tests/func/nenokku/correct/main.go
rename to go/tests/nenokku/correct/main.go
diff --git a/go/tests/func/nenokku/main.go b/go/tests/nenokku/main.go
similarity index 100%
rename from go/tests/func/nenokku/main.go
rename to go/tests/nenokku/main.go
diff --git a/go/tests/func/nrune/main.go b/go/tests/nrune/main.go
similarity index 100%
rename from go/tests/func/nrune/main.go
rename to go/tests/nrune/main.go
diff --git a/go/tests/func/onlya/correct/main.go b/go/tests/onlya/correct/main.go
similarity index 100%
rename from go/tests/func/onlya/correct/main.go
rename to go/tests/onlya/correct/main.go
diff --git a/go/tests/func/onlya/main.go b/go/tests/onlya/main.go
similarity index 100%
rename from go/tests/func/onlya/main.go
rename to go/tests/onlya/main.go
diff --git a/go/tests/func/onlyz/correct/main.go b/go/tests/onlyz/correct/main.go
similarity index 100%
rename from go/tests/func/onlyz/correct/main.go
rename to go/tests/onlyz/correct/main.go
diff --git a/go/tests/func/onlyz/main.go b/go/tests/onlyz/main.go
similarity index 100%
rename from go/tests/func/onlyz/main.go
rename to go/tests/onlyz/main.go
diff --git a/go/tests/func/options/correct/main.go b/go/tests/options/correct/main.go
similarity index 100%
rename from go/tests/func/options/correct/main.go
rename to go/tests/options/correct/main.go
diff --git a/go/tests/func/options/main.go b/go/tests/options/main.go
similarity index 100%
rename from go/tests/func/options/main.go
rename to go/tests/options/main.go
diff --git a/go/tests/func/paramcount/correct/main.go b/go/tests/paramcount/correct/main.go
similarity index 100%
rename from go/tests/func/paramcount/correct/main.go
rename to go/tests/paramcount/correct/main.go
diff --git a/go/tests/func/paramcount/main.go b/go/tests/paramcount/main.go
similarity index 100%
rename from go/tests/func/paramcount/main.go
rename to go/tests/paramcount/main.go
diff --git a/go/tests/func/piglatin/correct/main.go b/go/tests/piglatin/correct/main.go
similarity index 100%
rename from go/tests/func/piglatin/correct/main.go
rename to go/tests/piglatin/correct/main.go
diff --git a/go/tests/func/piglatin/main.go b/go/tests/piglatin/main.go
similarity index 100%
rename from go/tests/func/piglatin/main.go
rename to go/tests/piglatin/main.go
diff --git a/go/tests/func/point/correct/main.go b/go/tests/point/correct/main.go
similarity index 100%
rename from go/tests/func/point/correct/main.go
rename to go/tests/point/correct/main.go
diff --git a/go/tests/func/point/main.go b/go/tests/point/main.go
similarity index 100%
rename from go/tests/func/point/main.go
rename to go/tests/point/main.go
diff --git a/go/tests/func/pointone/main.go b/go/tests/pointone/main.go
similarity index 100%
rename from go/tests/func/pointone/main.go
rename to go/tests/pointone/main.go
diff --git a/go/tests/func/printalphabet/correct/main.go b/go/tests/printalphabet/correct/main.go
similarity index 100%
rename from go/tests/func/printalphabet/correct/main.go
rename to go/tests/printalphabet/correct/main.go
diff --git a/go/tests/func/printalphabet/main.go b/go/tests/printalphabet/main.go
similarity index 100%
rename from go/tests/func/printalphabet/main.go
rename to go/tests/printalphabet/main.go
diff --git a/go/tests/func/printbits/correct/main.go b/go/tests/printbits/correct/main.go
similarity index 100%
rename from go/tests/func/printbits/correct/main.go
rename to go/tests/printbits/correct/main.go
diff --git a/go/tests/func/printbits/main.go b/go/tests/printbits/main.go
similarity index 100%
rename from go/tests/func/printbits/main.go
rename to go/tests/printbits/main.go
diff --git a/go/tests/func/printchessboard/correct/main.go b/go/tests/printchessboard/correct/main.go
similarity index 100%
rename from go/tests/func/printchessboard/correct/main.go
rename to go/tests/printchessboard/correct/main.go
diff --git a/go/tests/func/printchessboard/main.go b/go/tests/printchessboard/main.go
similarity index 100%
rename from go/tests/func/printchessboard/main.go
rename to go/tests/printchessboard/main.go
diff --git a/go/tests/func/printcomb/main.go b/go/tests/printcomb/main.go
similarity index 100%
rename from go/tests/func/printcomb/main.go
rename to go/tests/printcomb/main.go
diff --git a/go/tests/func/printcomb2/main.go b/go/tests/printcomb2/main.go
similarity index 100%
rename from go/tests/func/printcomb2/main.go
rename to go/tests/printcomb2/main.go
diff --git a/go/tests/func/printcombn/main.go b/go/tests/printcombn/main.go
similarity index 100%
rename from go/tests/func/printcombn/main.go
rename to go/tests/printcombn/main.go
diff --git a/go/tests/func/printdigits/correct/main.go b/go/tests/printdigits/correct/main.go
similarity index 100%
rename from go/tests/func/printdigits/correct/main.go
rename to go/tests/printdigits/correct/main.go
diff --git a/go/tests/func/printdigits/main.go b/go/tests/printdigits/main.go
similarity index 100%
rename from go/tests/func/printdigits/main.go
rename to go/tests/printdigits/main.go
diff --git a/go/tests/func/printhex/correct/main.go b/go/tests/printhex/correct/main.go
similarity index 100%
rename from go/tests/func/printhex/correct/main.go
rename to go/tests/printhex/correct/main.go
diff --git a/go/tests/func/printhex/main.go b/go/tests/printhex/main.go
similarity index 100%
rename from go/tests/func/printhex/main.go
rename to go/tests/printhex/main.go
diff --git a/go/tests/func/printmemory/main.go b/go/tests/printmemory/main.go
similarity index 100%
rename from go/tests/func/printmemory/main.go
rename to go/tests/printmemory/main.go
diff --git a/go/tests/func/printnbr/main.go b/go/tests/printnbr/main.go
similarity index 100%
rename from go/tests/func/printnbr/main.go
rename to go/tests/printnbr/main.go
diff --git a/go/tests/func/printnbrinorder/main.go b/go/tests/printnbrinorder/main.go
similarity index 100%
rename from go/tests/func/printnbrinorder/main.go
rename to go/tests/printnbrinorder/main.go
diff --git a/go/tests/func/printparams/correct/main.go b/go/tests/printparams/correct/main.go
similarity index 100%
rename from go/tests/func/printparams/correct/main.go
rename to go/tests/printparams/correct/main.go
diff --git a/go/tests/func/printparams/main.go b/go/tests/printparams/main.go
similarity index 100%
rename from go/tests/func/printparams/main.go
rename to go/tests/printparams/main.go
diff --git a/go/tests/func/printprogramname/correct/main.go b/go/tests/printprogramname/correct/main.go
similarity index 100%
rename from go/tests/func/printprogramname/correct/main.go
rename to go/tests/printprogramname/correct/main.go
diff --git a/go/tests/func/printprogramname/main.go b/go/tests/printprogramname/main.go
similarity index 100%
rename from go/tests/func/printprogramname/main.go
rename to go/tests/printprogramname/main.go
diff --git a/go/tests/func/printrevcomb/correct/main.go b/go/tests/printrevcomb/correct/main.go
similarity index 100%
rename from go/tests/func/printrevcomb/correct/main.go
rename to go/tests/printrevcomb/correct/main.go
diff --git a/go/tests/func/printrevcomb/main.go b/go/tests/printrevcomb/main.go
similarity index 100%
rename from go/tests/func/printrevcomb/main.go
rename to go/tests/printrevcomb/main.go
diff --git a/go/tests/func/printreversealphabet/correct/main.go b/go/tests/printreversealphabet/correct/main.go
similarity index 100%
rename from go/tests/func/printreversealphabet/correct/main.go
rename to go/tests/printreversealphabet/correct/main.go
diff --git a/go/tests/func/printreversealphabet/main.go b/go/tests/printreversealphabet/main.go
similarity index 100%
rename from go/tests/func/printreversealphabet/main.go
rename to go/tests/printreversealphabet/main.go
diff --git a/go/tests/func/printstr/main.go b/go/tests/printstr/main.go
similarity index 100%
rename from go/tests/func/printstr/main.go
rename to go/tests/printstr/main.go
diff --git a/go/tests/func/printwordstables/main.go b/go/tests/printwordstables/main.go
similarity index 100%
rename from go/tests/func/printwordstables/main.go
rename to go/tests/printwordstables/main.go
diff --git a/go/tests/func/priorprime/main.go b/go/tests/priorprime/main.go
similarity index 100%
rename from go/tests/func/priorprime/main.go
rename to go/tests/priorprime/main.go
diff --git a/go/tests/func/raid1a/main.go b/go/tests/raid1a/main.go
similarity index 100%
rename from go/tests/func/raid1a/main.go
rename to go/tests/raid1a/main.go
diff --git a/go/tests/func/raid1b/main.go b/go/tests/raid1b/main.go
similarity index 100%
rename from go/tests/func/raid1b/main.go
rename to go/tests/raid1b/main.go
diff --git a/go/tests/func/raid1c/main.go b/go/tests/raid1c/main.go
similarity index 100%
rename from go/tests/func/raid1c/main.go
rename to go/tests/raid1c/main.go
diff --git a/go/tests/func/raid1d/main.go b/go/tests/raid1d/main.go
similarity index 100%
rename from go/tests/func/raid1d/main.go
rename to go/tests/raid1d/main.go
diff --git a/go/tests/func/raid1e/main.go b/go/tests/raid1e/main.go
similarity index 100%
rename from go/tests/func/raid1e/main.go
rename to go/tests/raid1e/main.go
diff --git a/go/tests/func/raid2/correct/main.go b/go/tests/raid2/correct/main.go
similarity index 100%
rename from go/tests/func/raid2/correct/main.go
rename to go/tests/raid2/correct/main.go
diff --git a/go/tests/func/raid2/main.go b/go/tests/raid2/main.go
similarity index 100%
rename from go/tests/func/raid2/main.go
rename to go/tests/raid2/main.go
diff --git a/go/tests/func/raid3/correct/main.go b/go/tests/raid3/correct/main.go
similarity index 100%
rename from go/tests/func/raid3/correct/main.go
rename to go/tests/raid3/correct/main.go
diff --git a/go/tests/func/raid3/correct/raid1aprog/raid1a.go b/go/tests/raid3/correct/raid1aprog/raid1a.go
similarity index 100%
rename from go/tests/func/raid3/correct/raid1aprog/raid1a.go
rename to go/tests/raid3/correct/raid1aprog/raid1a.go
diff --git a/go/tests/func/raid3/correct/raid1bprog/raid1b.go b/go/tests/raid3/correct/raid1bprog/raid1b.go
similarity index 100%
rename from go/tests/func/raid3/correct/raid1bprog/raid1b.go
rename to go/tests/raid3/correct/raid1bprog/raid1b.go
diff --git a/go/tests/func/raid3/correct/raid1cprog/raid1c.go b/go/tests/raid3/correct/raid1cprog/raid1c.go
similarity index 100%
rename from go/tests/func/raid3/correct/raid1cprog/raid1c.go
rename to go/tests/raid3/correct/raid1cprog/raid1c.go
diff --git a/go/tests/func/raid3/correct/raid1dprog/raid1d.go b/go/tests/raid3/correct/raid1dprog/raid1d.go
similarity index 100%
rename from go/tests/func/raid3/correct/raid1dprog/raid1d.go
rename to go/tests/raid3/correct/raid1dprog/raid1d.go
diff --git a/go/tests/func/raid3/correct/raid1eprog/raid1e.go b/go/tests/raid3/correct/raid1eprog/raid1e.go
similarity index 100%
rename from go/tests/func/raid3/correct/raid1eprog/raid1e.go
rename to go/tests/raid3/correct/raid1eprog/raid1e.go
diff --git a/go/tests/func/raid3/main.go b/go/tests/raid3/main.go
similarity index 100%
rename from go/tests/func/raid3/main.go
rename to go/tests/raid3/main.go
diff --git a/go/tests/func/range/correct/main.go b/go/tests/range/correct/main.go
similarity index 100%
rename from go/tests/func/range/correct/main.go
rename to go/tests/range/correct/main.go
diff --git a/go/tests/func/range/main.go b/go/tests/range/main.go
similarity index 100%
rename from go/tests/func/range/main.go
rename to go/tests/range/main.go
diff --git a/go/tests/func/reachablenumber/main.go b/go/tests/reachablenumber/main.go
similarity index 100%
rename from go/tests/func/reachablenumber/main.go
rename to go/tests/reachablenumber/main.go
diff --git a/go/tests/func/rectangle/correct/main.go b/go/tests/rectangle/correct/main.go
similarity index 100%
rename from go/tests/func/rectangle/correct/main.go
rename to go/tests/rectangle/correct/main.go
diff --git a/go/tests/func/rectangle/main.go b/go/tests/rectangle/main.go
similarity index 100%
rename from go/tests/func/rectangle/main.go
rename to go/tests/rectangle/main.go
diff --git a/go/tests/func/recursivefactorial/main.go b/go/tests/recursivefactorial/main.go
similarity index 100%
rename from go/tests/func/recursivefactorial/main.go
rename to go/tests/recursivefactorial/main.go
diff --git a/go/tests/func/recursivepower/main.go b/go/tests/recursivepower/main.go
similarity index 100%
rename from go/tests/func/recursivepower/main.go
rename to go/tests/recursivepower/main.go
diff --git a/go/tests/func/reduceint/main.go b/go/tests/reduceint/main.go
similarity index 100%
rename from go/tests/func/reduceint/main.go
rename to go/tests/reduceint/main.go
diff --git a/go/tests/func/repeatalpha/correct/main.go b/go/tests/repeatalpha/correct/main.go
similarity index 100%
rename from go/tests/func/repeatalpha/correct/main.go
rename to go/tests/repeatalpha/correct/main.go
diff --git a/go/tests/func/repeatalpha/main.go b/go/tests/repeatalpha/main.go
similarity index 100%
rename from go/tests/func/repeatalpha/main.go
rename to go/tests/repeatalpha/main.go
diff --git a/go/tests/func/reversebits/main.go b/go/tests/reversebits/main.go
similarity index 100%
rename from go/tests/func/reversebits/main.go
rename to go/tests/reversebits/main.go
diff --git a/go/tests/func/reverserange/correct/main.go b/go/tests/reverserange/correct/main.go
similarity index 100%
rename from go/tests/func/reverserange/correct/main.go
rename to go/tests/reverserange/correct/main.go
diff --git a/go/tests/func/reverserange/main.go b/go/tests/reverserange/main.go
similarity index 100%
rename from go/tests/func/reverserange/main.go
rename to go/tests/reverserange/main.go
diff --git a/go/tests/func/reversestrcap/correct/main.go b/go/tests/reversestrcap/correct/main.go
similarity index 100%
rename from go/tests/func/reversestrcap/correct/main.go
rename to go/tests/reversestrcap/correct/main.go
diff --git a/go/tests/func/reversestrcap/main.go b/go/tests/reversestrcap/main.go
similarity index 100%
rename from go/tests/func/reversestrcap/main.go
rename to go/tests/reversestrcap/main.go
diff --git a/go/tests/func/revivethreenums/main.go b/go/tests/revivethreenums/main.go
similarity index 100%
rename from go/tests/func/revivethreenums/main.go
rename to go/tests/revivethreenums/main.go
diff --git a/go/tests/func/revparams/correct/main.go b/go/tests/revparams/correct/main.go
similarity index 100%
rename from go/tests/func/revparams/correct/main.go
rename to go/tests/revparams/correct/main.go
diff --git a/go/tests/func/revparams/main.go b/go/tests/revparams/main.go
similarity index 100%
rename from go/tests/func/revparams/main.go
rename to go/tests/revparams/main.go
diff --git a/go/tests/func/revwstr/correct/main.go b/go/tests/revwstr/correct/main.go
similarity index 100%
rename from go/tests/func/revwstr/correct/main.go
rename to go/tests/revwstr/correct/main.go
diff --git a/go/tests/func/revwstr/main.go b/go/tests/revwstr/main.go
similarity index 100%
rename from go/tests/func/revwstr/main.go
rename to go/tests/revwstr/main.go
diff --git a/go/tests/func/robottoorigin/correct/main.go b/go/tests/robottoorigin/correct/main.go
similarity index 100%
rename from go/tests/func/robottoorigin/correct/main.go
rename to go/tests/robottoorigin/correct/main.go
diff --git a/go/tests/func/robottoorigin/main.go b/go/tests/robottoorigin/main.go
similarity index 100%
rename from go/tests/func/robottoorigin/main.go
rename to go/tests/robottoorigin/main.go
diff --git a/go/tests/func/romannumbers/correct/main.go b/go/tests/romannumbers/correct/main.go
similarity index 100%
rename from go/tests/func/romannumbers/correct/main.go
rename to go/tests/romannumbers/correct/main.go
diff --git a/go/tests/func/romannumbers/main.go b/go/tests/romannumbers/main.go
similarity index 100%
rename from go/tests/func/romannumbers/main.go
rename to go/tests/romannumbers/main.go
diff --git a/go/tests/func/rostring/correct/main.go b/go/tests/rostring/correct/main.go
similarity index 100%
rename from go/tests/func/rostring/correct/main.go
rename to go/tests/rostring/correct/main.go
diff --git a/go/tests/func/rostring/main.go b/go/tests/rostring/main.go
similarity index 100%
rename from go/tests/func/rostring/main.go
rename to go/tests/rostring/main.go
diff --git a/go/tests/func/rot13/correct/main.go b/go/tests/rot13/correct/main.go
similarity index 100%
rename from go/tests/func/rot13/correct/main.go
rename to go/tests/rot13/correct/main.go
diff --git a/go/tests/func/rot13/main.go b/go/tests/rot13/main.go
similarity index 100%
rename from go/tests/func/rot13/main.go
rename to go/tests/rot13/main.go
diff --git a/go/tests/func/rot14/main.go b/go/tests/rot14/main.go
similarity index 100%
rename from go/tests/func/rot14/main.go
rename to go/tests/rot14/main.go
diff --git a/go/tests/func/rotatevowels/correct/main.go b/go/tests/rotatevowels/correct/main.go
similarity index 100%
rename from go/tests/func/rotatevowels/correct/main.go
rename to go/tests/rotatevowels/correct/main.go
diff --git a/go/tests/func/rotatevowels/main.go b/go/tests/rotatevowels/main.go
similarity index 100%
rename from go/tests/func/rotatevowels/main.go
rename to go/tests/rotatevowels/main.go
diff --git a/go/tests/func/rpncalc/correct/main.go b/go/tests/rpncalc/correct/main.go
similarity index 100%
rename from go/tests/func/rpncalc/correct/main.go
rename to go/tests/rpncalc/correct/main.go
diff --git a/go/tests/func/rpncalc/main.go b/go/tests/rpncalc/main.go
similarity index 100%
rename from go/tests/func/rpncalc/main.go
rename to go/tests/rpncalc/main.go
diff --git a/go/tests/func/searchreplace/correct/main.go b/go/tests/searchreplace/correct/main.go
similarity index 100%
rename from go/tests/func/searchreplace/correct/main.go
rename to go/tests/searchreplace/correct/main.go
diff --git a/go/tests/func/searchreplace/main.go b/go/tests/searchreplace/main.go
similarity index 100%
rename from go/tests/func/searchreplace/main.go
rename to go/tests/searchreplace/main.go
diff --git a/go/tests/func/slice/main.go b/go/tests/slice/main.go
similarity index 100%
rename from go/tests/func/slice/main.go
rename to go/tests/slice/main.go
diff --git a/go/tests/func/sortintegertable/main.go b/go/tests/sortintegertable/main.go
similarity index 100%
rename from go/tests/func/sortintegertable/main.go
rename to go/tests/sortintegertable/main.go
diff --git a/go/tests/func/sortparams/correct/main.go b/go/tests/sortparams/correct/main.go
similarity index 100%
rename from go/tests/func/sortparams/correct/main.go
rename to go/tests/sortparams/correct/main.go
diff --git a/go/tests/func/sortparams/main.go b/go/tests/sortparams/main.go
similarity index 100%
rename from go/tests/func/sortparams/main.go
rename to go/tests/sortparams/main.go
diff --git a/go/tests/func/sortwordarr/main.go b/go/tests/sortwordarr/main.go
similarity index 100%
rename from go/tests/func/sortwordarr/main.go
rename to go/tests/sortwordarr/main.go
diff --git a/go/tests/func/split/main.go b/go/tests/split/main.go
similarity index 100%
rename from go/tests/func/split/main.go
rename to go/tests/split/main.go
diff --git a/go/tests/func/splitwhitespaces/main.go b/go/tests/splitwhitespaces/main.go
similarity index 100%
rename from go/tests/func/splitwhitespaces/main.go
rename to go/tests/splitwhitespaces/main.go
diff --git a/go/tests/func/sqrt/main.go b/go/tests/sqrt/main.go
similarity index 100%
rename from go/tests/func/sqrt/main.go
rename to go/tests/sqrt/main.go
diff --git a/go/tests/func/strlen/main.go b/go/tests/strlen/main.go
similarity index 100%
rename from go/tests/func/strlen/main.go
rename to go/tests/strlen/main.go
diff --git a/go/tests/func/strrev/main.go b/go/tests/strrev/main.go
similarity index 100%
rename from go/tests/func/strrev/main.go
rename to go/tests/strrev/main.go
diff --git a/go/tests/func/swap/main.go b/go/tests/swap/main.go
similarity index 100%
rename from go/tests/func/swap/main.go
rename to go/tests/swap/main.go
diff --git a/go/tests/func/swapbits/main.go b/go/tests/swapbits/main.go
similarity index 100%
rename from go/tests/func/swapbits/main.go
rename to go/tests/swapbits/main.go
diff --git a/go/tests/func/sweetproblem/main.go b/go/tests/sweetproblem/main.go
similarity index 100%
rename from go/tests/func/sweetproblem/main.go
rename to go/tests/sweetproblem/main.go
diff --git a/go/tests/func/switchcase/correct/main.go b/go/tests/switchcase/correct/main.go
similarity index 100%
rename from go/tests/func/switchcase/correct/main.go
rename to go/tests/switchcase/correct/main.go
diff --git a/go/tests/func/switchcase/main.go b/go/tests/switchcase/main.go
similarity index 100%
rename from go/tests/func/switchcase/main.go
rename to go/tests/switchcase/main.go
diff --git a/go/tests/func/tabmult/correct/main.go b/go/tests/tabmult/correct/main.go
similarity index 100%
rename from go/tests/func/tabmult/correct/main.go
rename to go/tests/tabmult/correct/main.go
diff --git a/go/tests/func/tabmult/main.go b/go/tests/tabmult/main.go
similarity index 100%
rename from go/tests/func/tabmult/main.go
rename to go/tests/tabmult/main.go
diff --git a/go/tests/func/tetrisoptimizer/correct/board.go b/go/tests/tetrisoptimizer/correct/board.go
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/board.go
rename to go/tests/tetrisoptimizer/correct/board.go
diff --git a/go/tests/func/tetrisoptimizer/correct/main.go b/go/tests/tetrisoptimizer/correct/main.go
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/main.go
rename to go/tests/tetrisoptimizer/correct/main.go
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/bad00.txt b/go/tests/tetrisoptimizer/correct/samples/bad00.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/bad00.txt
rename to go/tests/tetrisoptimizer/correct/samples/bad00.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/bad01.txt b/go/tests/tetrisoptimizer/correct/samples/bad01.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/bad01.txt
rename to go/tests/tetrisoptimizer/correct/samples/bad01.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/bad02.txt b/go/tests/tetrisoptimizer/correct/samples/bad02.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/bad02.txt
rename to go/tests/tetrisoptimizer/correct/samples/bad02.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/bad03.txt b/go/tests/tetrisoptimizer/correct/samples/bad03.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/bad03.txt
rename to go/tests/tetrisoptimizer/correct/samples/bad03.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/bad04.txt b/go/tests/tetrisoptimizer/correct/samples/bad04.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/bad04.txt
rename to go/tests/tetrisoptimizer/correct/samples/bad04.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/badFormat.txt b/go/tests/tetrisoptimizer/correct/samples/badFormat.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/badFormat.txt
rename to go/tests/tetrisoptimizer/correct/samples/badFormat.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_01-1-2-0.00.txt b/go/tests/tetrisoptimizer/correct/samples/good_01-1-2-0.00.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_01-1-2-0.00.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_01-1-2-0.00.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_02-1-4-0.00.txt b/go/tests/tetrisoptimizer/correct/samples/good_02-1-4-0.00.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_02-1-4-0.00.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_02-1-4-0.00.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_03-2-4-0.00.txt b/go/tests/tetrisoptimizer/correct/samples/good_03-2-4-0.00.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_03-2-4-0.00.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_03-2-4-0.00.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_04-6-6-0.00.txt b/go/tests/tetrisoptimizer/correct/samples/good_04-6-6-0.00.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_04-6-6-0.00.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_04-6-6-0.00.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_05-21-10-0.00.txt b/go/tests/tetrisoptimizer/correct/samples/good_05-21-10-0.00.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_05-21-10-0.00.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_05-21-10-0.00.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_06-22-10-0.00.txt b/go/tests/tetrisoptimizer/correct/samples/good_06-22-10-0.00.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_06-22-10-0.00.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_06-22-10-0.00.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_07-26-11-0.00.txt b/go/tests/tetrisoptimizer/correct/samples/good_07-26-11-0.00.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_07-26-11-0.00.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_07-26-11-0.00.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_08-24-10-0.03.txt b/go/tests/tetrisoptimizer/correct/samples/good_08-24-10-0.03.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_08-24-10-0.03.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_08-24-10-0.03.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_09-11-7-0.07.txt b/go/tests/tetrisoptimizer/correct/samples/good_09-11-7-0.07.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_09-11-7-0.07.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_09-11-7-0.07.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_10-12-7-0.52.txt b/go/tests/tetrisoptimizer/correct/samples/good_10-12-7-0.52.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_10-12-7-0.52.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_10-12-7-0.52.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_11-12-8-0.83.txt b/go/tests/tetrisoptimizer/correct/samples/good_11-12-8-0.83.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_11-12-8-0.83.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_11-12-8-0.83.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_12-19-9-3.40.txt b/go/tests/tetrisoptimizer/correct/samples/good_12-19-9-3.40.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_12-19-9-3.40.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_12-19-9-3.40.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_13-23-10-4.72.txt b/go/tests/tetrisoptimizer/correct/samples/good_13-23-10-4.72.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_13-23-10-4.72.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_13-23-10-4.72.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_14-15-8-7.34.txt b/go/tests/tetrisoptimizer/correct/samples/good_14-15-8-7.34.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_14-15-8-7.34.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_14-15-8-7.34.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/samples/good_15-26-11-72.22.txt b/go/tests/tetrisoptimizer/correct/samples/good_15-26-11-72.22.txt
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/samples/good_15-26-11-72.22.txt
rename to go/tests/tetrisoptimizer/correct/samples/good_15-26-11-72.22.txt
diff --git a/go/tests/func/tetrisoptimizer/correct/solver.go b/go/tests/tetrisoptimizer/correct/solver.go
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/solver.go
rename to go/tests/tetrisoptimizer/correct/solver.go
diff --git a/go/tests/func/tetrisoptimizer/correct/tetrimino.go b/go/tests/tetrisoptimizer/correct/tetrimino.go
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/tetrimino.go
rename to go/tests/tetrisoptimizer/correct/tetrimino.go
diff --git a/go/tests/func/tetrisoptimizer/correct/validation.go b/go/tests/tetrisoptimizer/correct/validation.go
similarity index 100%
rename from go/tests/func/tetrisoptimizer/correct/validation.go
rename to go/tests/tetrisoptimizer/correct/validation.go
diff --git a/go/tests/func/tetrisoptimizer/main.go b/go/tests/tetrisoptimizer/main.go
similarity index 100%
rename from go/tests/func/tetrisoptimizer/main.go
rename to go/tests/tetrisoptimizer/main.go
diff --git a/go/tests/func/tolower/main.go b/go/tests/tolower/main.go
similarity index 100%
rename from go/tests/func/tolower/main.go
rename to go/tests/tolower/main.go
diff --git a/go/tests/func/toupper/main.go b/go/tests/toupper/main.go
similarity index 100%
rename from go/tests/func/toupper/main.go
rename to go/tests/toupper/main.go
diff --git a/go/tests/func/trimatoi/main.go b/go/tests/trimatoi/main.go
similarity index 100%
rename from go/tests/func/trimatoi/main.go
rename to go/tests/trimatoi/main.go
diff --git a/go/tests/func/twosum/main.go b/go/tests/twosum/main.go
similarity index 100%
rename from go/tests/func/twosum/main.go
rename to go/tests/twosum/main.go
diff --git a/go/tests/func/ultimatedivmod/main.go b/go/tests/ultimatedivmod/main.go
similarity index 100%
rename from go/tests/func/ultimatedivmod/main.go
rename to go/tests/ultimatedivmod/main.go
diff --git a/go/tests/func/ultimatepointone/main.go b/go/tests/ultimatepointone/main.go
similarity index 100%
rename from go/tests/func/ultimatepointone/main.go
rename to go/tests/ultimatepointone/main.go
diff --git a/go/tests/func/union/correct/main.go b/go/tests/union/correct/main.go
similarity index 100%
rename from go/tests/func/union/correct/main.go
rename to go/tests/union/correct/main.go
diff --git a/go/tests/func/union/main.go b/go/tests/union/main.go
similarity index 100%
rename from go/tests/func/union/main.go
rename to go/tests/union/main.go
diff --git a/go/tests/func/uniqueoccurences/correct/main.go b/go/tests/uniqueoccurences/correct/main.go
similarity index 100%
rename from go/tests/func/uniqueoccurences/correct/main.go
rename to go/tests/uniqueoccurences/correct/main.go
diff --git a/go/tests/func/uniqueoccurences/main.go b/go/tests/uniqueoccurences/main.go
similarity index 100%
rename from go/tests/func/uniqueoccurences/main.go
rename to go/tests/uniqueoccurences/main.go
diff --git a/go/tests/func/unmatch/main.go b/go/tests/unmatch/main.go
similarity index 100%
rename from go/tests/func/unmatch/main.go
rename to go/tests/unmatch/main.go
diff --git a/go/tests/func/volumechanger/main.go b/go/tests/volumechanger/main.go
similarity index 100%
rename from go/tests/func/volumechanger/main.go
rename to go/tests/volumechanger/main.go
diff --git a/go/tests/func/wdmatch/correct/main.go b/go/tests/wdmatch/correct/main.go
similarity index 100%
rename from go/tests/func/wdmatch/correct/main.go
rename to go/tests/wdmatch/correct/main.go
diff --git a/go/tests/func/wdmatch/main.go b/go/tests/wdmatch/main.go
similarity index 100%
rename from go/tests/func/wdmatch/main.go
rename to go/tests/wdmatch/main.go
diff --git a/go/tests/func/ztail/correct/main.go b/go/tests/ztail/correct/main.go
similarity index 100%
rename from go/tests/func/ztail/correct/main.go
rename to go/tests/ztail/correct/main.go
diff --git a/go/tests/func/ztail/main.go b/go/tests/ztail/main.go
similarity index 100%
rename from go/tests/func/ztail/main.go
rename to go/tests/ztail/main.go
diff --git a/scripts/bash_tweaks.sh b/sh/scripts/bash_tweaks.sh
similarity index 100%
rename from scripts/bash_tweaks.sh
rename to sh/scripts/bash_tweaks.sh
diff --git a/scripts/check_installation.sh b/sh/scripts/check_installation.sh
similarity index 100%
rename from scripts/check_installation.sh
rename to sh/scripts/check_installation.sh
diff --git a/scripts/clean.sh b/sh/scripts/clean.sh
similarity index 100%
rename from scripts/clean.sh
rename to sh/scripts/clean.sh
diff --git a/scripts/common_packages.txt b/sh/scripts/common_packages.txt
similarity index 100%
rename from scripts/common_packages.txt
rename to sh/scripts/common_packages.txt
diff --git a/scripts/configure_ubuntu.sh b/sh/scripts/configure_ubuntu.sh
similarity index 100%
rename from scripts/configure_ubuntu.sh
rename to sh/scripts/configure_ubuntu.sh
diff --git a/scripts/dconfig.txt b/sh/scripts/dconfig.txt
similarity index 100%
rename from scripts/dconfig.txt
rename to sh/scripts/dconfig.txt
diff --git a/scripts/docker.sh b/sh/scripts/docker.sh
similarity index 100%
rename from scripts/docker.sh
rename to sh/scripts/docker.sh
diff --git a/scripts/exam.sh b/sh/scripts/exam.sh
similarity index 100%
rename from scripts/exam.sh
rename to sh/scripts/exam.sh
diff --git a/scripts/firewall.sh b/sh/scripts/firewall.sh
similarity index 100%
rename from scripts/firewall.sh
rename to sh/scripts/firewall.sh
diff --git a/scripts/fx.sh b/sh/scripts/fx.sh
similarity index 100%
rename from scripts/fx.sh
rename to sh/scripts/fx.sh
diff --git a/scripts/go.sh b/sh/scripts/go.sh
similarity index 100%
rename from scripts/go.sh
rename to sh/scripts/go.sh
diff --git a/scripts/grub.sh b/sh/scripts/grub.sh
similarity index 100%
rename from scripts/grub.sh
rename to sh/scripts/grub.sh
diff --git a/scripts/install-debian.sh b/sh/scripts/install-debian.sh
similarity index 100%
rename from scripts/install-debian.sh
rename to sh/scripts/install-debian.sh
diff --git a/scripts/libreoffice.sh b/sh/scripts/libreoffice.sh
similarity index 100%
rename from scripts/libreoffice.sh
rename to sh/scripts/libreoffice.sh
diff --git a/scripts/nodejs.sh b/sh/scripts/nodejs.sh
similarity index 100%
rename from scripts/nodejs.sh
rename to sh/scripts/nodejs.sh
diff --git a/scripts/preseed.cfg b/sh/scripts/preseed.cfg
similarity index 100%
rename from scripts/preseed.cfg
rename to sh/scripts/preseed.cfg
diff --git a/scripts/set.sh b/sh/scripts/set.sh
similarity index 100%
rename from scripts/set.sh
rename to sh/scripts/set.sh
diff --git a/scripts/setup.sh b/sh/scripts/setup.sh
similarity index 100%
rename from scripts/setup.sh
rename to sh/scripts/setup.sh
diff --git a/scripts/ssh.sh b/sh/scripts/ssh.sh
similarity index 100%
rename from scripts/ssh.sh
rename to sh/scripts/ssh.sh
diff --git a/scripts/sublime.sh b/sh/scripts/sublime.sh
similarity index 100%
rename from scripts/sublime.sh
rename to sh/scripts/sublime.sh
diff --git a/scripts/system/etc/gdm3/PostLogin/Default b/sh/scripts/system/etc/gdm3/PostLogin/Default
similarity index 100%
rename from scripts/system/etc/gdm3/PostLogin/Default
rename to sh/scripts/system/etc/gdm3/PostLogin/Default
diff --git a/scripts/system/etc/gdm3/PostSession/Default b/sh/scripts/system/etc/gdm3/PostSession/Default
similarity index 100%
rename from scripts/system/etc/gdm3/PostSession/Default
rename to sh/scripts/system/etc/gdm3/PostSession/Default
diff --git a/scripts/system/etc/systemd/system/mount-docker.service b/sh/scripts/system/etc/systemd/system/mount-docker.service
similarity index 100%
rename from scripts/system/etc/systemd/system/mount-docker.service
rename to sh/scripts/system/etc/systemd/system/mount-docker.service
diff --git a/scripts/system/etc/udev/rules.d/10-local.rules b/sh/scripts/system/etc/udev/rules.d/10-local.rules
similarity index 100%
rename from scripts/system/etc/udev/rules.d/10-local.rules
rename to sh/scripts/system/etc/udev/rules.d/10-local.rules
diff --git a/scripts/system/usr/local/bin/lock_screen b/sh/scripts/system/usr/local/bin/lock_screen
similarity index 100%
rename from scripts/system/usr/local/bin/lock_screen
rename to sh/scripts/system/usr/local/bin/lock_screen
diff --git a/scripts/system/usr/local/bin/mount-docker.sh b/sh/scripts/system/usr/local/bin/mount-docker.sh
similarity index 100%
rename from scripts/system/usr/local/bin/mount-docker.sh
rename to sh/scripts/system/usr/local/bin/mount-docker.sh
diff --git a/scripts/system/usr/local/bin/suspend_session b/sh/scripts/system/usr/local/bin/suspend_session
similarity index 100%
rename from scripts/system/usr/local/bin/suspend_session
rename to sh/scripts/system/usr/local/bin/suspend_session
diff --git a/scripts/system/usr/share/applications/lock_screen.desktop b/sh/scripts/system/usr/share/applications/lock_screen.desktop
similarity index 100%
rename from scripts/system/usr/share/applications/lock_screen.desktop
rename to sh/scripts/system/usr/share/applications/lock_screen.desktop
diff --git a/scripts/system/usr/share/applications/suspend_session.desktop b/sh/scripts/system/usr/share/applications/suspend_session.desktop
similarity index 100%
rename from scripts/system/usr/share/applications/suspend_session.desktop
rename to sh/scripts/system/usr/share/applications/suspend_session.desktop
diff --git a/scripts/system/usr/share/backgrounds/01/background.png b/sh/scripts/system/usr/share/backgrounds/01/background.png
similarity index 100%
rename from scripts/system/usr/share/backgrounds/01/background.png
rename to sh/scripts/system/usr/share/backgrounds/01/background.png
diff --git a/scripts/system/usr/share/backgrounds/01/logo.png b/sh/scripts/system/usr/share/backgrounds/01/logo.png
similarity index 100%
rename from scripts/system/usr/share/backgrounds/01/logo.png
rename to sh/scripts/system/usr/share/backgrounds/01/logo.png
diff --git a/scripts/system/usr/share/initramfs-tools/hooks/copy_mkfs b/sh/scripts/system/usr/share/initramfs-tools/hooks/copy_mkfs
similarity index 100%
rename from scripts/system/usr/share/initramfs-tools/hooks/copy_mkfs
rename to sh/scripts/system/usr/share/initramfs-tools/hooks/copy_mkfs
diff --git a/scripts/system/usr/share/initramfs-tools/scripts/init-premount/reformat b/sh/scripts/system/usr/share/initramfs-tools/scripts/init-premount/reformat
similarity index 100%
rename from scripts/system/usr/share/initramfs-tools/scripts/init-premount/reformat
rename to sh/scripts/system/usr/share/initramfs-tools/scripts/init-premount/reformat
diff --git a/scripts/vscode.sh b/sh/scripts/vscode.sh
similarity index 100%
rename from scripts/vscode.sh
rename to sh/scripts/vscode.sh