diff --git a/go/tests/abort/main.go b/go/src/abort/main.go
similarity index 100%
rename from go/tests/abort/main.go
rename to go/src/abort/main.go
diff --git a/go/tests/activebits/main.go b/go/src/activebits/main.go
similarity index 100%
rename from go/tests/activebits/main.go
rename to go/src/activebits/main.go
diff --git a/go/tests/addprimesum/addprimesum_correct/main.go b/go/src/addprimesum/addprimesum_correct/main.go
similarity index 100%
rename from go/tests/addprimesum/addprimesum_correct/main.go
rename to go/src/addprimesum/addprimesum_correct/main.go
diff --git a/go/tests/addprimesum/main.go b/go/src/addprimesum/main.go
similarity index 100%
rename from go/tests/addprimesum/main.go
rename to go/src/addprimesum/main.go
diff --git a/go/tests/advancedsortwordarr/main.go b/go/src/advancedsortwordarr/main.go
similarity index 100%
rename from go/tests/advancedsortwordarr/main.go
rename to go/src/advancedsortwordarr/main.go
diff --git a/go/tests/alphacount/main.go b/go/src/alphacount/main.go
similarity index 100%
rename from go/tests/alphacount/main.go
rename to go/src/alphacount/main.go
diff --git a/go/tests/alphamirror/alphamirror_correct/main.go b/go/src/alphamirror/alphamirror_correct/main.go
similarity index 100%
rename from go/tests/alphamirror/alphamirror_correct/main.go
rename to go/src/alphamirror/alphamirror_correct/main.go
diff --git a/go/tests/alphamirror/main.go b/go/src/alphamirror/main.go
similarity index 100%
rename from go/tests/alphamirror/main.go
rename to go/src/alphamirror/main.go
diff --git a/go/tests/any/main.go b/go/src/any/main.go
similarity index 100%
rename from go/tests/any/main.go
rename to go/src/any/main.go
diff --git a/go/tests/appendrange/main.go b/go/src/appendrange/main.go
similarity index 100%
rename from go/tests/appendrange/main.go
rename to go/src/appendrange/main.go
diff --git a/go/tests/atoi/main.go b/go/src/atoi/main.go
similarity index 100%
rename from go/tests/atoi/main.go
rename to go/src/atoi/main.go
diff --git a/go/tests/balancedstring/balancedstring_correct/main.go b/go/src/balancedstring/balancedstring_correct/main.go
similarity index 100%
rename from go/tests/balancedstring/balancedstring_correct/main.go
rename to go/src/balancedstring/balancedstring_correct/main.go
diff --git a/go/tests/balancedstring/main.go b/go/src/balancedstring/main.go
similarity index 100%
rename from go/tests/balancedstring/main.go
rename to go/src/balancedstring/main.go
diff --git a/go/tests/basicatoi/main.go b/go/src/basicatoi/main.go
similarity index 100%
rename from go/tests/basicatoi/main.go
rename to go/src/basicatoi/main.go
diff --git a/go/tests/basicatoi2/main.go b/go/src/basicatoi2/main.go
similarity index 100%
rename from go/tests/basicatoi2/main.go
rename to go/src/basicatoi2/main.go
diff --git a/go/tests/basicjoin/main.go b/go/src/basicjoin/main.go
similarity index 100%
rename from go/tests/basicjoin/main.go
rename to go/src/basicjoin/main.go
diff --git a/go/tests/benchmark.sh b/go/src/benchmark.sh
similarity index 100%
rename from go/tests/benchmark.sh
rename to go/src/benchmark.sh
diff --git a/go/tests/boolean/boolean_correct/main.go b/go/src/boolean/boolean_correct/main.go
similarity index 100%
rename from go/tests/boolean/boolean_correct/main.go
rename to go/src/boolean/boolean_correct/main.go
diff --git a/go/tests/boolean/main.go b/go/src/boolean/main.go
similarity index 100%
rename from go/tests/boolean/main.go
rename to go/src/boolean/main.go
diff --git a/go/tests/brackets/brackets_correct/main.go b/go/src/brackets/brackets_correct/main.go
similarity index 100%
rename from go/tests/brackets/brackets_correct/main.go
rename to go/src/brackets/brackets_correct/main.go
diff --git a/go/tests/brackets/main.go b/go/src/brackets/main.go
similarity index 100%
rename from go/tests/brackets/main.go
rename to go/src/brackets/main.go
diff --git a/go/tests/brainfuck/brainfuck_correct/main.go b/go/src/brainfuck/brainfuck_correct/main.go
similarity index 100%
rename from go/tests/brainfuck/brainfuck_correct/main.go
rename to go/src/brainfuck/brainfuck_correct/main.go
diff --git a/go/tests/brainfuck/main.go b/go/src/brainfuck/main.go
similarity index 100%
rename from go/tests/brainfuck/main.go
rename to go/src/brainfuck/main.go
diff --git a/go/tests/capitalize/main.go b/go/src/capitalize/main.go
similarity index 100%
rename from go/tests/capitalize/main.go
rename to go/src/capitalize/main.go
diff --git a/go/tests/chunk/main.go b/go/src/chunk/main.go
similarity index 100%
rename from go/tests/chunk/main.go
rename to go/src/chunk/main.go
diff --git a/go/tests/clean.sh b/go/src/clean.sh
similarity index 100%
rename from go/tests/clean.sh
rename to go/src/clean.sh
diff --git a/go/tests/cleanstr/cleanstr_correct/main.go b/go/src/cleanstr/cleanstr_correct/main.go
similarity index 100%
rename from go/tests/cleanstr/cleanstr_correct/main.go
rename to go/src/cleanstr/cleanstr_correct/main.go
diff --git a/go/tests/cleanstr/main.go b/go/src/cleanstr/main.go
similarity index 100%
rename from go/tests/cleanstr/main.go
rename to go/src/cleanstr/main.go
diff --git a/go/tests/collatzcountdown/main.go b/go/src/collatzcountdown/main.go
similarity index 100%
rename from go/tests/collatzcountdown/main.go
rename to go/src/collatzcountdown/main.go
diff --git a/go/tests/comcheck/comcheck_correct/main.go b/go/src/comcheck/comcheck_correct/main.go
similarity index 100%
rename from go/tests/comcheck/comcheck_correct/main.go
rename to go/src/comcheck/comcheck_correct/main.go
diff --git a/go/tests/comcheck/main.go b/go/src/comcheck/main.go
similarity index 100%
rename from go/tests/comcheck/main.go
rename to go/src/comcheck/main.go
diff --git a/go/tests/compact/main.go b/go/src/compact/main.go
similarity index 100%
rename from go/tests/compact/main.go
rename to go/src/compact/main.go
diff --git a/go/tests/compare/main.go b/go/src/compare/main.go
similarity index 100%
rename from go/tests/compare/main.go
rename to go/src/compare/main.go
diff --git a/go/tests/concat/main.go b/go/src/concat/main.go
similarity index 100%
rename from go/tests/concat/main.go
rename to go/src/concat/main.go
diff --git a/go/tests/concatparams/main.go b/go/src/concatparams/main.go
similarity index 100%
rename from go/tests/concatparams/main.go
rename to go/src/concatparams/main.go
diff --git a/go/tests/costumeprofit/costumeprofit_correct/main.go b/go/src/costumeprofit/costumeprofit_correct/main.go
similarity index 100%
rename from go/tests/costumeprofit/costumeprofit_correct/main.go
rename to go/src/costumeprofit/costumeprofit_correct/main.go
diff --git a/go/tests/costumeprofit/main.go b/go/src/costumeprofit/main.go
similarity index 100%
rename from go/tests/costumeprofit/main.go
rename to go/src/costumeprofit/main.go
diff --git a/go/tests/countdown/countdown_correct/main.go b/go/src/countdown/countdown_correct/main.go
similarity index 100%
rename from go/tests/countdown/countdown_correct/main.go
rename to go/src/countdown/countdown_correct/main.go
diff --git a/go/tests/countdown/main.go b/go/src/countdown/main.go
similarity index 100%
rename from go/tests/countdown/main.go
rename to go/src/countdown/main.go
diff --git a/go/tests/countif/main.go b/go/src/countif/main.go
similarity index 100%
rename from go/tests/countif/main.go
rename to go/src/countif/main.go
diff --git a/go/tests/displaya/displaya_correct/main.go b/go/src/displaya/displaya_correct/main.go
similarity index 100%
rename from go/tests/displaya/displaya_correct/main.go
rename to go/src/displaya/displaya_correct/main.go
diff --git a/go/tests/displaya/main.go b/go/src/displaya/main.go
similarity index 100%
rename from go/tests/displaya/main.go
rename to go/src/displaya/main.go
diff --git a/go/tests/displayalpham/displayalpham_correct/main.go b/go/src/displayalpham/displayalpham_correct/main.go
similarity index 100%
rename from go/tests/displayalpham/displayalpham_correct/main.go
rename to go/src/displayalpham/displayalpham_correct/main.go
diff --git a/go/tests/displayalpham/main.go b/go/src/displayalpham/main.go
similarity index 100%
rename from go/tests/displayalpham/main.go
rename to go/src/displayalpham/main.go
diff --git a/go/tests/displayalrevm/displayalrevm_correct/main.go b/go/src/displayalrevm/displayalrevm_correct/main.go
similarity index 100%
rename from go/tests/displayalrevm/displayalrevm_correct/main.go
rename to go/src/displayalrevm/displayalrevm_correct/main.go
diff --git a/go/tests/displayalrevm/main.go b/go/src/displayalrevm/main.go
similarity index 100%
rename from go/tests/displayalrevm/main.go
rename to go/src/displayalrevm/main.go
diff --git a/go/tests/displayfirstparam/displayfirstparam_correct/main.go b/go/src/displayfirstparam/displayfirstparam_correct/main.go
similarity index 100%
rename from go/tests/displayfirstparam/displayfirstparam_correct/main.go
rename to go/src/displayfirstparam/displayfirstparam_correct/main.go
diff --git a/go/tests/displayfirstparam/main.go b/go/src/displayfirstparam/main.go
similarity index 100%
rename from go/tests/displayfirstparam/main.go
rename to go/src/displayfirstparam/main.go
diff --git a/go/tests/displaylastparam/displaylastparam_correct/main.go b/go/src/displaylastparam/displaylastparam_correct/main.go
similarity index 100%
rename from go/tests/displaylastparam/displaylastparam_correct/main.go
rename to go/src/displaylastparam/displaylastparam_correct/main.go
diff --git a/go/tests/displaylastparam/main.go b/go/src/displaylastparam/main.go
similarity index 100%
rename from go/tests/displaylastparam/main.go
rename to go/src/displaylastparam/main.go
diff --git a/go/tests/displayz/displayz_correct/main.go b/go/src/displayz/displayz_correct/main.go
similarity index 100%
rename from go/tests/displayz/displayz_correct/main.go
rename to go/src/displayz/displayz_correct/main.go
diff --git a/go/tests/displayz/main.go b/go/src/displayz/main.go
similarity index 100%
rename from go/tests/displayz/main.go
rename to go/src/displayz/main.go
diff --git a/go/tests/divmod/main.go b/go/src/divmod/main.go
similarity index 100%
rename from go/tests/divmod/main.go
rename to go/src/divmod/main.go
diff --git a/go/tests/doop/doop_correct/main.go b/go/src/doop/doop_correct/main.go
similarity index 100%
rename from go/tests/doop/doop_correct/main.go
rename to go/src/doop/doop_correct/main.go
diff --git a/go/tests/doop/main.go b/go/src/doop/main.go
similarity index 100%
rename from go/tests/doop/main.go
rename to go/src/doop/main.go
diff --git a/go/tests/doppelganger/main.go b/go/src/doppelganger/main.go
similarity index 100%
rename from go/tests/doppelganger/main.go
rename to go/src/doppelganger/main.go
diff --git a/go/tests/eightqueens/main.go b/go/src/eightqueens/main.go
similarity index 100%
rename from go/tests/eightqueens/main.go
rename to go/src/eightqueens/main.go
diff --git a/go/tests/enigma/main.go b/go/src/enigma/main.go
similarity index 100%
rename from go/tests/enigma/main.go
rename to go/src/enigma/main.go
diff --git a/go/tests/expandstr/expandstr_correct/main.go b/go/src/expandstr/expandstr_correct/main.go
similarity index 100%
rename from go/tests/expandstr/expandstr_correct/main.go
rename to go/src/expandstr/expandstr_correct/main.go
diff --git a/go/tests/expandstr/main.go b/go/src/expandstr/main.go
similarity index 100%
rename from go/tests/expandstr/main.go
rename to go/src/expandstr/main.go
diff --git a/go/tests/fib/main.go b/go/src/fib/main.go
similarity index 100%
rename from go/tests/fib/main.go
rename to go/src/fib/main.go
diff --git a/go/tests/fibonacci/main.go b/go/src/fibonacci/main.go
similarity index 100%
rename from go/tests/fibonacci/main.go
rename to go/src/fibonacci/main.go
diff --git a/go/tests/findnextprime/main.go b/go/src/findnextprime/main.go
similarity index 100%
rename from go/tests/findnextprime/main.go
rename to go/src/findnextprime/main.go
diff --git a/go/tests/findprevprime/main.go b/go/src/findprevprime/main.go
similarity index 100%
rename from go/tests/findprevprime/main.go
rename to go/src/findprevprime/main.go
diff --git a/go/tests/firstrune/main.go b/go/src/firstrune/main.go
similarity index 100%
rename from go/tests/firstrune/main.go
rename to go/src/firstrune/main.go
diff --git a/go/tests/firstword/firstword_correct/main.go b/go/src/firstword/firstword_correct/main.go
similarity index 100%
rename from go/tests/firstword/firstword_correct/main.go
rename to go/src/firstword/firstword_correct/main.go
diff --git a/go/tests/firstword/main.go b/go/src/firstword/main.go
similarity index 100%
rename from go/tests/firstword/main.go
rename to go/src/firstword/main.go
diff --git a/go/tests/fixthemain/fixthemain_correct/main.go b/go/src/fixthemain/fixthemain_correct/main.go
similarity index 100%
rename from go/tests/fixthemain/fixthemain_correct/main.go
rename to go/src/fixthemain/fixthemain_correct/main.go
diff --git a/go/tests/fixthemain/main.go b/go/src/fixthemain/main.go
similarity index 100%
rename from go/tests/fixthemain/main.go
rename to go/src/fixthemain/main.go
diff --git a/go/tests/flags/flags_correct/main.go b/go/src/flags/flags_correct/main.go
similarity index 100%
rename from go/tests/flags/flags_correct/main.go
rename to go/src/flags/flags_correct/main.go
diff --git a/go/tests/flags/main.go b/go/src/flags/main.go
similarity index 100%
rename from go/tests/flags/main.go
rename to go/src/flags/main.go
diff --git a/go/tests/foldint/main.go b/go/src/foldint/main.go
similarity index 100%
rename from go/tests/foldint/main.go
rename to go/src/foldint/main.go
diff --git a/go/tests/foreach/main.go b/go/src/foreach/main.go
similarity index 100%
rename from go/tests/foreach/main.go
rename to go/src/foreach/main.go
diff --git a/go/tests/fprime/fprime_correct/main.go b/go/src/fprime/fprime_correct/main.go
similarity index 100%
rename from go/tests/fprime/fprime_correct/main.go
rename to go/src/fprime/fprime_correct/main.go
diff --git a/go/tests/fprime/main.go b/go/src/fprime/main.go
similarity index 100%
rename from go/tests/fprime/main.go
rename to go/src/fprime/main.go
diff --git a/go/tests/game23/main.go b/go/src/game23/main.go
similarity index 100%
rename from go/tests/game23/main.go
rename to go/src/game23/main.go
diff --git a/go/tests/gcd/gcd_correct/main.go b/go/src/gcd/gcd_correct/main.go
similarity index 100%
rename from go/tests/gcd/gcd_correct/main.go
rename to go/src/gcd/gcd_correct/main.go
diff --git a/go/tests/gcd/main.go b/go/src/gcd/main.go
similarity index 100%
rename from go/tests/gcd/main.go
rename to go/src/gcd/main.go
diff --git a/go/tests/grouping/grouping_correct/main.go b/go/src/grouping/grouping_correct/main.go
similarity index 100%
rename from go/tests/grouping/grouping_correct/main.go
rename to go/src/grouping/grouping_correct/main.go
diff --git a/go/tests/grouping/main.go b/go/src/grouping/main.go
similarity index 100%
rename from go/tests/grouping/main.go
rename to go/src/grouping/main.go
diff --git a/go/tests/halfcontest/main.go b/go/src/halfcontest/main.go
similarity index 100%
rename from go/tests/halfcontest/main.go
rename to go/src/halfcontest/main.go
diff --git a/go/tests/hello/hello_correct/main.go b/go/src/hello/hello_correct/main.go
similarity index 100%
rename from go/tests/hello/hello_correct/main.go
rename to go/src/hello/hello_correct/main.go
diff --git a/go/tests/hello/main.go b/go/src/hello/main.go
similarity index 100%
rename from go/tests/hello/main.go
rename to go/src/hello/main.go
diff --git a/go/tests/hiddenp/hiddenp_correct/main.go b/go/src/hiddenp/hiddenp_correct/main.go
similarity index 100%
rename from go/tests/hiddenp/hiddenp_correct/main.go
rename to go/src/hiddenp/hiddenp_correct/main.go
diff --git a/go/tests/hiddenp/main.go b/go/src/hiddenp/main.go
similarity index 100%
rename from go/tests/hiddenp/main.go
rename to go/src/hiddenp/main.go
diff --git a/go/tests/index/main.go b/go/src/index/main.go
similarity index 100%
rename from go/tests/index/main.go
rename to go/src/index/main.go
diff --git a/go/tests/inter/inter_correct/main.go b/go/src/inter/inter_correct/main.go
similarity index 100%
rename from go/tests/inter/inter_correct/main.go
rename to go/src/inter/inter_correct/main.go
diff --git a/go/tests/inter/main.go b/go/src/inter/main.go
similarity index 100%
rename from go/tests/inter/main.go
rename to go/src/inter/main.go
diff --git a/go/tests/interestingnumber/main.go b/go/src/interestingnumber/main.go
similarity index 100%
rename from go/tests/interestingnumber/main.go
rename to go/src/interestingnumber/main.go
diff --git a/go/tests/isalpha/main.go b/go/src/isalpha/main.go
similarity index 100%
rename from go/tests/isalpha/main.go
rename to go/src/isalpha/main.go
diff --git a/go/tests/isanagram/main.go b/go/src/isanagram/main.go
similarity index 100%
rename from go/tests/isanagram/main.go
rename to go/src/isanagram/main.go
diff --git a/go/tests/islower/main.go b/go/src/islower/main.go
similarity index 100%
rename from go/tests/islower/main.go
rename to go/src/islower/main.go
diff --git a/go/tests/isnegative/main.go b/go/src/isnegative/main.go
similarity index 100%
rename from go/tests/isnegative/main.go
rename to go/src/isnegative/main.go
diff --git a/go/tests/isnumeric/main.go b/go/src/isnumeric/main.go
similarity index 100%
rename from go/tests/isnumeric/main.go
rename to go/src/isnumeric/main.go
diff --git a/go/tests/ispowerof2/ispowerof2_correct/main.go b/go/src/ispowerof2/ispowerof2_correct/main.go
similarity index 100%
rename from go/tests/ispowerof2/ispowerof2_correct/main.go
rename to go/src/ispowerof2/ispowerof2_correct/main.go
diff --git a/go/tests/ispowerof2/main.go b/go/src/ispowerof2/main.go
similarity index 100%
rename from go/tests/ispowerof2/main.go
rename to go/src/ispowerof2/main.go
diff --git a/go/tests/isprime/main.go b/go/src/isprime/main.go
similarity index 100%
rename from go/tests/isprime/main.go
rename to go/src/isprime/main.go
diff --git a/go/tests/isprintable/main.go b/go/src/isprintable/main.go
similarity index 100%
rename from go/tests/isprintable/main.go
rename to go/src/isprintable/main.go
diff --git a/go/tests/issorted/main.go b/go/src/issorted/main.go
similarity index 100%
rename from go/tests/issorted/main.go
rename to go/src/issorted/main.go
diff --git a/go/tests/isupper/main.go b/go/src/isupper/main.go
similarity index 100%
rename from go/tests/isupper/main.go
rename to go/src/isupper/main.go
diff --git a/go/tests/iterativefactorial/main.go b/go/src/iterativefactorial/main.go
similarity index 100%
rename from go/tests/iterativefactorial/main.go
rename to go/src/iterativefactorial/main.go
diff --git a/go/tests/iterativepower/main.go b/go/src/iterativepower/main.go
similarity index 100%
rename from go/tests/iterativepower/main.go
rename to go/src/iterativepower/main.go
diff --git a/go/tests/itoa/main.go b/go/src/itoa/main.go
similarity index 100%
rename from go/tests/itoa/main.go
rename to go/src/itoa/main.go
diff --git a/go/tests/itoabase/main.go b/go/src/itoabase/main.go
similarity index 100%
rename from go/tests/itoabase/main.go
rename to go/src/itoabase/main.go
diff --git a/go/tests/join/main.go b/go/src/join/main.go
similarity index 100%
rename from go/tests/join/main.go
rename to go/src/join/main.go
diff --git a/go/tests/lastrune/main.go b/go/src/lastrune/main.go
similarity index 100%
rename from go/tests/lastrune/main.go
rename to go/src/lastrune/main.go
diff --git a/go/tests/lastword/lastword_correct/main.go b/go/src/lastword/lastword_correct/main.go
similarity index 100%
rename from go/tests/lastword/lastword_correct/main.go
rename to go/src/lastword/lastword_correct/main.go
diff --git a/go/tests/lastword/main.go b/go/src/lastword/main.go
similarity index 100%
rename from go/tests/lastword/main.go
rename to go/src/lastword/main.go
diff --git a/go/tests/lcm/main.go b/go/src/lcm/main.go
similarity index 100%
rename from go/tests/lcm/main.go
rename to go/src/lcm/main.go
diff --git a/go/lib/is/is.go b/go/src/lib/is/is.go
similarity index 100%
rename from go/lib/is/is.go
rename to go/src/lib/is/is.go
diff --git a/go/lib/lib.go b/go/src/lib/lib.go
similarity index 100%
rename from go/lib/lib.go
rename to go/src/lib/lib.go
diff --git a/go/tests/makerange/main.go b/go/src/makerange/main.go
similarity index 100%
rename from go/tests/makerange/main.go
rename to go/src/makerange/main.go
diff --git a/go/tests/map/main.go b/go/src/map/main.go
similarity index 100%
rename from go/tests/map/main.go
rename to go/src/map/main.go
diff --git a/go/tests/max/main.go b/go/src/max/main.go
similarity index 100%
rename from go/tests/max/main.go
rename to go/src/max/main.go
diff --git a/go/tests/nauuo/main.go b/go/src/nauuo/main.go
similarity index 100%
rename from go/tests/nauuo/main.go
rename to go/src/nauuo/main.go
diff --git a/go/tests/nbrconvertalpha/main.go b/go/src/nbrconvertalpha/main.go
similarity index 100%
rename from go/tests/nbrconvertalpha/main.go
rename to go/src/nbrconvertalpha/main.go
diff --git a/go/tests/nbrconvertalpha/nbrconvertalpha_correct/main.go b/go/src/nbrconvertalpha/nbrconvertalpha_correct/main.go
similarity index 100%
rename from go/tests/nbrconvertalpha/nbrconvertalpha_correct/main.go
rename to go/src/nbrconvertalpha/nbrconvertalpha_correct/main.go
diff --git a/go/tests/nenokku/main.go b/go/src/nenokku/main.go
similarity index 100%
rename from go/tests/nenokku/main.go
rename to go/src/nenokku/main.go
diff --git a/go/tests/nenokku/nenokku_correct/main.go b/go/src/nenokku/nenokku_correct/main.go
similarity index 100%
rename from go/tests/nenokku/nenokku_correct/main.go
rename to go/src/nenokku/nenokku_correct/main.go
diff --git a/go/tests/nrune/main.go b/go/src/nrune/main.go
similarity index 100%
rename from go/tests/nrune/main.go
rename to go/src/nrune/main.go
diff --git a/go/tests/onlya/main.go b/go/src/onlya/main.go
similarity index 100%
rename from go/tests/onlya/main.go
rename to go/src/onlya/main.go
diff --git a/go/tests/onlya/onlya_correct/main.go b/go/src/onlya/onlya_correct/main.go
similarity index 100%
rename from go/tests/onlya/onlya_correct/main.go
rename to go/src/onlya/onlya_correct/main.go
diff --git a/go/tests/onlyz/main.go b/go/src/onlyz/main.go
similarity index 100%
rename from go/tests/onlyz/main.go
rename to go/src/onlyz/main.go
diff --git a/go/tests/onlyz/onlyz_correct/main.go b/go/src/onlyz/onlyz_correct/main.go
similarity index 100%
rename from go/tests/onlyz/onlyz_correct/main.go
rename to go/src/onlyz/onlyz_correct/main.go
diff --git a/go/tests/options/main.go b/go/src/options/main.go
similarity index 100%
rename from go/tests/options/main.go
rename to go/src/options/main.go
diff --git a/go/tests/options/options_correct/main.go b/go/src/options/options_correct/main.go
similarity index 100%
rename from go/tests/options/options_correct/main.go
rename to go/src/options/options_correct/main.go
diff --git a/go/tests/paramcount/main.go b/go/src/paramcount/main.go
similarity index 100%
rename from go/tests/paramcount/main.go
rename to go/src/paramcount/main.go
diff --git a/go/tests/paramcount/paramcount_correct/main.go b/go/src/paramcount/paramcount_correct/main.go
similarity index 100%
rename from go/tests/paramcount/paramcount_correct/main.go
rename to go/src/paramcount/paramcount_correct/main.go
diff --git a/go/tests/piglatin/main.go b/go/src/piglatin/main.go
similarity index 100%
rename from go/tests/piglatin/main.go
rename to go/src/piglatin/main.go
diff --git a/go/tests/piglatin/piglatin_correct/main.go b/go/src/piglatin/piglatin_correct/main.go
similarity index 100%
rename from go/tests/piglatin/piglatin_correct/main.go
rename to go/src/piglatin/piglatin_correct/main.go
diff --git a/go/tests/point/main.go b/go/src/point/main.go
similarity index 100%
rename from go/tests/point/main.go
rename to go/src/point/main.go
diff --git a/go/tests/point/point_correct/main.go b/go/src/point/point_correct/main.go
similarity index 100%
rename from go/tests/point/point_correct/main.go
rename to go/src/point/point_correct/main.go
diff --git a/go/tests/pointone/main.go b/go/src/pointone/main.go
similarity index 100%
rename from go/tests/pointone/main.go
rename to go/src/pointone/main.go
diff --git a/go/tests/printalphabet/main.go b/go/src/printalphabet/main.go
similarity index 100%
rename from go/tests/printalphabet/main.go
rename to go/src/printalphabet/main.go
diff --git a/go/tests/printalphabet/printalphabet_correct/main.go b/go/src/printalphabet/printalphabet_correct/main.go
similarity index 100%
rename from go/tests/printalphabet/printalphabet_correct/main.go
rename to go/src/printalphabet/printalphabet_correct/main.go
diff --git a/go/tests/printbits/main.go b/go/src/printbits/main.go
similarity index 100%
rename from go/tests/printbits/main.go
rename to go/src/printbits/main.go
diff --git a/go/tests/printbits/printbits_correct/main.go b/go/src/printbits/printbits_correct/main.go
similarity index 100%
rename from go/tests/printbits/printbits_correct/main.go
rename to go/src/printbits/printbits_correct/main.go
diff --git a/go/tests/printchessboard/main.go b/go/src/printchessboard/main.go
similarity index 100%
rename from go/tests/printchessboard/main.go
rename to go/src/printchessboard/main.go
diff --git a/go/tests/printchessboard/printchessboard_correct/main.go b/go/src/printchessboard/printchessboard_correct/main.go
similarity index 100%
rename from go/tests/printchessboard/printchessboard_correct/main.go
rename to go/src/printchessboard/printchessboard_correct/main.go
diff --git a/go/tests/printcomb/main.go b/go/src/printcomb/main.go
similarity index 100%
rename from go/tests/printcomb/main.go
rename to go/src/printcomb/main.go
diff --git a/go/tests/printcomb2/main.go b/go/src/printcomb2/main.go
similarity index 100%
rename from go/tests/printcomb2/main.go
rename to go/src/printcomb2/main.go
diff --git a/go/tests/printcombn/main.go b/go/src/printcombn/main.go
similarity index 100%
rename from go/tests/printcombn/main.go
rename to go/src/printcombn/main.go
diff --git a/go/tests/printdigits/main.go b/go/src/printdigits/main.go
similarity index 100%
rename from go/tests/printdigits/main.go
rename to go/src/printdigits/main.go
diff --git a/go/tests/printdigits/printdigits_correct/main.go b/go/src/printdigits/printdigits_correct/main.go
similarity index 100%
rename from go/tests/printdigits/printdigits_correct/main.go
rename to go/src/printdigits/printdigits_correct/main.go
diff --git a/go/tests/printhex/main.go b/go/src/printhex/main.go
similarity index 100%
rename from go/tests/printhex/main.go
rename to go/src/printhex/main.go
diff --git a/go/tests/printhex/printhex_correct/main.go b/go/src/printhex/printhex_correct/main.go
similarity index 100%
rename from go/tests/printhex/printhex_correct/main.go
rename to go/src/printhex/printhex_correct/main.go
diff --git a/go/tests/printmemory/main.go b/go/src/printmemory/main.go
similarity index 100%
rename from go/tests/printmemory/main.go
rename to go/src/printmemory/main.go
diff --git a/go/tests/printnbr/main.go b/go/src/printnbr/main.go
similarity index 100%
rename from go/tests/printnbr/main.go
rename to go/src/printnbr/main.go
diff --git a/go/tests/printnbrinorder/main.go b/go/src/printnbrinorder/main.go
similarity index 100%
rename from go/tests/printnbrinorder/main.go
rename to go/src/printnbrinorder/main.go
diff --git a/go/tests/printparams/main.go b/go/src/printparams/main.go
similarity index 100%
rename from go/tests/printparams/main.go
rename to go/src/printparams/main.go
diff --git a/go/tests/printparams/printparams_correct/main.go b/go/src/printparams/printparams_correct/main.go
similarity index 100%
rename from go/tests/printparams/printparams_correct/main.go
rename to go/src/printparams/printparams_correct/main.go
diff --git a/go/tests/printprogramname/main.go b/go/src/printprogramname/main.go
similarity index 100%
rename from go/tests/printprogramname/main.go
rename to go/src/printprogramname/main.go
diff --git a/go/tests/printprogramname/printprogramname_correct/main.go b/go/src/printprogramname/printprogramname_correct/main.go
similarity index 100%
rename from go/tests/printprogramname/printprogramname_correct/main.go
rename to go/src/printprogramname/printprogramname_correct/main.go
diff --git a/go/tests/printrevcomb/main.go b/go/src/printrevcomb/main.go
similarity index 100%
rename from go/tests/printrevcomb/main.go
rename to go/src/printrevcomb/main.go
diff --git a/go/tests/printrevcomb/printrevcomb_correct/main.go b/go/src/printrevcomb/printrevcomb_correct/main.go
similarity index 100%
rename from go/tests/printrevcomb/printrevcomb_correct/main.go
rename to go/src/printrevcomb/printrevcomb_correct/main.go
diff --git a/go/tests/printreversealphabet/main.go b/go/src/printreversealphabet/main.go
similarity index 100%
rename from go/tests/printreversealphabet/main.go
rename to go/src/printreversealphabet/main.go
diff --git a/go/tests/printreversealphabet/printreversealphabet_correct/main.go b/go/src/printreversealphabet/printreversealphabet_correct/main.go
similarity index 100%
rename from go/tests/printreversealphabet/printreversealphabet_correct/main.go
rename to go/src/printreversealphabet/printreversealphabet_correct/main.go
diff --git a/go/tests/printstr/main.go b/go/src/printstr/main.go
similarity index 100%
rename from go/tests/printstr/main.go
rename to go/src/printstr/main.go
diff --git a/go/tests/printwordstables/main.go b/go/src/printwordstables/main.go
similarity index 100%
rename from go/tests/printwordstables/main.go
rename to go/src/printwordstables/main.go
diff --git a/go/tests/priorprime/main.go b/go/src/priorprime/main.go
similarity index 100%
rename from go/tests/priorprime/main.go
rename to go/src/priorprime/main.go
diff --git a/go/tests/raid1a/main.go b/go/src/raid1a/main.go
similarity index 100%
rename from go/tests/raid1a/main.go
rename to go/src/raid1a/main.go
diff --git a/go/tests/raid1b/main.go b/go/src/raid1b/main.go
similarity index 100%
rename from go/tests/raid1b/main.go
rename to go/src/raid1b/main.go
diff --git a/go/tests/raid1c/main.go b/go/src/raid1c/main.go
similarity index 100%
rename from go/tests/raid1c/main.go
rename to go/src/raid1c/main.go
diff --git a/go/tests/raid1d/main.go b/go/src/raid1d/main.go
similarity index 100%
rename from go/tests/raid1d/main.go
rename to go/src/raid1d/main.go
diff --git a/go/tests/raid1e/main.go b/go/src/raid1e/main.go
similarity index 100%
rename from go/tests/raid1e/main.go
rename to go/src/raid1e/main.go
diff --git a/go/tests/raid2/main.go b/go/src/raid2/main.go
similarity index 100%
rename from go/tests/raid2/main.go
rename to go/src/raid2/main.go
diff --git a/go/tests/raid2/raid2_correct/main.go b/go/src/raid2/raid2_correct/main.go
similarity index 100%
rename from go/tests/raid2/raid2_correct/main.go
rename to go/src/raid2/raid2_correct/main.go
diff --git a/go/tests/range/main.go b/go/src/range/main.go
similarity index 100%
rename from go/tests/range/main.go
rename to go/src/range/main.go
diff --git a/go/tests/range/range_correct/main.go b/go/src/range/range_correct/main.go
similarity index 100%
rename from go/tests/range/range_correct/main.go
rename to go/src/range/range_correct/main.go
diff --git a/go/rc/README.md b/go/src/rc/README.md
similarity index 100%
rename from go/rc/README.md
rename to go/src/rc/README.md
diff --git a/go/rc/rc.go b/go/src/rc/rc.go
similarity index 100%
rename from go/rc/rc.go
rename to go/src/rc/rc.go
diff --git a/go/tests/reachablenumber/main.go b/go/src/reachablenumber/main.go
similarity index 100%
rename from go/tests/reachablenumber/main.go
rename to go/src/reachablenumber/main.go
diff --git a/go/tests/rectangle/main.go b/go/src/rectangle/main.go
similarity index 100%
rename from go/tests/rectangle/main.go
rename to go/src/rectangle/main.go
diff --git a/go/tests/rectangle/rectangle_correct/main.go b/go/src/rectangle/rectangle_correct/main.go
similarity index 100%
rename from go/tests/rectangle/rectangle_correct/main.go
rename to go/src/rectangle/rectangle_correct/main.go
diff --git a/go/tests/recursivefactorial/main.go b/go/src/recursivefactorial/main.go
similarity index 100%
rename from go/tests/recursivefactorial/main.go
rename to go/src/recursivefactorial/main.go
diff --git a/go/tests/recursivepower/main.go b/go/src/recursivepower/main.go
similarity index 100%
rename from go/tests/recursivepower/main.go
rename to go/src/recursivepower/main.go
diff --git a/go/tests/reduceint/main.go b/go/src/reduceint/main.go
similarity index 100%
rename from go/tests/reduceint/main.go
rename to go/src/reduceint/main.go
diff --git a/go/tests/repeatalpha/main.go b/go/src/repeatalpha/main.go
similarity index 100%
rename from go/tests/repeatalpha/main.go
rename to go/src/repeatalpha/main.go
diff --git a/go/tests/repeatalpha/repeatalpha_correct/main.go b/go/src/repeatalpha/repeatalpha_correct/main.go
similarity index 100%
rename from go/tests/repeatalpha/repeatalpha_correct/main.go
rename to go/src/repeatalpha/repeatalpha_correct/main.go
diff --git a/go/tests/reversebits/main.go b/go/src/reversebits/main.go
similarity index 100%
rename from go/tests/reversebits/main.go
rename to go/src/reversebits/main.go
diff --git a/go/tests/reverserange/main.go b/go/src/reverserange/main.go
similarity index 100%
rename from go/tests/reverserange/main.go
rename to go/src/reverserange/main.go
diff --git a/go/tests/reverserange/reverserange_correct/main.go b/go/src/reverserange/reverserange_correct/main.go
similarity index 100%
rename from go/tests/reverserange/reverserange_correct/main.go
rename to go/src/reverserange/reverserange_correct/main.go
diff --git a/go/tests/reversestrcap/main.go b/go/src/reversestrcap/main.go
similarity index 100%
rename from go/tests/reversestrcap/main.go
rename to go/src/reversestrcap/main.go
diff --git a/go/tests/reversestrcap/reversestrcap_correct/main.go b/go/src/reversestrcap/reversestrcap_correct/main.go
similarity index 100%
rename from go/tests/reversestrcap/reversestrcap_correct/main.go
rename to go/src/reversestrcap/reversestrcap_correct/main.go
diff --git a/go/tests/revivethreenums/main.go b/go/src/revivethreenums/main.go
similarity index 100%
rename from go/tests/revivethreenums/main.go
rename to go/src/revivethreenums/main.go
diff --git a/go/tests/revparams/main.go b/go/src/revparams/main.go
similarity index 100%
rename from go/tests/revparams/main.go
rename to go/src/revparams/main.go
diff --git a/go/tests/revparams/revparams_correct/main.go b/go/src/revparams/revparams_correct/main.go
similarity index 100%
rename from go/tests/revparams/revparams_correct/main.go
rename to go/src/revparams/revparams_correct/main.go
diff --git a/go/tests/revwstr/main.go b/go/src/revwstr/main.go
similarity index 100%
rename from go/tests/revwstr/main.go
rename to go/src/revwstr/main.go
diff --git a/go/tests/revwstr/revwstr_correct/main.go b/go/src/revwstr/revwstr_correct/main.go
similarity index 100%
rename from go/tests/revwstr/revwstr_correct/main.go
rename to go/src/revwstr/revwstr_correct/main.go
diff --git a/go/tests/robottoorigin/main.go b/go/src/robottoorigin/main.go
similarity index 100%
rename from go/tests/robottoorigin/main.go
rename to go/src/robottoorigin/main.go
diff --git a/go/tests/robottoorigin/robottoorigin_correct/main.go b/go/src/robottoorigin/robottoorigin_correct/main.go
similarity index 100%
rename from go/tests/robottoorigin/robottoorigin_correct/main.go
rename to go/src/robottoorigin/robottoorigin_correct/main.go
diff --git a/go/tests/romannumbers/main.go b/go/src/romannumbers/main.go
similarity index 100%
rename from go/tests/romannumbers/main.go
rename to go/src/romannumbers/main.go
diff --git a/go/tests/romannumbers/romannumbers_correct/main.go b/go/src/romannumbers/romannumbers_correct/main.go
similarity index 100%
rename from go/tests/romannumbers/romannumbers_correct/main.go
rename to go/src/romannumbers/romannumbers_correct/main.go
diff --git a/go/tests/rostring/main.go b/go/src/rostring/main.go
similarity index 100%
rename from go/tests/rostring/main.go
rename to go/src/rostring/main.go
diff --git a/go/tests/rostring/rostring_correct/main.go b/go/src/rostring/rostring_correct/main.go
similarity index 100%
rename from go/tests/rostring/rostring_correct/main.go
rename to go/src/rostring/rostring_correct/main.go
diff --git a/go/tests/rot13/main.go b/go/src/rot13/main.go
similarity index 100%
rename from go/tests/rot13/main.go
rename to go/src/rot13/main.go
diff --git a/go/tests/rot13/rot13_correct/main.go b/go/src/rot13/rot13_correct/main.go
similarity index 100%
rename from go/tests/rot13/rot13_correct/main.go
rename to go/src/rot13/rot13_correct/main.go
diff --git a/go/tests/rot14/main.go b/go/src/rot14/main.go
similarity index 100%
rename from go/tests/rot14/main.go
rename to go/src/rot14/main.go
diff --git a/go/tests/rotatevowels/main.go b/go/src/rotatevowels/main.go
similarity index 100%
rename from go/tests/rotatevowels/main.go
rename to go/src/rotatevowels/main.go
diff --git a/go/tests/rotatevowels/rotatevowels_correct/main.go b/go/src/rotatevowels/rotatevowels_correct/main.go
similarity index 100%
rename from go/tests/rotatevowels/rotatevowels_correct/main.go
rename to go/src/rotatevowels/rotatevowels_correct/main.go
diff --git a/go/tests/rpncalc/main.go b/go/src/rpncalc/main.go
similarity index 100%
rename from go/tests/rpncalc/main.go
rename to go/src/rpncalc/main.go
diff --git a/go/tests/rpncalc/rpncalc_correct/main.go b/go/src/rpncalc/rpncalc_correct/main.go
similarity index 100%
rename from go/tests/rpncalc/rpncalc_correct/main.go
rename to go/src/rpncalc/rpncalc_correct/main.go
diff --git a/go/tests/searchreplace/main.go b/go/src/searchreplace/main.go
similarity index 100%
rename from go/tests/searchreplace/main.go
rename to go/src/searchreplace/main.go
diff --git a/go/tests/searchreplace/searchreplace_correct/main.go b/go/src/searchreplace/searchreplace_correct/main.go
similarity index 100%
rename from go/tests/searchreplace/searchreplace_correct/main.go
rename to go/src/searchreplace/searchreplace_correct/main.go
diff --git a/go/tests/slice/main.go b/go/src/slice/main.go
similarity index 100%
rename from go/tests/slice/main.go
rename to go/src/slice/main.go
diff --git a/go/tests/sortintegertable/main.go b/go/src/sortintegertable/main.go
similarity index 100%
rename from go/tests/sortintegertable/main.go
rename to go/src/sortintegertable/main.go
diff --git a/go/tests/sortparams/main.go b/go/src/sortparams/main.go
similarity index 100%
rename from go/tests/sortparams/main.go
rename to go/src/sortparams/main.go
diff --git a/go/tests/sortparams/sortparams_correct/main.go b/go/src/sortparams/sortparams_correct/main.go
similarity index 100%
rename from go/tests/sortparams/sortparams_correct/main.go
rename to go/src/sortparams/sortparams_correct/main.go
diff --git a/go/tests/sortwordarr/main.go b/go/src/sortwordarr/main.go
similarity index 100%
rename from go/tests/sortwordarr/main.go
rename to go/src/sortwordarr/main.go
diff --git a/go/tests/split/main.go b/go/src/split/main.go
similarity index 100%
rename from go/tests/split/main.go
rename to go/src/split/main.go
diff --git a/go/tests/splitwhitespaces/main.go b/go/src/splitwhitespaces/main.go
similarity index 100%
rename from go/tests/splitwhitespaces/main.go
rename to go/src/splitwhitespaces/main.go
diff --git a/go/tests/sqrt/main.go b/go/src/sqrt/main.go
similarity index 100%
rename from go/tests/sqrt/main.go
rename to go/src/sqrt/main.go
diff --git a/go/tests/strlen/main.go b/go/src/strlen/main.go
similarity index 100%
rename from go/tests/strlen/main.go
rename to go/src/strlen/main.go
diff --git a/go/tests/strrev/main.go b/go/src/strrev/main.go
similarity index 100%
rename from go/tests/strrev/main.go
rename to go/src/strrev/main.go
diff --git a/go/tests/swap/main.go b/go/src/swap/main.go
similarity index 100%
rename from go/tests/swap/main.go
rename to go/src/swap/main.go
diff --git a/go/tests/swapbits/main.go b/go/src/swapbits/main.go
similarity index 100%
rename from go/tests/swapbits/main.go
rename to go/src/swapbits/main.go
diff --git a/go/tests/sweetproblem/main.go b/go/src/sweetproblem/main.go
similarity index 100%
rename from go/tests/sweetproblem/main.go
rename to go/src/sweetproblem/main.go
diff --git a/go/tests/switchcase/main.go b/go/src/switchcase/main.go
similarity index 100%
rename from go/tests/switchcase/main.go
rename to go/src/switchcase/main.go
diff --git a/go/tests/switchcase/switchcase_correct/main.go b/go/src/switchcase/switchcase_correct/main.go
similarity index 100%
rename from go/tests/switchcase/switchcase_correct/main.go
rename to go/src/switchcase/switchcase_correct/main.go
diff --git a/go/tests/tabmult/main.go b/go/src/tabmult/main.go
similarity index 100%
rename from go/tests/tabmult/main.go
rename to go/src/tabmult/main.go
diff --git a/go/tests/tabmult/tabmult_correct/main.go b/go/src/tabmult/tabmult_correct/main.go
similarity index 100%
rename from go/tests/tabmult/tabmult_correct/main.go
rename to go/src/tabmult/tabmult_correct/main.go
diff --git a/go/tests/tetrisoptimizer/main.go b/go/src/tetrisoptimizer/main.go
similarity index 100%
rename from go/tests/tetrisoptimizer/main.go
rename to go/src/tetrisoptimizer/main.go
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/board.go b/go/src/tetrisoptimizer/tetrisoptimizer_correct/board.go
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/board.go
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/board.go
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/main.go b/go/src/tetrisoptimizer/tetrisoptimizer_correct/main.go
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/main.go
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/main.go
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad00.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/bad00.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad00.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/bad00.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad01.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/bad01.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad01.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/bad01.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad02.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/bad02.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad02.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/bad02.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad03.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/bad03.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad03.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/bad03.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad04.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/bad04.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/bad04.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/bad04.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/badFormat.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/badFormat.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/badFormat.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/badFormat.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_01-1-2-0.00.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_01-1-2-0.00.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_01-1-2-0.00.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_01-1-2-0.00.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_02-1-4-0.00.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_02-1-4-0.00.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_02-1-4-0.00.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_02-1-4-0.00.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_03-2-4-0.00.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_03-2-4-0.00.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_03-2-4-0.00.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_03-2-4-0.00.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_04-6-6-0.00.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_04-6-6-0.00.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_04-6-6-0.00.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_04-6-6-0.00.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_05-21-10-0.00.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_05-21-10-0.00.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_05-21-10-0.00.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_05-21-10-0.00.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_06-22-10-0.00.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_06-22-10-0.00.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_06-22-10-0.00.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_06-22-10-0.00.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_07-26-11-0.00.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_07-26-11-0.00.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_07-26-11-0.00.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_07-26-11-0.00.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_08-24-10-0.03.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_08-24-10-0.03.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_08-24-10-0.03.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_08-24-10-0.03.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_09-11-7-0.07.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_09-11-7-0.07.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_09-11-7-0.07.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_09-11-7-0.07.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_10-12-7-0.52.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_10-12-7-0.52.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_10-12-7-0.52.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_10-12-7-0.52.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_11-12-8-0.83.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_11-12-8-0.83.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_11-12-8-0.83.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_11-12-8-0.83.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_12-19-9-3.40.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_12-19-9-3.40.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_12-19-9-3.40.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_12-19-9-3.40.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_13-23-10-4.72.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_13-23-10-4.72.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_13-23-10-4.72.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_13-23-10-4.72.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_14-15-8-7.34.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_14-15-8-7.34.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_14-15-8-7.34.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_14-15-8-7.34.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_15-26-11-72.22.txt b/go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_15-26-11-72.22.txt
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/samples/good_15-26-11-72.22.txt
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/samples/good_15-26-11-72.22.txt
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/solver.go b/go/src/tetrisoptimizer/tetrisoptimizer_correct/solver.go
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/solver.go
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/solver.go
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/tetrimino.go b/go/src/tetrisoptimizer/tetrisoptimizer_correct/tetrimino.go
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/tetrimino.go
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/tetrimino.go
diff --git a/go/tests/tetrisoptimizer/tetrisoptimizer_correct/validation.go b/go/src/tetrisoptimizer/tetrisoptimizer_correct/validation.go
similarity index 100%
rename from go/tests/tetrisoptimizer/tetrisoptimizer_correct/validation.go
rename to go/src/tetrisoptimizer/tetrisoptimizer_correct/validation.go
diff --git a/go/tests/tolower/main.go b/go/src/tolower/main.go
similarity index 100%
rename from go/tests/tolower/main.go
rename to go/src/tolower/main.go
diff --git a/go/tests/toupper/main.go b/go/src/toupper/main.go
similarity index 100%
rename from go/tests/toupper/main.go
rename to go/src/toupper/main.go
diff --git a/go/tests/trimatoi/main.go b/go/src/trimatoi/main.go
similarity index 100%
rename from go/tests/trimatoi/main.go
rename to go/src/trimatoi/main.go
diff --git a/go/tests/twosum/main.go b/go/src/twosum/main.go
similarity index 100%
rename from go/tests/twosum/main.go
rename to go/src/twosum/main.go
diff --git a/go/tests/ultimatedivmod/main.go b/go/src/ultimatedivmod/main.go
similarity index 100%
rename from go/tests/ultimatedivmod/main.go
rename to go/src/ultimatedivmod/main.go
diff --git a/go/tests/ultimatepointone/main.go b/go/src/ultimatepointone/main.go
similarity index 100%
rename from go/tests/ultimatepointone/main.go
rename to go/src/ultimatepointone/main.go
diff --git a/go/tests/union/main.go b/go/src/union/main.go
similarity index 100%
rename from go/tests/union/main.go
rename to go/src/union/main.go
diff --git a/go/tests/union/union_correct/main.go b/go/src/union/union_correct/main.go
similarity index 100%
rename from go/tests/union/union_correct/main.go
rename to go/src/union/union_correct/main.go
diff --git a/go/tests/uniqueoccurences/main.go b/go/src/uniqueoccurences/main.go
similarity index 100%
rename from go/tests/uniqueoccurences/main.go
rename to go/src/uniqueoccurences/main.go
diff --git a/go/tests/uniqueoccurences/uniqueoccurences_correct/main.go b/go/src/uniqueoccurences/uniqueoccurences_correct/main.go
similarity index 100%
rename from go/tests/uniqueoccurences/uniqueoccurences_correct/main.go
rename to go/src/uniqueoccurences/uniqueoccurences_correct/main.go
diff --git a/go/tests/unmatch/main.go b/go/src/unmatch/main.go
similarity index 100%
rename from go/tests/unmatch/main.go
rename to go/src/unmatch/main.go
diff --git a/go/tests/volumechanger/main.go b/go/src/volumechanger/main.go
similarity index 100%
rename from go/tests/volumechanger/main.go
rename to go/src/volumechanger/main.go
diff --git a/go/tests/wdmatch/main.go b/go/src/wdmatch/main.go
similarity index 100%
rename from go/tests/wdmatch/main.go
rename to go/src/wdmatch/main.go
diff --git a/go/tests/wdmatch/wdmatch_correct/main.go b/go/src/wdmatch/wdmatch_correct/main.go
similarity index 100%
rename from go/tests/wdmatch/wdmatch_correct/main.go
rename to go/src/wdmatch/wdmatch_correct/main.go
diff --git a/go/tests-tofix/cat/correct/main.go b/go/tofix/cat/correct/main.go
similarity index 100%
rename from go/tests-tofix/cat/correct/main.go
rename to go/tofix/cat/correct/main.go
diff --git a/go/tests-tofix/cat/correct/quest8.txt b/go/tofix/cat/correct/quest8.txt
similarity index 100%
rename from go/tests-tofix/cat/correct/quest8.txt
rename to go/tofix/cat/correct/quest8.txt
diff --git a/go/tests-tofix/cat/correct/quest8T.txt b/go/tofix/cat/correct/quest8T.txt
similarity index 100%
rename from go/tests-tofix/cat/correct/quest8T.txt
rename to go/tofix/cat/correct/quest8T.txt
diff --git a/go/tests-tofix/cat/main.go b/go/tofix/cat/main.go
similarity index 100%
rename from go/tests-tofix/cat/main.go
rename to go/tofix/cat/main.go
diff --git a/go/tests-tofix/displayfile/correct/main.go b/go/tofix/displayfile/correct/main.go
similarity index 100%
rename from go/tests-tofix/displayfile/correct/main.go
rename to go/tofix/displayfile/correct/main.go
diff --git a/go/tests-tofix/displayfile/correct/quest8.txt b/go/tofix/displayfile/correct/quest8.txt
similarity index 100%
rename from go/tests-tofix/displayfile/correct/quest8.txt
rename to go/tofix/displayfile/correct/quest8.txt
diff --git a/go/tests-tofix/displayfile/main.go b/go/tofix/displayfile/main.go
similarity index 100%
rename from go/tests-tofix/displayfile/main.go
rename to go/tofix/displayfile/main.go
diff --git a/go/tests-tofix/func/correct/addlinkednumbers.go b/go/tofix/func/correct/addlinkednumbers.go
similarity index 100%
rename from go/tests-tofix/func/correct/addlinkednumbers.go
rename to go/tofix/func/correct/addlinkednumbers.go
diff --git a/go/tests-tofix/func/correct/atoibase.go b/go/tofix/func/correct/atoibase.go
similarity index 100%
rename from go/tests-tofix/func/correct/atoibase.go
rename to go/tofix/func/correct/atoibase.go
diff --git a/go/tests-tofix/func/correct/base.go b/go/tofix/func/correct/base.go
similarity index 100%
rename from go/tests-tofix/func/correct/base.go
rename to go/tofix/func/correct/base.go
diff --git a/go/tests-tofix/func/correct/btree.go b/go/tofix/func/correct/btree.go
similarity index 100%
rename from go/tests-tofix/func/correct/btree.go
rename to go/tofix/func/correct/btree.go
diff --git a/go/tests-tofix/func/correct/challenge.go b/go/tofix/func/correct/challenge.go
similarity index 100%
rename from go/tests-tofix/func/correct/challenge.go
rename to go/tofix/func/correct/challenge.go
diff --git a/go/tests-tofix/func/correct/changeorder.go b/go/tofix/func/correct/changeorder.go
similarity index 100%
rename from go/tests-tofix/func/correct/changeorder.go
rename to go/tofix/func/correct/changeorder.go
diff --git a/go/tests-tofix/func/correct/convertbase.go b/go/tofix/func/correct/convertbase.go
similarity index 100%
rename from go/tests-tofix/func/correct/convertbase.go
rename to go/tofix/func/correct/convertbase.go
diff --git a/go/tests-tofix/func/correct/listat.go b/go/tofix/func/correct/listat.go
similarity index 100%
rename from go/tests-tofix/func/correct/listat.go
rename to go/tofix/func/correct/listat.go
diff --git a/go/tests-tofix/func/correct/listclear.go b/go/tofix/func/correct/listclear.go
similarity index 100%
rename from go/tests-tofix/func/correct/listclear.go
rename to go/tofix/func/correct/listclear.go
diff --git a/go/tests-tofix/func/correct/listfind.go b/go/tofix/func/correct/listfind.go
similarity index 100%
rename from go/tests-tofix/func/correct/listfind.go
rename to go/tofix/func/correct/listfind.go
diff --git a/go/tests-tofix/func/correct/listforeach.go b/go/tofix/func/correct/listforeach.go
similarity index 100%
rename from go/tests-tofix/func/correct/listforeach.go
rename to go/tofix/func/correct/listforeach.go
diff --git a/go/tests-tofix/func/correct/listforeachif.go b/go/tofix/func/correct/listforeachif.go
similarity index 100%
rename from go/tests-tofix/func/correct/listforeachif.go
rename to go/tofix/func/correct/listforeachif.go
diff --git a/go/tests-tofix/func/correct/listlast.go b/go/tofix/func/correct/listlast.go
similarity index 100%
rename from go/tests-tofix/func/correct/listlast.go
rename to go/tofix/func/correct/listlast.go
diff --git a/go/tests-tofix/func/correct/listmerge.go b/go/tofix/func/correct/listmerge.go
similarity index 100%
rename from go/tests-tofix/func/correct/listmerge.go
rename to go/tofix/func/correct/listmerge.go
diff --git a/go/tests-tofix/func/correct/listpushback.go b/go/tofix/func/correct/listpushback.go
similarity index 100%
rename from go/tests-tofix/func/correct/listpushback.go
rename to go/tofix/func/correct/listpushback.go
diff --git a/go/tests-tofix/func/correct/listpushfront.go b/go/tofix/func/correct/listpushfront.go
similarity index 100%
rename from go/tests-tofix/func/correct/listpushfront.go
rename to go/tofix/func/correct/listpushfront.go
diff --git a/go/tests-tofix/func/correct/listremoveif.go b/go/tofix/func/correct/listremoveif.go
similarity index 100%
rename from go/tests-tofix/func/correct/listremoveif.go
rename to go/tofix/func/correct/listremoveif.go
diff --git a/go/tests-tofix/func/correct/listreverse.go b/go/tofix/func/correct/listreverse.go
similarity index 100%
rename from go/tests-tofix/func/correct/listreverse.go
rename to go/tofix/func/correct/listreverse.go
diff --git a/go/tests-tofix/func/correct/listsize.go b/go/tofix/func/correct/listsize.go
similarity index 100%
rename from go/tests-tofix/func/correct/listsize.go
rename to go/tofix/func/correct/listsize.go
diff --git a/go/tests-tofix/func/correct/listsort.go b/go/tofix/func/correct/listsort.go
similarity index 100%
rename from go/tests-tofix/func/correct/listsort.go
rename to go/tofix/func/correct/listsort.go
diff --git a/go/tests-tofix/func/correct/printnbrbase.go b/go/tofix/func/correct/printnbrbase.go
similarity index 100%
rename from go/tests-tofix/func/correct/printnbrbase.go
rename to go/tofix/func/correct/printnbrbase.go
diff --git a/go/tests-tofix/func/correct/reverse.go b/go/tofix/func/correct/reverse.go
similarity index 100%
rename from go/tests-tofix/func/correct/reverse.go
rename to go/tofix/func/correct/reverse.go
diff --git a/go/tests-tofix/func/correct/sortedlistmerge.go b/go/tofix/func/correct/sortedlistmerge.go
similarity index 100%
rename from go/tests-tofix/func/correct/sortedlistmerge.go
rename to go/tofix/func/correct/sortedlistmerge.go
diff --git a/go/tests-tofix/func/correct/sortlistinsert.go b/go/tofix/func/correct/sortlistinsert.go
similarity index 100%
rename from go/tests-tofix/func/correct/sortlistinsert.go
rename to go/tofix/func/correct/sortlistinsert.go
diff --git a/go/tests-tofix/func/correct/sortll.go b/go/tofix/func/correct/sortll.go
similarity index 100%
rename from go/tests-tofix/func/correct/sortll.go
rename to go/tofix/func/correct/sortll.go
diff --git a/go/tests-tofix/func/createelem/main.go b/go/tofix/func/createelem/main.go
similarity index 100%
rename from go/tests-tofix/func/createelem/main.go
rename to go/tofix/func/createelem/main.go
diff --git a/go/tests-tofix/func/inverttree/main.go b/go/tofix/func/inverttree/main.go
similarity index 100%
rename from go/tests-tofix/func/inverttree/main.go
rename to go/tofix/func/inverttree/main.go
diff --git a/go/tests-tofix/func/merge/main.go b/go/tofix/func/merge/main.go
similarity index 100%
rename from go/tests-tofix/func/merge/main.go
rename to go/tofix/func/merge/main.go
diff --git a/go/tests-tofix/func/reverse/main.go b/go/tofix/func/reverse/main.go
similarity index 100%
rename from go/tests-tofix/func/reverse/main.go
rename to go/tofix/func/reverse/main.go
diff --git a/go/tests-tofix/func/sametree/main.go b/go/tofix/func/sametree/main.go
similarity index 100%
rename from go/tests-tofix/func/sametree/main.go
rename to go/tofix/func/sametree/main.go
diff --git a/go/tests-tofix/func/sortlist/main.go b/go/tofix/func/sortlist/main.go
similarity index 100%
rename from go/tests-tofix/func/sortlist/main.go
rename to go/tofix/func/sortlist/main.go
diff --git a/go/tests-tofix/func/test_addlinkednumbers.go b/go/tofix/func/test_addlinkednumbers.go
similarity index 100%
rename from go/tests-tofix/func/test_addlinkednumbers.go
rename to go/tofix/func/test_addlinkednumbers.go
diff --git a/go/tests-tofix/func/test_atoibase.go b/go/tofix/func/test_atoibase.go
similarity index 100%
rename from go/tests-tofix/func/test_atoibase.go
rename to go/tofix/func/test_atoibase.go
diff --git a/go/tests-tofix/func/test_btreeapplybylevel.go b/go/tofix/func/test_btreeapplybylevel.go
similarity index 100%
rename from go/tests-tofix/func/test_btreeapplybylevel.go
rename to go/tofix/func/test_btreeapplybylevel.go
diff --git a/go/tests-tofix/func/test_btreeapplyinorder.go b/go/tofix/func/test_btreeapplyinorder.go
similarity index 100%
rename from go/tests-tofix/func/test_btreeapplyinorder.go
rename to go/tofix/func/test_btreeapplyinorder.go
diff --git a/go/tests-tofix/func/test_btreeapplypostorder.go b/go/tofix/func/test_btreeapplypostorder.go
similarity index 100%
rename from go/tests-tofix/func/test_btreeapplypostorder.go
rename to go/tofix/func/test_btreeapplypostorder.go
diff --git a/go/tests-tofix/func/test_btreeapplypreorder.go b/go/tofix/func/test_btreeapplypreorder.go
similarity index 100%
rename from go/tests-tofix/func/test_btreeapplypreorder.go
rename to go/tofix/func/test_btreeapplypreorder.go
diff --git a/go/tests-tofix/func/test_btreedeletenode.go b/go/tofix/func/test_btreedeletenode.go
similarity index 100%
rename from go/tests-tofix/func/test_btreedeletenode.go
rename to go/tofix/func/test_btreedeletenode.go
diff --git a/go/tests-tofix/func/test_btreeinsertdata.go b/go/tofix/func/test_btreeinsertdata.go
similarity index 100%
rename from go/tests-tofix/func/test_btreeinsertdata.go
rename to go/tofix/func/test_btreeinsertdata.go
diff --git a/go/tests-tofix/func/test_btreeisbinary.go b/go/tofix/func/test_btreeisbinary.go
similarity index 100%
rename from go/tests-tofix/func/test_btreeisbinary.go
rename to go/tofix/func/test_btreeisbinary.go
diff --git a/go/tests-tofix/func/test_btreelevelcount.go b/go/tofix/func/test_btreelevelcount.go
similarity index 100%
rename from go/tests-tofix/func/test_btreelevelcount.go
rename to go/tofix/func/test_btreelevelcount.go
diff --git a/go/tests-tofix/func/test_btreemax.go b/go/tofix/func/test_btreemax.go
similarity index 100%
rename from go/tests-tofix/func/test_btreemax.go
rename to go/tofix/func/test_btreemax.go
diff --git a/go/tests-tofix/func/test_btreemin.go b/go/tofix/func/test_btreemin.go
similarity index 100%
rename from go/tests-tofix/func/test_btreemin.go
rename to go/tofix/func/test_btreemin.go
diff --git a/go/tests-tofix/func/test_btreesearchitem.go b/go/tofix/func/test_btreesearchitem.go
similarity index 100%
rename from go/tests-tofix/func/test_btreesearchitem.go
rename to go/tofix/func/test_btreesearchitem.go
diff --git a/go/tests-tofix/func/test_btreetransplant.go b/go/tofix/func/test_btreetransplant.go
similarity index 100%
rename from go/tests-tofix/func/test_btreetransplant.go
rename to go/tofix/func/test_btreetransplant.go
diff --git a/go/tests-tofix/func/test_changeorder.go b/go/tofix/func/test_changeorder.go
similarity index 100%
rename from go/tests-tofix/func/test_changeorder.go
rename to go/tofix/func/test_changeorder.go
diff --git a/go/tests-tofix/func/test_convertbase.go b/go/tofix/func/test_convertbase.go
similarity index 100%
rename from go/tests-tofix/func/test_convertbase.go
rename to go/tofix/func/test_convertbase.go
diff --git a/go/tests-tofix/func/test_listat.go b/go/tofix/func/test_listat.go
similarity index 100%
rename from go/tests-tofix/func/test_listat.go
rename to go/tofix/func/test_listat.go
diff --git a/go/tests-tofix/func/test_listclear.go b/go/tofix/func/test_listclear.go
similarity index 100%
rename from go/tests-tofix/func/test_listclear.go
rename to go/tofix/func/test_listclear.go
diff --git a/go/tests-tofix/func/test_listfind.go b/go/tofix/func/test_listfind.go
similarity index 100%
rename from go/tests-tofix/func/test_listfind.go
rename to go/tofix/func/test_listfind.go
diff --git a/go/tests-tofix/func/test_listforeach.go b/go/tofix/func/test_listforeach.go
similarity index 100%
rename from go/tests-tofix/func/test_listforeach.go
rename to go/tofix/func/test_listforeach.go
diff --git a/go/tests-tofix/func/test_listforeachif.go b/go/tofix/func/test_listforeachif.go
similarity index 100%
rename from go/tests-tofix/func/test_listforeachif.go
rename to go/tofix/func/test_listforeachif.go
diff --git a/go/tests-tofix/func/test_listlast.go b/go/tofix/func/test_listlast.go
similarity index 100%
rename from go/tests-tofix/func/test_listlast.go
rename to go/tofix/func/test_listlast.go
diff --git a/go/tests-tofix/func/test_listmerge.go b/go/tofix/func/test_listmerge.go
similarity index 100%
rename from go/tests-tofix/func/test_listmerge.go
rename to go/tofix/func/test_listmerge.go
diff --git a/go/tests-tofix/func/test_listpushback.go b/go/tofix/func/test_listpushback.go
similarity index 100%
rename from go/tests-tofix/func/test_listpushback.go
rename to go/tofix/func/test_listpushback.go
diff --git a/go/tests-tofix/func/test_listpushfront.go b/go/tofix/func/test_listpushfront.go
similarity index 100%
rename from go/tests-tofix/func/test_listpushfront.go
rename to go/tofix/func/test_listpushfront.go
diff --git a/go/tests-tofix/func/test_listremoveif.go b/go/tofix/func/test_listremoveif.go
similarity index 100%
rename from go/tests-tofix/func/test_listremoveif.go
rename to go/tofix/func/test_listremoveif.go
diff --git a/go/tests-tofix/func/test_listreverse.go b/go/tofix/func/test_listreverse.go
similarity index 100%
rename from go/tests-tofix/func/test_listreverse.go
rename to go/tofix/func/test_listreverse.go
diff --git a/go/tests-tofix/func/test_listsize.go b/go/tofix/func/test_listsize.go
similarity index 100%
rename from go/tests-tofix/func/test_listsize.go
rename to go/tofix/func/test_listsize.go
diff --git a/go/tests-tofix/func/test_listsort.go b/go/tofix/func/test_listsort.go
similarity index 100%
rename from go/tests-tofix/func/test_listsort.go
rename to go/tofix/func/test_listsort.go
diff --git a/go/tests-tofix/func/test_printnbrbase.go b/go/tofix/func/test_printnbrbase.go
similarity index 100%
rename from go/tests-tofix/func/test_printnbrbase.go
rename to go/tofix/func/test_printnbrbase.go
diff --git a/go/tests-tofix/func/test_sortedlistmerge.go b/go/tofix/func/test_sortedlistmerge.go
similarity index 100%
rename from go/tests-tofix/func/test_sortedlistmerge.go
rename to go/tofix/func/test_sortedlistmerge.go
diff --git a/go/tests-tofix/func/test_sortlistinsert.go b/go/tofix/func/test_sortlistinsert.go
similarity index 100%
rename from go/tests-tofix/func/test_sortlistinsert.go
rename to go/tofix/func/test_sortlistinsert.go
diff --git a/go/tests-tofix/func/test_sortll.go b/go/tofix/func/test_sortll.go
similarity index 100%
rename from go/tests-tofix/func/test_sortll.go
rename to go/tofix/func/test_sortll.go
diff --git a/go/tests-tofix/prog/correct/pilot/main.go b/go/tofix/prog/correct/pilot/main.go
similarity index 100%
rename from go/tests-tofix/prog/correct/pilot/main.go
rename to go/tofix/prog/correct/pilot/main.go
diff --git a/go/tests-tofix/prog/test_pilot.go b/go/tofix/prog/test_pilot.go
similarity index 100%
rename from go/tests-tofix/prog/test_pilot.go
rename to go/tofix/prog/test_pilot.go
diff --git a/go/tests-tofix/raid3/correct/main.go b/go/tofix/raid3/correct/main.go
similarity index 100%
rename from go/tests-tofix/raid3/correct/main.go
rename to go/tofix/raid3/correct/main.go
diff --git a/go/tests-tofix/raid3/correct/raid1aprog/raid1a.go b/go/tofix/raid3/correct/raid1aprog/raid1a.go
similarity index 100%
rename from go/tests-tofix/raid3/correct/raid1aprog/raid1a.go
rename to go/tofix/raid3/correct/raid1aprog/raid1a.go
diff --git a/go/tests-tofix/raid3/correct/raid1bprog/raid1b.go b/go/tofix/raid3/correct/raid1bprog/raid1b.go
similarity index 100%
rename from go/tests-tofix/raid3/correct/raid1bprog/raid1b.go
rename to go/tofix/raid3/correct/raid1bprog/raid1b.go
diff --git a/go/tests-tofix/raid3/correct/raid1cprog/raid1c.go b/go/tofix/raid3/correct/raid1cprog/raid1c.go
similarity index 100%
rename from go/tests-tofix/raid3/correct/raid1cprog/raid1c.go
rename to go/tofix/raid3/correct/raid1cprog/raid1c.go
diff --git a/go/tests-tofix/raid3/correct/raid1dprog/raid1d.go b/go/tofix/raid3/correct/raid1dprog/raid1d.go
similarity index 100%
rename from go/tests-tofix/raid3/correct/raid1dprog/raid1d.go
rename to go/tofix/raid3/correct/raid1dprog/raid1d.go
diff --git a/go/tests-tofix/raid3/correct/raid1eprog/raid1e.go b/go/tofix/raid3/correct/raid1eprog/raid1e.go
similarity index 100%
rename from go/tests-tofix/raid3/correct/raid1eprog/raid1e.go
rename to go/tofix/raid3/correct/raid1eprog/raid1e.go
diff --git a/go/tests-tofix/raid3/main.go b/go/tofix/raid3/main.go
similarity index 100%
rename from go/tests-tofix/raid3/main.go
rename to go/tofix/raid3/main.go
diff --git a/go/tests-tofix/ztail/correct/main.go b/go/tofix/ztail/correct/main.go
similarity index 100%
rename from go/tests-tofix/ztail/correct/main.go
rename to go/tofix/ztail/correct/main.go
diff --git a/go/tests-tofix/ztail/main.go b/go/tofix/ztail/main.go
similarity index 100%
rename from go/tests-tofix/ztail/main.go
rename to go/tofix/ztail/main.go