diff --git a/tests/go/test_abort.go b/tests/go/func/test_abort.go
similarity index 100%
rename from tests/go/test_abort.go
rename to tests/go/func/test_abort.go
diff --git a/tests/go/test_activebits.go b/tests/go/func/test_activebits.go
similarity index 100%
rename from tests/go/test_activebits.go
rename to tests/go/func/test_activebits.go
diff --git a/tests/go/test_advancedsortwordarr.go b/tests/go/func/test_advancedsortwordarr.go
similarity index 100%
rename from tests/go/test_advancedsortwordarr.go
rename to tests/go/func/test_advancedsortwordarr.go
diff --git a/tests/go/test_alphacount.go b/tests/go/func/test_alphacount.go
similarity index 100%
rename from tests/go/test_alphacount.go
rename to tests/go/func/test_alphacount.go
diff --git a/tests/go/test_any.go b/tests/go/func/test_any.go
similarity index 100%
rename from tests/go/test_any.go
rename to tests/go/func/test_any.go
diff --git a/tests/go/test_appendrange.go b/tests/go/func/test_appendrange.go
similarity index 100%
rename from tests/go/test_appendrange.go
rename to tests/go/func/test_appendrange.go
diff --git a/tests/go/test_atoi.go b/tests/go/func/test_atoi.go
similarity index 100%
rename from tests/go/test_atoi.go
rename to tests/go/func/test_atoi.go
diff --git a/tests/go/test_atoibase.go b/tests/go/func/test_atoibase.go
similarity index 100%
rename from tests/go/test_atoibase.go
rename to tests/go/func/test_atoibase.go
diff --git a/tests/go/test_basicatoi.go b/tests/go/func/test_basicatoi.go
similarity index 100%
rename from tests/go/test_basicatoi.go
rename to tests/go/func/test_basicatoi.go
diff --git a/tests/go/test_basicatoi2.go b/tests/go/func/test_basicatoi2.go
similarity index 100%
rename from tests/go/test_basicatoi2.go
rename to tests/go/func/test_basicatoi2.go
diff --git a/tests/go/test_basicjoin.go b/tests/go/func/test_basicjoin.go
similarity index 100%
rename from tests/go/test_basicjoin.go
rename to tests/go/func/test_basicjoin.go
diff --git a/tests/go/test_btreeapplybylevel.go b/tests/go/func/test_btreeapplybylevel.go
similarity index 100%
rename from tests/go/test_btreeapplybylevel.go
rename to tests/go/func/test_btreeapplybylevel.go
diff --git a/tests/go/test_btreeapplyinorder.go b/tests/go/func/test_btreeapplyinorder.go
similarity index 100%
rename from tests/go/test_btreeapplyinorder.go
rename to tests/go/func/test_btreeapplyinorder.go
diff --git a/tests/go/test_btreeapplypostorder.go b/tests/go/func/test_btreeapplypostorder.go
similarity index 100%
rename from tests/go/test_btreeapplypostorder.go
rename to tests/go/func/test_btreeapplypostorder.go
diff --git a/tests/go/test_btreeapplypreorder.go b/tests/go/func/test_btreeapplypreorder.go
similarity index 100%
rename from tests/go/test_btreeapplypreorder.go
rename to tests/go/func/test_btreeapplypreorder.go
diff --git a/tests/go/test_btreedeletenode.go b/tests/go/func/test_btreedeletenode.go
similarity index 100%
rename from tests/go/test_btreedeletenode.go
rename to tests/go/func/test_btreedeletenode.go
diff --git a/tests/go/test_btreeinsertdata.go b/tests/go/func/test_btreeinsertdata.go
similarity index 100%
rename from tests/go/test_btreeinsertdata.go
rename to tests/go/func/test_btreeinsertdata.go
diff --git a/tests/go/test_btreeisbinary.go b/tests/go/func/test_btreeisbinary.go
similarity index 100%
rename from tests/go/test_btreeisbinary.go
rename to tests/go/func/test_btreeisbinary.go
diff --git a/tests/go/test_btreesearchitem.go b/tests/go/func/test_btreesearchitem.go
similarity index 100%
rename from tests/go/test_btreesearchitem.go
rename to tests/go/func/test_btreesearchitem.go
diff --git a/tests/go/test_btreetransplant.go b/tests/go/func/test_btreetransplant.go
similarity index 100%
rename from tests/go/test_btreetransplant.go
rename to tests/go/func/test_btreetransplant.go
diff --git a/tests/go/test_capitalize.go b/tests/go/func/test_capitalize.go
similarity index 100%
rename from tests/go/test_capitalize.go
rename to tests/go/func/test_capitalize.go
diff --git a/tests/go/test_chunk.go b/tests/go/func/test_chunk.go
similarity index 100%
rename from tests/go/test_chunk.go
rename to tests/go/func/test_chunk.go
diff --git a/tests/go/test_collatzcountdown.go b/tests/go/func/test_collatzcountdown.go
similarity index 100%
rename from tests/go/test_collatzcountdown.go
rename to tests/go/func/test_collatzcountdown.go
diff --git a/tests/go/test_compact.go b/tests/go/func/test_compact.go
similarity index 100%
rename from tests/go/test_compact.go
rename to tests/go/func/test_compact.go
diff --git a/tests/go/test_compare.go b/tests/go/func/test_compare.go
similarity index 100%
rename from tests/go/test_compare.go
rename to tests/go/func/test_compare.go
diff --git a/tests/go/test_concat.go b/tests/go/func/test_concat.go
similarity index 100%
rename from tests/go/test_concat.go
rename to tests/go/func/test_concat.go
diff --git a/tests/go/test_concatparams.go b/tests/go/func/test_concatparams.go
similarity index 100%
rename from tests/go/test_concatparams.go
rename to tests/go/func/test_concatparams.go
diff --git a/tests/go/test_convertbase.go b/tests/go/func/test_convertbase.go
similarity index 100%
rename from tests/go/test_convertbase.go
rename to tests/go/func/test_convertbase.go
diff --git a/tests/go/test_countif.go b/tests/go/func/test_countif.go
similarity index 100%
rename from tests/go/test_countif.go
rename to tests/go/func/test_countif.go
diff --git a/tests/go/test_createelem.go b/tests/go/func/test_createelem.go
similarity index 100%
rename from tests/go/test_createelem.go
rename to tests/go/func/test_createelem.go
diff --git a/tests/go/test_doppelganger.go b/tests/go/func/test_doppelganger.go
similarity index 100%
rename from tests/go/test_doppelganger.go
rename to tests/go/func/test_doppelganger.go
diff --git a/tests/go/test_eightqueens.go b/tests/go/func/test_eightqueens.go
similarity index 100%
rename from tests/go/test_eightqueens.go
rename to tests/go/func/test_eightqueens.go
diff --git a/tests/go/test_enigma.go b/tests/go/func/test_enigma.go
similarity index 100%
rename from tests/go/test_enigma.go
rename to tests/go/func/test_enigma.go
diff --git a/tests/go/test_fib.go b/tests/go/func/test_fib.go
similarity index 100%
rename from tests/go/test_fib.go
rename to tests/go/func/test_fib.go
diff --git a/tests/go/test_fibonacci.go b/tests/go/func/test_fibonacci.go
similarity index 100%
rename from tests/go/test_fibonacci.go
rename to tests/go/func/test_fibonacci.go
diff --git a/tests/go/test_findnextprime.go b/tests/go/func/test_findnextprime.go
similarity index 100%
rename from tests/go/test_findnextprime.go
rename to tests/go/func/test_findnextprime.go
diff --git a/tests/go/test_findprevprime.go b/tests/go/func/test_findprevprime.go
similarity index 100%
rename from tests/go/test_findprevprime.go
rename to tests/go/func/test_findprevprime.go
diff --git a/tests/go/test_firstrune.go b/tests/go/func/test_firstrune.go
similarity index 100%
rename from tests/go/test_firstrune.go
rename to tests/go/func/test_firstrune.go
diff --git a/tests/go/test_foldint.go b/tests/go/func/test_foldint.go
similarity index 100%
rename from tests/go/test_foldint.go
rename to tests/go/func/test_foldint.go
diff --git a/tests/go/test_foreach.go b/tests/go/func/test_foreach.go
similarity index 100%
rename from tests/go/test_foreach.go
rename to tests/go/func/test_foreach.go
diff --git a/tests/go/test_game23.go b/tests/go/func/test_game23.go
similarity index 100%
rename from tests/go/test_game23.go
rename to tests/go/func/test_game23.go
diff --git a/tests/go/test_halfcontest.go b/tests/go/func/test_halfcontest.go
similarity index 100%
rename from tests/go/test_halfcontest.go
rename to tests/go/func/test_halfcontest.go
diff --git a/tests/go/test_index.go b/tests/go/func/test_index.go
similarity index 100%
rename from tests/go/test_index.go
rename to tests/go/func/test_index.go
diff --git a/tests/go/test_interestingnumber.go b/tests/go/func/test_interestingnumber.go
similarity index 100%
rename from tests/go/test_interestingnumber.go
rename to tests/go/func/test_interestingnumber.go
diff --git a/tests/go/test_isalpha.go b/tests/go/func/test_isalpha.go
similarity index 100%
rename from tests/go/test_isalpha.go
rename to tests/go/func/test_isalpha.go
diff --git a/tests/go/test_isanagram.go b/tests/go/func/test_isanagram.go
similarity index 100%
rename from tests/go/test_isanagram.go
rename to tests/go/func/test_isanagram.go
diff --git a/tests/go/test_islower.go b/tests/go/func/test_islower.go
similarity index 100%
rename from tests/go/test_islower.go
rename to tests/go/func/test_islower.go
diff --git a/tests/go/test_isnegative.go b/tests/go/func/test_isnegative.go
similarity index 100%
rename from tests/go/test_isnegative.go
rename to tests/go/func/test_isnegative.go
diff --git a/tests/go/test_isnumeric.go b/tests/go/func/test_isnumeric.go
similarity index 100%
rename from tests/go/test_isnumeric.go
rename to tests/go/func/test_isnumeric.go
diff --git a/tests/go/test_isprime.go b/tests/go/func/test_isprime.go
similarity index 100%
rename from tests/go/test_isprime.go
rename to tests/go/func/test_isprime.go
diff --git a/tests/go/test_isprintable.go b/tests/go/func/test_isprintable.go
similarity index 100%
rename from tests/go/test_isprintable.go
rename to tests/go/func/test_isprintable.go
diff --git a/tests/go/test_issorted.go b/tests/go/func/test_issorted.go
similarity index 100%
rename from tests/go/test_issorted.go
rename to tests/go/func/test_issorted.go
diff --git a/tests/go/test_isupper.go b/tests/go/func/test_isupper.go
similarity index 100%
rename from tests/go/test_isupper.go
rename to tests/go/func/test_isupper.go
diff --git a/tests/go/test_iterativefactorial.go b/tests/go/func/test_iterativefactorial.go
similarity index 100%
rename from tests/go/test_iterativefactorial.go
rename to tests/go/func/test_iterativefactorial.go
diff --git a/tests/go/test_iterativepower.go b/tests/go/func/test_iterativepower.go
similarity index 100%
rename from tests/go/test_iterativepower.go
rename to tests/go/func/test_iterativepower.go
diff --git a/tests/go/test_itoa.go b/tests/go/func/test_itoa.go
similarity index 100%
rename from tests/go/test_itoa.go
rename to tests/go/func/test_itoa.go
diff --git a/tests/go/test_itoabase.go b/tests/go/func/test_itoabase.go
similarity index 100%
rename from tests/go/test_itoabase.go
rename to tests/go/func/test_itoabase.go
diff --git a/tests/go/test_join.go b/tests/go/func/test_join.go
similarity index 100%
rename from tests/go/test_join.go
rename to tests/go/func/test_join.go
diff --git a/tests/go/test_lastrune.go b/tests/go/func/test_lastrune.go
similarity index 100%
rename from tests/go/test_lastrune.go
rename to tests/go/func/test_lastrune.go
diff --git a/tests/go/test_lcm.go b/tests/go/func/test_lcm.go
similarity index 100%
rename from tests/go/test_lcm.go
rename to tests/go/func/test_lcm.go
diff --git a/tests/go/test_listat.go b/tests/go/func/test_listat.go
similarity index 100%
rename from tests/go/test_listat.go
rename to tests/go/func/test_listat.go
diff --git a/tests/go/test_listclear.go b/tests/go/func/test_listclear.go
similarity index 100%
rename from tests/go/test_listclear.go
rename to tests/go/func/test_listclear.go
diff --git a/tests/go/test_listfind.go b/tests/go/func/test_listfind.go
similarity index 100%
rename from tests/go/test_listfind.go
rename to tests/go/func/test_listfind.go
diff --git a/tests/go/test_listforeach.go b/tests/go/func/test_listforeach.go
similarity index 100%
rename from tests/go/test_listforeach.go
rename to tests/go/func/test_listforeach.go
diff --git a/tests/go/test_listforeachif.go b/tests/go/func/test_listforeachif.go
similarity index 100%
rename from tests/go/test_listforeachif.go
rename to tests/go/func/test_listforeachif.go
diff --git a/tests/go/test_listlast.go b/tests/go/func/test_listlast.go
similarity index 100%
rename from tests/go/test_listlast.go
rename to tests/go/func/test_listlast.go
diff --git a/tests/go/test_listmerge.go b/tests/go/func/test_listmerge.go
similarity index 100%
rename from tests/go/test_listmerge.go
rename to tests/go/func/test_listmerge.go
diff --git a/tests/go/test_listpushback.go b/tests/go/func/test_listpushback.go
similarity index 100%
rename from tests/go/test_listpushback.go
rename to tests/go/func/test_listpushback.go
diff --git a/tests/go/test_listpushfront.go b/tests/go/func/test_listpushfront.go
similarity index 100%
rename from tests/go/test_listpushfront.go
rename to tests/go/func/test_listpushfront.go
diff --git a/tests/go/test_listremoveif.go b/tests/go/func/test_listremoveif.go
similarity index 100%
rename from tests/go/test_listremoveif.go
rename to tests/go/func/test_listremoveif.go
diff --git a/tests/go/test_listreverse.go b/tests/go/func/test_listreverse.go
similarity index 100%
rename from tests/go/test_listreverse.go
rename to tests/go/func/test_listreverse.go
diff --git a/tests/go/test_listsize.go b/tests/go/func/test_listsize.go
similarity index 100%
rename from tests/go/test_listsize.go
rename to tests/go/func/test_listsize.go
diff --git a/tests/go/test_listsort.go b/tests/go/func/test_listsort.go
similarity index 100%
rename from tests/go/test_listsort.go
rename to tests/go/func/test_listsort.go
diff --git a/tests/go/test_makerange.go b/tests/go/func/test_makerange.go
similarity index 100%
rename from tests/go/test_makerange.go
rename to tests/go/func/test_makerange.go
diff --git a/tests/go/test_map.go b/tests/go/func/test_map.go
similarity index 100%
rename from tests/go/test_map.go
rename to tests/go/func/test_map.go
diff --git a/tests/go/test_max.go b/tests/go/func/test_max.go
similarity index 100%
rename from tests/go/test_max.go
rename to tests/go/func/test_max.go
diff --git a/tests/go/test_nauuo.go b/tests/go/func/test_nauuo.go
similarity index 100%
rename from tests/go/test_nauuo.go
rename to tests/go/func/test_nauuo.go
diff --git a/tests/go/test_nrune.go b/tests/go/func/test_nrune.go
similarity index 100%
rename from tests/go/test_nrune.go
rename to tests/go/func/test_nrune.go
diff --git a/tests/go/test_printcomb.go b/tests/go/func/test_printcomb.go
similarity index 100%
rename from tests/go/test_printcomb.go
rename to tests/go/func/test_printcomb.go
diff --git a/tests/go/test_printcomb2.go b/tests/go/func/test_printcomb2.go
similarity index 100%
rename from tests/go/test_printcomb2.go
rename to tests/go/func/test_printcomb2.go
diff --git a/tests/go/test_printcombn.go b/tests/go/func/test_printcombn.go
similarity index 100%
rename from tests/go/test_printcombn.go
rename to tests/go/func/test_printcombn.go
diff --git a/tests/go/test_printmemory.go b/tests/go/func/test_printmemory.go
similarity index 100%
rename from tests/go/test_printmemory.go
rename to tests/go/func/test_printmemory.go
diff --git a/tests/go/test_printnbr.go b/tests/go/func/test_printnbr.go
similarity index 100%
rename from tests/go/test_printnbr.go
rename to tests/go/func/test_printnbr.go
diff --git a/tests/go/test_printnbrbase.go b/tests/go/func/test_printnbrbase.go
similarity index 100%
rename from tests/go/test_printnbrbase.go
rename to tests/go/func/test_printnbrbase.go
diff --git a/tests/go/test_printnbrinorder.go b/tests/go/func/test_printnbrinorder.go
similarity index 100%
rename from tests/go/test_printnbrinorder.go
rename to tests/go/func/test_printnbrinorder.go
diff --git a/tests/go/test_printstr.go b/tests/go/func/test_printstr.go
similarity index 100%
rename from tests/go/test_printstr.go
rename to tests/go/func/test_printstr.go
diff --git a/tests/go/test_printwordstables.go b/tests/go/func/test_printwordstables.go
similarity index 100%
rename from tests/go/test_printwordstables.go
rename to tests/go/func/test_printwordstables.go
diff --git a/tests/go/test_priorprime.go b/tests/go/func/test_priorprime.go
similarity index 100%
rename from tests/go/test_priorprime.go
rename to tests/go/func/test_priorprime.go
diff --git a/tests/go/test_raid1a.go b/tests/go/func/test_raid1a.go
similarity index 100%
rename from tests/go/test_raid1a.go
rename to tests/go/func/test_raid1a.go
diff --git a/tests/go/test_raid1b.go b/tests/go/func/test_raid1b.go
similarity index 100%
rename from tests/go/test_raid1b.go
rename to tests/go/func/test_raid1b.go
diff --git a/tests/go/test_raid1c.go b/tests/go/func/test_raid1c.go
similarity index 100%
rename from tests/go/test_raid1c.go
rename to tests/go/func/test_raid1c.go
diff --git a/tests/go/test_raid1d.go b/tests/go/func/test_raid1d.go
similarity index 100%
rename from tests/go/test_raid1d.go
rename to tests/go/func/test_raid1d.go
diff --git a/tests/go/test_raid1e.go b/tests/go/func/test_raid1e.go
similarity index 100%
rename from tests/go/test_raid1e.go
rename to tests/go/func/test_raid1e.go
diff --git a/tests/go/test_reachablenumber.go b/tests/go/func/test_reachablenumber.go
similarity index 100%
rename from tests/go/test_reachablenumber.go
rename to tests/go/func/test_reachablenumber.go
diff --git a/tests/go/test_recursivefactorial.go b/tests/go/func/test_recursivefactorial.go
similarity index 100%
rename from tests/go/test_recursivefactorial.go
rename to tests/go/func/test_recursivefactorial.go
diff --git a/tests/go/test_recursivepower.go b/tests/go/func/test_recursivepower.go
similarity index 100%
rename from tests/go/test_recursivepower.go
rename to tests/go/func/test_recursivepower.go
diff --git a/tests/go/test_reduceint.go b/tests/go/func/test_reduceint.go
similarity index 100%
rename from tests/go/test_reduceint.go
rename to tests/go/func/test_reduceint.go
diff --git a/tests/go/test_revivethreenums.go b/tests/go/func/test_revivethreenums.go
similarity index 100%
rename from tests/go/test_revivethreenums.go
rename to tests/go/func/test_revivethreenums.go
diff --git a/tests/go/test_rot14.go b/tests/go/func/test_rot14.go
similarity index 100%
rename from tests/go/test_rot14.go
rename to tests/go/func/test_rot14.go
diff --git a/tests/go/test_slice.go b/tests/go/func/test_slice.go
similarity index 100%
rename from tests/go/test_slice.go
rename to tests/go/func/test_slice.go
diff --git a/tests/go/test_sortedlistmerge.go b/tests/go/func/test_sortedlistmerge.go
similarity index 100%
rename from tests/go/test_sortedlistmerge.go
rename to tests/go/func/test_sortedlistmerge.go
diff --git a/tests/go/test_sortintegertable.go b/tests/go/func/test_sortintegertable.go
similarity index 100%
rename from tests/go/test_sortintegertable.go
rename to tests/go/func/test_sortintegertable.go
diff --git a/tests/go/test_sortlist.go b/tests/go/func/test_sortlist.go
similarity index 100%
rename from tests/go/test_sortlist.go
rename to tests/go/func/test_sortlist.go
diff --git a/tests/go/test_sortlistinsert.go b/tests/go/func/test_sortlistinsert.go
similarity index 100%
rename from tests/go/test_sortlistinsert.go
rename to tests/go/func/test_sortlistinsert.go
diff --git a/tests/go/test_sortwordarr.go b/tests/go/func/test_sortwordarr.go
similarity index 100%
rename from tests/go/test_sortwordarr.go
rename to tests/go/func/test_sortwordarr.go
diff --git a/tests/go/test_split.go b/tests/go/func/test_split.go
similarity index 100%
rename from tests/go/test_split.go
rename to tests/go/func/test_split.go
diff --git a/tests/go/test_splitwhitespaces.go b/tests/go/func/test_splitwhitespaces.go
similarity index 100%
rename from tests/go/test_splitwhitespaces.go
rename to tests/go/func/test_splitwhitespaces.go
diff --git a/tests/go/test_sqrt.go b/tests/go/func/test_sqrt.go
similarity index 100%
rename from tests/go/test_sqrt.go
rename to tests/go/func/test_sqrt.go
diff --git a/tests/go/test_strlen.go b/tests/go/func/test_strlen.go
similarity index 100%
rename from tests/go/test_strlen.go
rename to tests/go/func/test_strlen.go
diff --git a/tests/go/test_strrev.go b/tests/go/func/test_strrev.go
similarity index 100%
rename from tests/go/test_strrev.go
rename to tests/go/func/test_strrev.go
diff --git a/tests/go/test_swapbits.go b/tests/go/func/test_swapbits.go
similarity index 100%
rename from tests/go/test_swapbits.go
rename to tests/go/func/test_swapbits.go
diff --git a/tests/go/test_sweetproblem.go b/tests/go/func/test_sweetproblem.go
similarity index 100%
rename from tests/go/test_sweetproblem.go
rename to tests/go/func/test_sweetproblem.go
diff --git a/tests/go/test_tolower.go b/tests/go/func/test_tolower.go
similarity index 100%
rename from tests/go/test_tolower.go
rename to tests/go/func/test_tolower.go
diff --git a/tests/go/test_toupper.go b/tests/go/func/test_toupper.go
similarity index 100%
rename from tests/go/test_toupper.go
rename to tests/go/func/test_toupper.go
diff --git a/tests/go/test_trimatoi.go b/tests/go/func/test_trimatoi.go
similarity index 100%
rename from tests/go/test_trimatoi.go
rename to tests/go/func/test_trimatoi.go
diff --git a/tests/go/test_twosum.go b/tests/go/func/test_twosum.go
similarity index 100%
rename from tests/go/test_twosum.go
rename to tests/go/func/test_twosum.go
diff --git a/tests/go/test_unmatch.go b/tests/go/func/test_unmatch.go
similarity index 100%
rename from tests/go/test_unmatch.go
rename to tests/go/func/test_unmatch.go
diff --git a/tests/go/test_volumechanger.go b/tests/go/func/test_volumechanger.go
similarity index 100%
rename from tests/go/test_volumechanger.go
rename to tests/go/func/test_volumechanger.go