diff --git a/go/tests/Dockerfile b/go/tests/Dockerfile
index 7da90504c..ccbb4cc9f 100644
--- a/go/tests/Dockerfile
+++ b/go/tests/Dockerfile
@@ -4,6 +4,7 @@ ENV GIT_TERMINAL_PROMPT=0
 RUN apk add --no-cache git
 
 RUN go get golang.org/x/tools/cmd/goimports
+RUN go get github.com/01-edu/rc
 
 WORKDIR /piscine-go
 RUN go mod init piscine-go
@@ -13,9 +14,9 @@ WORKDIR /public/go/tests
 COPY go.* ./
 RUN go mod download
 COPY lib lib
-COPY prog prog
-RUN go get github.com/01-edu/rc
-RUN go install $(grep -rl ChallengeMain ./prog | rev | cut -d/ -f2- | rev)
+COPY solutions solutions
+COPY tests tests
+RUN go install $(grep -rl ChallengeMain ./tests | rev | cut -d/ -f2- | rev)
 
 RUN rm -rf /piscine-go
 
diff --git a/go/tests/entrypoint.sh b/go/tests/entrypoint.sh
index fe15832ed..1b1cce310 100755
--- a/go/tests/entrypoint.sh
+++ b/go/tests/entrypoint.sh
@@ -52,5 +52,5 @@ if command -v "${EXERCISE}_test" >/dev/null 2>&1; then
 	"${EXERCISE}_test"
 else
 	# The exercise is a function
-	go run "./prog/${EXERCISE}_test"
+	go run "./tests/${EXERCISE}_test"
 fi
diff --git a/go/tests/lib/lib.go b/go/tests/lib/lib.go
index 58d3e0920..341980c6c 100644
--- a/go/tests/lib/lib.go
+++ b/go/tests/lib/lib.go
@@ -372,7 +372,7 @@ func ChallengeMainStdin(exercise, input string, args ...string) {
 		return fmt.Sprintf("echo $?\n%d\n$", code)
 	}
 	student, studentCode := run(path.Join("student", exercise))
-	solution, solutionCode := run(path.Join("github.com/01-edu/public/go/tests/prog", exercise+"_prog"))
+	solution, solutionCode := run(path.Join("github.com/01-edu/public/go/tests/solutions", exercise+"_prog"))
 	if solutionCode == 0 {
 		if studentCode != 0 {
 			Fatalln("Your program fails (non-zero exit status) when it should not :\n" +
diff --git a/go/tests/prog/addprimesum_prog/main.go b/go/tests/solutions/addprimesum_prog/main.go
similarity index 100%
rename from go/tests/prog/addprimesum_prog/main.go
rename to go/tests/solutions/addprimesum_prog/main.go
diff --git a/go/tests/prog/alphamirror_prog/main.go b/go/tests/solutions/alphamirror_prog/main.go
similarity index 100%
rename from go/tests/prog/alphamirror_prog/main.go
rename to go/tests/solutions/alphamirror_prog/main.go
diff --git a/go/tests/prog/balancedstring_prog/main.go b/go/tests/solutions/balancedstring_prog/main.go
similarity index 100%
rename from go/tests/prog/balancedstring_prog/main.go
rename to go/tests/solutions/balancedstring_prog/main.go
diff --git a/go/tests/prog/boolean_prog/main.go b/go/tests/solutions/boolean_prog/main.go
similarity index 100%
rename from go/tests/prog/boolean_prog/main.go
rename to go/tests/solutions/boolean_prog/main.go
diff --git a/go/tests/prog/brackets_prog/main.go b/go/tests/solutions/brackets_prog/main.go
similarity index 100%
rename from go/tests/prog/brackets_prog/main.go
rename to go/tests/solutions/brackets_prog/main.go
diff --git a/go/tests/prog/brainfuck_prog/main.go b/go/tests/solutions/brainfuck_prog/main.go
similarity index 100%
rename from go/tests/prog/brainfuck_prog/main.go
rename to go/tests/solutions/brainfuck_prog/main.go
diff --git a/go/tests/prog/cat_prog/main.go b/go/tests/solutions/cat_prog/main.go
similarity index 100%
rename from go/tests/prog/cat_prog/main.go
rename to go/tests/solutions/cat_prog/main.go
diff --git a/go/tests/prog/cleanstr_prog/main.go b/go/tests/solutions/cleanstr_prog/main.go
similarity index 100%
rename from go/tests/prog/cleanstr_prog/main.go
rename to go/tests/solutions/cleanstr_prog/main.go
diff --git a/go/tests/prog/comcheck_prog/main.go b/go/tests/solutions/comcheck_prog/main.go
similarity index 100%
rename from go/tests/prog/comcheck_prog/main.go
rename to go/tests/solutions/comcheck_prog/main.go
diff --git a/go/tests/prog/costumeprofit_prog/main.go b/go/tests/solutions/costumeprofit_prog/main.go
similarity index 100%
rename from go/tests/prog/costumeprofit_prog/main.go
rename to go/tests/solutions/costumeprofit_prog/main.go
diff --git a/go/tests/prog/countdown_prog/main.go b/go/tests/solutions/countdown_prog/main.go
similarity index 100%
rename from go/tests/prog/countdown_prog/main.go
rename to go/tests/solutions/countdown_prog/main.go
diff --git a/go/tests/prog/displaya_prog/main.go b/go/tests/solutions/displaya_prog/main.go
similarity index 100%
rename from go/tests/prog/displaya_prog/main.go
rename to go/tests/solutions/displaya_prog/main.go
diff --git a/go/tests/prog/displayalpham_prog/main.go b/go/tests/solutions/displayalpham_prog/main.go
similarity index 100%
rename from go/tests/prog/displayalpham_prog/main.go
rename to go/tests/solutions/displayalpham_prog/main.go
diff --git a/go/tests/prog/displayalrevm_prog/main.go b/go/tests/solutions/displayalrevm_prog/main.go
similarity index 100%
rename from go/tests/prog/displayalrevm_prog/main.go
rename to go/tests/solutions/displayalrevm_prog/main.go
diff --git a/go/tests/prog/displayfile_prog/main.go b/go/tests/solutions/displayfile_prog/main.go
similarity index 100%
rename from go/tests/prog/displayfile_prog/main.go
rename to go/tests/solutions/displayfile_prog/main.go
diff --git a/go/tests/prog/displayfirstparam_prog/main.go b/go/tests/solutions/displayfirstparam_prog/main.go
similarity index 100%
rename from go/tests/prog/displayfirstparam_prog/main.go
rename to go/tests/solutions/displayfirstparam_prog/main.go
diff --git a/go/tests/prog/displaylastparam_prog/main.go b/go/tests/solutions/displaylastparam_prog/main.go
similarity index 100%
rename from go/tests/prog/displaylastparam_prog/main.go
rename to go/tests/solutions/displaylastparam_prog/main.go
diff --git a/go/tests/prog/displayz_prog/main.go b/go/tests/solutions/displayz_prog/main.go
similarity index 100%
rename from go/tests/prog/displayz_prog/main.go
rename to go/tests/solutions/displayz_prog/main.go
diff --git a/go/tests/prog/doop_prog/main.go b/go/tests/solutions/doop_prog/main.go
similarity index 100%
rename from go/tests/prog/doop_prog/main.go
rename to go/tests/solutions/doop_prog/main.go
diff --git a/go/tests/prog/expandstr_prog/main.go b/go/tests/solutions/expandstr_prog/main.go
similarity index 100%
rename from go/tests/prog/expandstr_prog/main.go
rename to go/tests/solutions/expandstr_prog/main.go
diff --git a/go/tests/prog/firstword_prog/main.go b/go/tests/solutions/firstword_prog/main.go
similarity index 100%
rename from go/tests/prog/firstword_prog/main.go
rename to go/tests/solutions/firstword_prog/main.go
diff --git a/go/tests/prog/fixthemain_prog/main.go b/go/tests/solutions/fixthemain_prog/main.go
similarity index 100%
rename from go/tests/prog/fixthemain_prog/main.go
rename to go/tests/solutions/fixthemain_prog/main.go
diff --git a/go/tests/prog/flags_prog/main.go b/go/tests/solutions/flags_prog/main.go
similarity index 100%
rename from go/tests/prog/flags_prog/main.go
rename to go/tests/solutions/flags_prog/main.go
diff --git a/go/tests/prog/fprime_prog/main.go b/go/tests/solutions/fprime_prog/main.go
similarity index 100%
rename from go/tests/prog/fprime_prog/main.go
rename to go/tests/solutions/fprime_prog/main.go
diff --git a/go/tests/prog/gcd_prog/main.go b/go/tests/solutions/gcd_prog/main.go
similarity index 100%
rename from go/tests/prog/gcd_prog/main.go
rename to go/tests/solutions/gcd_prog/main.go
diff --git a/go/tests/prog/grouping_prog/main.go b/go/tests/solutions/grouping_prog/main.go
similarity index 100%
rename from go/tests/prog/grouping_prog/main.go
rename to go/tests/solutions/grouping_prog/main.go
diff --git a/go/tests/prog/hello_prog/main.go b/go/tests/solutions/hello_prog/main.go
similarity index 100%
rename from go/tests/prog/hello_prog/main.go
rename to go/tests/solutions/hello_prog/main.go
diff --git a/go/tests/prog/hiddenp_prog/main.go b/go/tests/solutions/hiddenp_prog/main.go
similarity index 100%
rename from go/tests/prog/hiddenp_prog/main.go
rename to go/tests/solutions/hiddenp_prog/main.go
diff --git a/go/tests/prog/inter_prog/main.go b/go/tests/solutions/inter_prog/main.go
similarity index 100%
rename from go/tests/prog/inter_prog/main.go
rename to go/tests/solutions/inter_prog/main.go
diff --git a/go/tests/prog/ispowerof2_prog/main.go b/go/tests/solutions/ispowerof2_prog/main.go
similarity index 100%
rename from go/tests/prog/ispowerof2_prog/main.go
rename to go/tests/solutions/ispowerof2_prog/main.go
diff --git a/go/tests/prog/lastword_prog/main.go b/go/tests/solutions/lastword_prog/main.go
similarity index 100%
rename from go/tests/prog/lastword_prog/main.go
rename to go/tests/solutions/lastword_prog/main.go
diff --git a/go/tests/prog/nbrconvertalpha_prog/main.go b/go/tests/solutions/nbrconvertalpha_prog/main.go
similarity index 100%
rename from go/tests/prog/nbrconvertalpha_prog/main.go
rename to go/tests/solutions/nbrconvertalpha_prog/main.go
diff --git a/go/tests/prog/nenokku_prog/main.go b/go/tests/solutions/nenokku_prog/main.go
similarity index 100%
rename from go/tests/prog/nenokku_prog/main.go
rename to go/tests/solutions/nenokku_prog/main.go
diff --git a/go/tests/prog/onlya_prog/main.go b/go/tests/solutions/onlya_prog/main.go
similarity index 100%
rename from go/tests/prog/onlya_prog/main.go
rename to go/tests/solutions/onlya_prog/main.go
diff --git a/go/tests/prog/onlyz_prog/main.go b/go/tests/solutions/onlyz_prog/main.go
similarity index 100%
rename from go/tests/prog/onlyz_prog/main.go
rename to go/tests/solutions/onlyz_prog/main.go
diff --git a/go/tests/prog/options_prog/main.go b/go/tests/solutions/options_prog/main.go
similarity index 100%
rename from go/tests/prog/options_prog/main.go
rename to go/tests/solutions/options_prog/main.go
diff --git a/go/tests/prog/paramcount_prog/main.go b/go/tests/solutions/paramcount_prog/main.go
similarity index 100%
rename from go/tests/prog/paramcount_prog/main.go
rename to go/tests/solutions/paramcount_prog/main.go
diff --git a/go/tests/prog/piglatin_prog/main.go b/go/tests/solutions/piglatin_prog/main.go
similarity index 100%
rename from go/tests/prog/piglatin_prog/main.go
rename to go/tests/solutions/piglatin_prog/main.go
diff --git a/go/tests/prog/pilot_prog/main.go b/go/tests/solutions/pilot_prog/main.go
similarity index 100%
rename from go/tests/prog/pilot_prog/main.go
rename to go/tests/solutions/pilot_prog/main.go
diff --git a/go/tests/prog/point_prog/main.go b/go/tests/solutions/point_prog/main.go
similarity index 100%
rename from go/tests/prog/point_prog/main.go
rename to go/tests/solutions/point_prog/main.go
diff --git a/go/tests/prog/printalphabet_prog/main.go b/go/tests/solutions/printalphabet_prog/main.go
similarity index 100%
rename from go/tests/prog/printalphabet_prog/main.go
rename to go/tests/solutions/printalphabet_prog/main.go
diff --git a/go/tests/prog/printalphabetalt2_prog/main.go b/go/tests/solutions/printalphabetalt2_prog/main.go
similarity index 100%
rename from go/tests/prog/printalphabetalt2_prog/main.go
rename to go/tests/solutions/printalphabetalt2_prog/main.go
diff --git a/go/tests/prog/printalphabetalt_prog/main.go b/go/tests/solutions/printalphabetalt_prog/main.go
similarity index 100%
rename from go/tests/prog/printalphabetalt_prog/main.go
rename to go/tests/solutions/printalphabetalt_prog/main.go
diff --git a/go/tests/prog/printalphabetg_prog/main.go b/go/tests/solutions/printalphabetg_prog/main.go
similarity index 100%
rename from go/tests/prog/printalphabetg_prog/main.go
rename to go/tests/solutions/printalphabetg_prog/main.go
diff --git a/go/tests/prog/printalt2_prog/main.go b/go/tests/solutions/printalt2_prog/main.go
similarity index 100%
rename from go/tests/prog/printalt2_prog/main.go
rename to go/tests/solutions/printalt2_prog/main.go
diff --git a/go/tests/prog/printalt_prog/main.go b/go/tests/solutions/printalt_prog/main.go
similarity index 100%
rename from go/tests/prog/printalt_prog/main.go
rename to go/tests/solutions/printalt_prog/main.go
diff --git a/go/tests/prog/printaltu2_prog/main.go b/go/tests/solutions/printaltu2_prog/main.go
similarity index 100%
rename from go/tests/prog/printaltu2_prog/main.go
rename to go/tests/solutions/printaltu2_prog/main.go
diff --git a/go/tests/prog/printaltu_prog/main.go b/go/tests/solutions/printaltu_prog/main.go
similarity index 100%
rename from go/tests/prog/printaltu_prog/main.go
rename to go/tests/solutions/printaltu_prog/main.go
diff --git a/go/tests/prog/printbits_prog/main.go b/go/tests/solutions/printbits_prog/main.go
similarity index 100%
rename from go/tests/prog/printbits_prog/main.go
rename to go/tests/solutions/printbits_prog/main.go
diff --git a/go/tests/prog/printchessboard_prog/main.go b/go/tests/solutions/printchessboard_prog/main.go
similarity index 100%
rename from go/tests/prog/printchessboard_prog/main.go
rename to go/tests/solutions/printchessboard_prog/main.go
diff --git a/go/tests/prog/printdigits_prog/main.go b/go/tests/solutions/printdigits_prog/main.go
similarity index 100%
rename from go/tests/prog/printdigits_prog/main.go
rename to go/tests/solutions/printdigits_prog/main.go
diff --git a/go/tests/prog/printhex_prog/main.go b/go/tests/solutions/printhex_prog/main.go
similarity index 100%
rename from go/tests/prog/printhex_prog/main.go
rename to go/tests/solutions/printhex_prog/main.go
diff --git a/go/tests/prog/printparams_prog/main.go b/go/tests/solutions/printparams_prog/main.go
similarity index 100%
rename from go/tests/prog/printparams_prog/main.go
rename to go/tests/solutions/printparams_prog/main.go
diff --git a/go/tests/prog/printprogramname_prog/main.go b/go/tests/solutions/printprogramname_prog/main.go
similarity index 100%
rename from go/tests/prog/printprogramname_prog/main.go
rename to go/tests/solutions/printprogramname_prog/main.go
diff --git a/go/tests/prog/printrevcomb_prog/main.go b/go/tests/solutions/printrevcomb_prog/main.go
similarity index 100%
rename from go/tests/prog/printrevcomb_prog/main.go
rename to go/tests/solutions/printrevcomb_prog/main.go
diff --git a/go/tests/prog/printreversealphabet_prog/main.go b/go/tests/solutions/printreversealphabet_prog/main.go
similarity index 100%
rename from go/tests/prog/printreversealphabet_prog/main.go
rename to go/tests/solutions/printreversealphabet_prog/main.go
diff --git a/go/tests/prog/printreversealphabetalt2_prog/main.go b/go/tests/solutions/printreversealphabetalt2_prog/main.go
similarity index 100%
rename from go/tests/prog/printreversealphabetalt2_prog/main.go
rename to go/tests/solutions/printreversealphabetalt2_prog/main.go
diff --git a/go/tests/prog/printreversealphabetalt_prog/main.go b/go/tests/solutions/printreversealphabetalt_prog/main.go
similarity index 100%
rename from go/tests/prog/printreversealphabetalt_prog/main.go
rename to go/tests/solutions/printreversealphabetalt_prog/main.go
diff --git a/go/tests/prog/printreversealphabetg_prog/main.go b/go/tests/solutions/printreversealphabetg_prog/main.go
similarity index 100%
rename from go/tests/prog/printreversealphabetg_prog/main.go
rename to go/tests/solutions/printreversealphabetg_prog/main.go
diff --git a/go/tests/prog/printrot_prog/main.go b/go/tests/solutions/printrot_prog/main.go
similarity index 100%
rename from go/tests/prog/printrot_prog/main.go
rename to go/tests/solutions/printrot_prog/main.go
diff --git a/go/tests/prog/raid3_prog/main.go b/go/tests/solutions/raid3_prog/main.go
similarity index 100%
rename from go/tests/prog/raid3_prog/main.go
rename to go/tests/solutions/raid3_prog/main.go
diff --git a/go/tests/prog/range_prog/main.go b/go/tests/solutions/range_prog/main.go
similarity index 100%
rename from go/tests/prog/range_prog/main.go
rename to go/tests/solutions/range_prog/main.go
diff --git a/go/tests/prog/rectangle_prog/main.go b/go/tests/solutions/rectangle_prog/main.go
similarity index 100%
rename from go/tests/prog/rectangle_prog/main.go
rename to go/tests/solutions/rectangle_prog/main.go
diff --git a/go/tests/prog/repeatalpha_prog/main.go b/go/tests/solutions/repeatalpha_prog/main.go
similarity index 100%
rename from go/tests/prog/repeatalpha_prog/main.go
rename to go/tests/solutions/repeatalpha_prog/main.go
diff --git a/go/tests/prog/reverserange_prog/main.go b/go/tests/solutions/reverserange_prog/main.go
similarity index 100%
rename from go/tests/prog/reverserange_prog/main.go
rename to go/tests/solutions/reverserange_prog/main.go
diff --git a/go/tests/prog/reversestrcap_prog/main.go b/go/tests/solutions/reversestrcap_prog/main.go
similarity index 100%
rename from go/tests/prog/reversestrcap_prog/main.go
rename to go/tests/solutions/reversestrcap_prog/main.go
diff --git a/go/tests/prog/revparams_prog/main.go b/go/tests/solutions/revparams_prog/main.go
similarity index 100%
rename from go/tests/prog/revparams_prog/main.go
rename to go/tests/solutions/revparams_prog/main.go
diff --git a/go/tests/prog/revwstr_prog/main.go b/go/tests/solutions/revwstr_prog/main.go
similarity index 100%
rename from go/tests/prog/revwstr_prog/main.go
rename to go/tests/solutions/revwstr_prog/main.go
diff --git a/go/tests/prog/robottoorigin_prog/main.go b/go/tests/solutions/robottoorigin_prog/main.go
similarity index 100%
rename from go/tests/prog/robottoorigin_prog/main.go
rename to go/tests/solutions/robottoorigin_prog/main.go
diff --git a/go/tests/prog/romannumbers_prog/main.go b/go/tests/solutions/romannumbers_prog/main.go
similarity index 100%
rename from go/tests/prog/romannumbers_prog/main.go
rename to go/tests/solutions/romannumbers_prog/main.go
diff --git a/go/tests/prog/rostring_prog/main.go b/go/tests/solutions/rostring_prog/main.go
similarity index 100%
rename from go/tests/prog/rostring_prog/main.go
rename to go/tests/solutions/rostring_prog/main.go
diff --git a/go/tests/prog/rot13_prog/main.go b/go/tests/solutions/rot13_prog/main.go
similarity index 100%
rename from go/tests/prog/rot13_prog/main.go
rename to go/tests/solutions/rot13_prog/main.go
diff --git a/go/tests/prog/rotatevowels_prog/main.go b/go/tests/solutions/rotatevowels_prog/main.go
similarity index 100%
rename from go/tests/prog/rotatevowels_prog/main.go
rename to go/tests/solutions/rotatevowels_prog/main.go
diff --git a/go/tests/prog/rpncalc_prog/main.go b/go/tests/solutions/rpncalc_prog/main.go
similarity index 100%
rename from go/tests/prog/rpncalc_prog/main.go
rename to go/tests/solutions/rpncalc_prog/main.go
diff --git a/go/tests/prog/searchreplace_prog/main.go b/go/tests/solutions/searchreplace_prog/main.go
similarity index 100%
rename from go/tests/prog/searchreplace_prog/main.go
rename to go/tests/solutions/searchreplace_prog/main.go
diff --git a/go/tests/prog/sortparams_prog/main.go b/go/tests/solutions/sortparams_prog/main.go
similarity index 100%
rename from go/tests/prog/sortparams_prog/main.go
rename to go/tests/solutions/sortparams_prog/main.go
diff --git a/go/tests/prog/sudoku_prog/main.go b/go/tests/solutions/sudoku_prog/main.go
similarity index 100%
rename from go/tests/prog/sudoku_prog/main.go
rename to go/tests/solutions/sudoku_prog/main.go
diff --git a/go/tests/prog/switchcase_prog/main.go b/go/tests/solutions/switchcase_prog/main.go
similarity index 100%
rename from go/tests/prog/switchcase_prog/main.go
rename to go/tests/solutions/switchcase_prog/main.go
diff --git a/go/tests/prog/tabmult_prog/main.go b/go/tests/solutions/tabmult_prog/main.go
similarity index 100%
rename from go/tests/prog/tabmult_prog/main.go
rename to go/tests/solutions/tabmult_prog/main.go
diff --git a/go/tests/prog/tetrisoptimizer_prog/board.go b/go/tests/solutions/tetrisoptimizer_prog/board.go
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/board.go
rename to go/tests/solutions/tetrisoptimizer_prog/board.go
diff --git a/go/tests/prog/tetrisoptimizer_prog/main.go b/go/tests/solutions/tetrisoptimizer_prog/main.go
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/main.go
rename to go/tests/solutions/tetrisoptimizer_prog/main.go
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/bad00.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/bad00.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/bad00.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/bad00.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/bad01.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/bad01.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/bad01.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/bad01.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/bad02.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/bad02.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/bad02.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/bad02.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/bad03.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/bad03.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/bad03.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/bad03.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/bad04.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/bad04.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/bad04.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/bad04.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/badFormat.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/badFormat.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/badFormat.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/badFormat.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_01-1-2-0.00.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_01-1-2-0.00.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_01-1-2-0.00.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_01-1-2-0.00.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_02-1-4-0.00.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_02-1-4-0.00.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_02-1-4-0.00.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_02-1-4-0.00.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_03-2-4-0.00.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_03-2-4-0.00.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_03-2-4-0.00.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_03-2-4-0.00.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_04-6-6-0.00.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_04-6-6-0.00.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_04-6-6-0.00.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_04-6-6-0.00.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_05-21-10-0.00.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_05-21-10-0.00.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_05-21-10-0.00.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_05-21-10-0.00.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_06-22-10-0.00.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_06-22-10-0.00.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_06-22-10-0.00.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_06-22-10-0.00.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_07-26-11-0.00.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_07-26-11-0.00.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_07-26-11-0.00.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_07-26-11-0.00.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_08-24-10-0.03.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_08-24-10-0.03.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_08-24-10-0.03.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_08-24-10-0.03.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_09-11-7-0.07.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_09-11-7-0.07.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_09-11-7-0.07.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_09-11-7-0.07.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_10-12-7-0.52.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_10-12-7-0.52.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_10-12-7-0.52.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_10-12-7-0.52.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_11-12-8-0.83.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_11-12-8-0.83.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_11-12-8-0.83.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_11-12-8-0.83.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_12-19-9-3.40.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_12-19-9-3.40.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_12-19-9-3.40.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_12-19-9-3.40.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_13-23-10-4.72.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_13-23-10-4.72.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_13-23-10-4.72.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_13-23-10-4.72.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_14-15-8-7.34.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_14-15-8-7.34.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_14-15-8-7.34.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_14-15-8-7.34.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/samples/good_15-26-11-72.22.txt b/go/tests/solutions/tetrisoptimizer_prog/samples/good_15-26-11-72.22.txt
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/samples/good_15-26-11-72.22.txt
rename to go/tests/solutions/tetrisoptimizer_prog/samples/good_15-26-11-72.22.txt
diff --git a/go/tests/prog/tetrisoptimizer_prog/solver.go b/go/tests/solutions/tetrisoptimizer_prog/solver.go
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/solver.go
rename to go/tests/solutions/tetrisoptimizer_prog/solver.go
diff --git a/go/tests/prog/tetrisoptimizer_prog/tetrimino.go b/go/tests/solutions/tetrisoptimizer_prog/tetrimino.go
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/tetrimino.go
rename to go/tests/solutions/tetrisoptimizer_prog/tetrimino.go
diff --git a/go/tests/prog/tetrisoptimizer_prog/validation.go b/go/tests/solutions/tetrisoptimizer_prog/validation.go
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_prog/validation.go
rename to go/tests/solutions/tetrisoptimizer_prog/validation.go
diff --git a/go/tests/prog/union_prog/main.go b/go/tests/solutions/union_prog/main.go
similarity index 100%
rename from go/tests/prog/union_prog/main.go
rename to go/tests/solutions/union_prog/main.go
diff --git a/go/tests/prog/uniqueoccurences_prog/main.go b/go/tests/solutions/uniqueoccurences_prog/main.go
similarity index 100%
rename from go/tests/prog/uniqueoccurences_prog/main.go
rename to go/tests/solutions/uniqueoccurences_prog/main.go
diff --git a/go/tests/prog/wdmatch_prog/main.go b/go/tests/solutions/wdmatch_prog/main.go
similarity index 100%
rename from go/tests/prog/wdmatch_prog/main.go
rename to go/tests/solutions/wdmatch_prog/main.go
diff --git a/go/tests/prog/ztail_prog/main.go b/go/tests/solutions/ztail_prog/main.go
similarity index 100%
rename from go/tests/prog/ztail_prog/main.go
rename to go/tests/solutions/ztail_prog/main.go
diff --git a/go/tests/prog/abort_test/main.go b/go/tests/tests/abort_test/main.go
similarity index 100%
rename from go/tests/prog/abort_test/main.go
rename to go/tests/tests/abort_test/main.go
diff --git a/go/tests/prog/activebits_test/main.go b/go/tests/tests/activebits_test/main.go
similarity index 100%
rename from go/tests/prog/activebits_test/main.go
rename to go/tests/tests/activebits_test/main.go
diff --git a/go/tests/prog/addprimesum_test/main.go b/go/tests/tests/addprimesum_test/main.go
similarity index 100%
rename from go/tests/prog/addprimesum_test/main.go
rename to go/tests/tests/addprimesum_test/main.go
diff --git a/go/tests/prog/advancedsortwordarr_test/main.go b/go/tests/tests/advancedsortwordarr_test/main.go
similarity index 100%
rename from go/tests/prog/advancedsortwordarr_test/main.go
rename to go/tests/tests/advancedsortwordarr_test/main.go
diff --git a/go/tests/prog/alphacount_test/main.go b/go/tests/tests/alphacount_test/main.go
similarity index 100%
rename from go/tests/prog/alphacount_test/main.go
rename to go/tests/tests/alphacount_test/main.go
diff --git a/go/tests/prog/alphamirror_test/main.go b/go/tests/tests/alphamirror_test/main.go
similarity index 100%
rename from go/tests/prog/alphamirror_test/main.go
rename to go/tests/tests/alphamirror_test/main.go
diff --git a/go/tests/prog/any_test/main.go b/go/tests/tests/any_test/main.go
similarity index 100%
rename from go/tests/prog/any_test/main.go
rename to go/tests/tests/any_test/main.go
diff --git a/go/tests/prog/appendrange_test/main.go b/go/tests/tests/appendrange_test/main.go
similarity index 100%
rename from go/tests/prog/appendrange_test/main.go
rename to go/tests/tests/appendrange_test/main.go
diff --git a/go/tests/prog/atoi_test/main.go b/go/tests/tests/atoi_test/main.go
similarity index 100%
rename from go/tests/prog/atoi_test/main.go
rename to go/tests/tests/atoi_test/main.go
diff --git a/go/tests/prog/atoibase_test/main.go b/go/tests/tests/atoibase_test/main.go
similarity index 100%
rename from go/tests/prog/atoibase_test/main.go
rename to go/tests/tests/atoibase_test/main.go
diff --git a/go/tests/prog/balancedstring_test/main.go b/go/tests/tests/balancedstring_test/main.go
similarity index 100%
rename from go/tests/prog/balancedstring_test/main.go
rename to go/tests/tests/balancedstring_test/main.go
diff --git a/go/tests/prog/basicatoi2_test/main.go b/go/tests/tests/basicatoi2_test/main.go
similarity index 100%
rename from go/tests/prog/basicatoi2_test/main.go
rename to go/tests/tests/basicatoi2_test/main.go
diff --git a/go/tests/prog/basicatoi_test/main.go b/go/tests/tests/basicatoi_test/main.go
similarity index 100%
rename from go/tests/prog/basicatoi_test/main.go
rename to go/tests/tests/basicatoi_test/main.go
diff --git a/go/tests/prog/basicjoin_test/main.go b/go/tests/tests/basicjoin_test/main.go
similarity index 100%
rename from go/tests/prog/basicjoin_test/main.go
rename to go/tests/tests/basicjoin_test/main.go
diff --git a/go/tests/prog/boolean_test/main.go b/go/tests/tests/boolean_test/main.go
similarity index 100%
rename from go/tests/prog/boolean_test/main.go
rename to go/tests/tests/boolean_test/main.go
diff --git a/go/tests/prog/brackets_test/main.go b/go/tests/tests/brackets_test/main.go
similarity index 100%
rename from go/tests/prog/brackets_test/main.go
rename to go/tests/tests/brackets_test/main.go
diff --git a/go/tests/prog/brainfuck_test/main.go b/go/tests/tests/brainfuck_test/main.go
similarity index 100%
rename from go/tests/prog/brainfuck_test/main.go
rename to go/tests/tests/brainfuck_test/main.go
diff --git a/go/tests/prog/btreeapplybylevel_test/main.go b/go/tests/tests/btreeapplybylevel_test/main.go
similarity index 100%
rename from go/tests/prog/btreeapplybylevel_test/main.go
rename to go/tests/tests/btreeapplybylevel_test/main.go
diff --git a/go/tests/prog/btreeapplyinorder_test/main.go b/go/tests/tests/btreeapplyinorder_test/main.go
similarity index 100%
rename from go/tests/prog/btreeapplyinorder_test/main.go
rename to go/tests/tests/btreeapplyinorder_test/main.go
diff --git a/go/tests/prog/btreeapplypostorder_test/main.go b/go/tests/tests/btreeapplypostorder_test/main.go
similarity index 100%
rename from go/tests/prog/btreeapplypostorder_test/main.go
rename to go/tests/tests/btreeapplypostorder_test/main.go
diff --git a/go/tests/prog/btreeapplypreorder_test/main.go b/go/tests/tests/btreeapplypreorder_test/main.go
similarity index 100%
rename from go/tests/prog/btreeapplypreorder_test/main.go
rename to go/tests/tests/btreeapplypreorder_test/main.go
diff --git a/go/tests/prog/btreedeletenode_test/main.go b/go/tests/tests/btreedeletenode_test/main.go
similarity index 100%
rename from go/tests/prog/btreedeletenode_test/main.go
rename to go/tests/tests/btreedeletenode_test/main.go
diff --git a/go/tests/prog/btreeinsertdata_test/main.go b/go/tests/tests/btreeinsertdata_test/main.go
similarity index 100%
rename from go/tests/prog/btreeinsertdata_test/main.go
rename to go/tests/tests/btreeinsertdata_test/main.go
diff --git a/go/tests/prog/btreeisbinary_test/main.go b/go/tests/tests/btreeisbinary_test/main.go
similarity index 100%
rename from go/tests/prog/btreeisbinary_test/main.go
rename to go/tests/tests/btreeisbinary_test/main.go
diff --git a/go/tests/prog/btreelevelcount_test/main.go b/go/tests/tests/btreelevelcount_test/main.go
similarity index 100%
rename from go/tests/prog/btreelevelcount_test/main.go
rename to go/tests/tests/btreelevelcount_test/main.go
diff --git a/go/tests/prog/btreemax_test/main.go b/go/tests/tests/btreemax_test/main.go
similarity index 100%
rename from go/tests/prog/btreemax_test/main.go
rename to go/tests/tests/btreemax_test/main.go
diff --git a/go/tests/prog/btreemin_test/main.go b/go/tests/tests/btreemin_test/main.go
similarity index 100%
rename from go/tests/prog/btreemin_test/main.go
rename to go/tests/tests/btreemin_test/main.go
diff --git a/go/tests/prog/btreesearchitem_test/main.go b/go/tests/tests/btreesearchitem_test/main.go
similarity index 100%
rename from go/tests/prog/btreesearchitem_test/main.go
rename to go/tests/tests/btreesearchitem_test/main.go
diff --git a/go/tests/prog/btreetransplant_test/main.go b/go/tests/tests/btreetransplant_test/main.go
similarity index 100%
rename from go/tests/prog/btreetransplant_test/main.go
rename to go/tests/tests/btreetransplant_test/main.go
diff --git a/go/tests/prog/capitalize_test/main.go b/go/tests/tests/capitalize_test/main.go
similarity index 100%
rename from go/tests/prog/capitalize_test/main.go
rename to go/tests/tests/capitalize_test/main.go
diff --git a/go/tests/prog/cat_test/main.go b/go/tests/tests/cat_test/main.go
similarity index 100%
rename from go/tests/prog/cat_test/main.go
rename to go/tests/tests/cat_test/main.go
diff --git a/go/tests/prog/chunk_test/main.go b/go/tests/tests/chunk_test/main.go
similarity index 100%
rename from go/tests/prog/chunk_test/main.go
rename to go/tests/tests/chunk_test/main.go
diff --git a/go/tests/prog/cleanstr_test/main.go b/go/tests/tests/cleanstr_test/main.go
similarity index 100%
rename from go/tests/prog/cleanstr_test/main.go
rename to go/tests/tests/cleanstr_test/main.go
diff --git a/go/tests/prog/collatzcountdown_test/main.go b/go/tests/tests/collatzcountdown_test/main.go
similarity index 100%
rename from go/tests/prog/collatzcountdown_test/main.go
rename to go/tests/tests/collatzcountdown_test/main.go
diff --git a/go/tests/prog/comcheck_test/main.go b/go/tests/tests/comcheck_test/main.go
similarity index 100%
rename from go/tests/prog/comcheck_test/main.go
rename to go/tests/tests/comcheck_test/main.go
diff --git a/go/tests/prog/compact_test/main.go b/go/tests/tests/compact_test/main.go
similarity index 100%
rename from go/tests/prog/compact_test/main.go
rename to go/tests/tests/compact_test/main.go
diff --git a/go/tests/prog/compare_test/main.go b/go/tests/tests/compare_test/main.go
similarity index 100%
rename from go/tests/prog/compare_test/main.go
rename to go/tests/tests/compare_test/main.go
diff --git a/go/tests/prog/concat_test/main.go b/go/tests/tests/concat_test/main.go
similarity index 100%
rename from go/tests/prog/concat_test/main.go
rename to go/tests/tests/concat_test/main.go
diff --git a/go/tests/prog/concatparams_test/main.go b/go/tests/tests/concatparams_test/main.go
similarity index 100%
rename from go/tests/prog/concatparams_test/main.go
rename to go/tests/tests/concatparams_test/main.go
diff --git a/go/tests/prog/convertbase_test/main.go b/go/tests/tests/convertbase_test/main.go
similarity index 100%
rename from go/tests/prog/convertbase_test/main.go
rename to go/tests/tests/convertbase_test/main.go
diff --git a/go/tests/prog/correct/btree.go b/go/tests/tests/correct/btree.go
similarity index 100%
rename from go/tests/prog/correct/btree.go
rename to go/tests/tests/correct/btree.go
diff --git a/go/tests/prog/correct/challenge.go b/go/tests/tests/correct/challenge.go
similarity index 100%
rename from go/tests/prog/correct/challenge.go
rename to go/tests/tests/correct/challenge.go
diff --git a/go/tests/prog/correct/listat.go b/go/tests/tests/correct/listat.go
similarity index 100%
rename from go/tests/prog/correct/listat.go
rename to go/tests/tests/correct/listat.go
diff --git a/go/tests/prog/correct/listclear.go b/go/tests/tests/correct/listclear.go
similarity index 100%
rename from go/tests/prog/correct/listclear.go
rename to go/tests/tests/correct/listclear.go
diff --git a/go/tests/prog/correct/listfind.go b/go/tests/tests/correct/listfind.go
similarity index 100%
rename from go/tests/prog/correct/listfind.go
rename to go/tests/tests/correct/listfind.go
diff --git a/go/tests/prog/correct/listforeach.go b/go/tests/tests/correct/listforeach.go
similarity index 100%
rename from go/tests/prog/correct/listforeach.go
rename to go/tests/tests/correct/listforeach.go
diff --git a/go/tests/prog/correct/listforeachif.go b/go/tests/tests/correct/listforeachif.go
similarity index 100%
rename from go/tests/prog/correct/listforeachif.go
rename to go/tests/tests/correct/listforeachif.go
diff --git a/go/tests/prog/correct/listlast.go b/go/tests/tests/correct/listlast.go
similarity index 100%
rename from go/tests/prog/correct/listlast.go
rename to go/tests/tests/correct/listlast.go
diff --git a/go/tests/prog/correct/listmerge.go b/go/tests/tests/correct/listmerge.go
similarity index 100%
rename from go/tests/prog/correct/listmerge.go
rename to go/tests/tests/correct/listmerge.go
diff --git a/go/tests/prog/correct/listpushback.go b/go/tests/tests/correct/listpushback.go
similarity index 100%
rename from go/tests/prog/correct/listpushback.go
rename to go/tests/tests/correct/listpushback.go
diff --git a/go/tests/prog/correct/listpushfront.go b/go/tests/tests/correct/listpushfront.go
similarity index 100%
rename from go/tests/prog/correct/listpushfront.go
rename to go/tests/tests/correct/listpushfront.go
diff --git a/go/tests/prog/correct/listremoveif.go b/go/tests/tests/correct/listremoveif.go
similarity index 100%
rename from go/tests/prog/correct/listremoveif.go
rename to go/tests/tests/correct/listremoveif.go
diff --git a/go/tests/prog/correct/listreverse.go b/go/tests/tests/correct/listreverse.go
similarity index 100%
rename from go/tests/prog/correct/listreverse.go
rename to go/tests/tests/correct/listreverse.go
diff --git a/go/tests/prog/correct/listsize.go b/go/tests/tests/correct/listsize.go
similarity index 100%
rename from go/tests/prog/correct/listsize.go
rename to go/tests/tests/correct/listsize.go
diff --git a/go/tests/prog/correct/listsort.go b/go/tests/tests/correct/listsort.go
similarity index 100%
rename from go/tests/prog/correct/listsort.go
rename to go/tests/tests/correct/listsort.go
diff --git a/go/tests/prog/correct/sortedlistmerge.go b/go/tests/tests/correct/sortedlistmerge.go
similarity index 100%
rename from go/tests/prog/correct/sortedlistmerge.go
rename to go/tests/tests/correct/sortedlistmerge.go
diff --git a/go/tests/prog/correct/sortlistinsert.go b/go/tests/tests/correct/sortlistinsert.go
similarity index 100%
rename from go/tests/prog/correct/sortlistinsert.go
rename to go/tests/tests/correct/sortlistinsert.go
diff --git a/go/tests/prog/costumeprofit_test/main.go b/go/tests/tests/costumeprofit_test/main.go
similarity index 100%
rename from go/tests/prog/costumeprofit_test/main.go
rename to go/tests/tests/costumeprofit_test/main.go
diff --git a/go/tests/prog/countdown_test/main.go b/go/tests/tests/countdown_test/main.go
similarity index 100%
rename from go/tests/prog/countdown_test/main.go
rename to go/tests/tests/countdown_test/main.go
diff --git a/go/tests/prog/countif_test/main.go b/go/tests/tests/countif_test/main.go
similarity index 100%
rename from go/tests/prog/countif_test/main.go
rename to go/tests/tests/countif_test/main.go
diff --git a/go/tests/prog/displaya_test/main.go b/go/tests/tests/displaya_test/main.go
similarity index 100%
rename from go/tests/prog/displaya_test/main.go
rename to go/tests/tests/displaya_test/main.go
diff --git a/go/tests/prog/displayalpham_test/main.go b/go/tests/tests/displayalpham_test/main.go
similarity index 100%
rename from go/tests/prog/displayalpham_test/main.go
rename to go/tests/tests/displayalpham_test/main.go
diff --git a/go/tests/prog/displayalrevm_test/main.go b/go/tests/tests/displayalrevm_test/main.go
similarity index 100%
rename from go/tests/prog/displayalrevm_test/main.go
rename to go/tests/tests/displayalrevm_test/main.go
diff --git a/go/tests/prog/displayfile_test/main.go b/go/tests/tests/displayfile_test/main.go
similarity index 100%
rename from go/tests/prog/displayfile_test/main.go
rename to go/tests/tests/displayfile_test/main.go
diff --git a/go/tests/prog/displayfirstparam_test/main.go b/go/tests/tests/displayfirstparam_test/main.go
similarity index 100%
rename from go/tests/prog/displayfirstparam_test/main.go
rename to go/tests/tests/displayfirstparam_test/main.go
diff --git a/go/tests/prog/displaylastparam_test/main.go b/go/tests/tests/displaylastparam_test/main.go
similarity index 100%
rename from go/tests/prog/displaylastparam_test/main.go
rename to go/tests/tests/displaylastparam_test/main.go
diff --git a/go/tests/prog/displayz_test/main.go b/go/tests/tests/displayz_test/main.go
similarity index 100%
rename from go/tests/prog/displayz_test/main.go
rename to go/tests/tests/displayz_test/main.go
diff --git a/go/tests/prog/divmod_test/main.go b/go/tests/tests/divmod_test/main.go
similarity index 100%
rename from go/tests/prog/divmod_test/main.go
rename to go/tests/tests/divmod_test/main.go
diff --git a/go/tests/prog/doop_test/main.go b/go/tests/tests/doop_test/main.go
similarity index 100%
rename from go/tests/prog/doop_test/main.go
rename to go/tests/tests/doop_test/main.go
diff --git a/go/tests/prog/doppelganger_test/main.go b/go/tests/tests/doppelganger_test/main.go
similarity index 100%
rename from go/tests/prog/doppelganger_test/main.go
rename to go/tests/tests/doppelganger_test/main.go
diff --git a/go/tests/prog/eightqueens_test/main.go b/go/tests/tests/eightqueens_test/main.go
similarity index 100%
rename from go/tests/prog/eightqueens_test/main.go
rename to go/tests/tests/eightqueens_test/main.go
diff --git a/go/tests/prog/enigma_test/main.go b/go/tests/tests/enigma_test/main.go
similarity index 100%
rename from go/tests/prog/enigma_test/main.go
rename to go/tests/tests/enigma_test/main.go
diff --git a/go/tests/prog/expandstr_test/main.go b/go/tests/tests/expandstr_test/main.go
similarity index 100%
rename from go/tests/prog/expandstr_test/main.go
rename to go/tests/tests/expandstr_test/main.go
diff --git a/go/tests/prog/fib_test/main.go b/go/tests/tests/fib_test/main.go
similarity index 100%
rename from go/tests/prog/fib_test/main.go
rename to go/tests/tests/fib_test/main.go
diff --git a/go/tests/prog/fibonacci_test/main.go b/go/tests/tests/fibonacci_test/main.go
similarity index 100%
rename from go/tests/prog/fibonacci_test/main.go
rename to go/tests/tests/fibonacci_test/main.go
diff --git a/go/tests/prog/findnextprime_test/main.go b/go/tests/tests/findnextprime_test/main.go
similarity index 100%
rename from go/tests/prog/findnextprime_test/main.go
rename to go/tests/tests/findnextprime_test/main.go
diff --git a/go/tests/prog/findprevprime_test/main.go b/go/tests/tests/findprevprime_test/main.go
similarity index 100%
rename from go/tests/prog/findprevprime_test/main.go
rename to go/tests/tests/findprevprime_test/main.go
diff --git a/go/tests/prog/firstrune_test/main.go b/go/tests/tests/firstrune_test/main.go
similarity index 100%
rename from go/tests/prog/firstrune_test/main.go
rename to go/tests/tests/firstrune_test/main.go
diff --git a/go/tests/prog/firstword_test/main.go b/go/tests/tests/firstword_test/main.go
similarity index 100%
rename from go/tests/prog/firstword_test/main.go
rename to go/tests/tests/firstword_test/main.go
diff --git a/go/tests/prog/fixthemain_test/main.go b/go/tests/tests/fixthemain_test/main.go
similarity index 100%
rename from go/tests/prog/fixthemain_test/main.go
rename to go/tests/tests/fixthemain_test/main.go
diff --git a/go/tests/prog/flags_test/main.go b/go/tests/tests/flags_test/main.go
similarity index 100%
rename from go/tests/prog/flags_test/main.go
rename to go/tests/tests/flags_test/main.go
diff --git a/go/tests/prog/foldint_test/main.go b/go/tests/tests/foldint_test/main.go
similarity index 100%
rename from go/tests/prog/foldint_test/main.go
rename to go/tests/tests/foldint_test/main.go
diff --git a/go/tests/prog/foreach_test/main.go b/go/tests/tests/foreach_test/main.go
similarity index 100%
rename from go/tests/prog/foreach_test/main.go
rename to go/tests/tests/foreach_test/main.go
diff --git a/go/tests/prog/fprime_test/main.go b/go/tests/tests/fprime_test/main.go
similarity index 100%
rename from go/tests/prog/fprime_test/main.go
rename to go/tests/tests/fprime_test/main.go
diff --git a/go/tests/prog/game23_test/main.go b/go/tests/tests/game23_test/main.go
similarity index 100%
rename from go/tests/prog/game23_test/main.go
rename to go/tests/tests/game23_test/main.go
diff --git a/go/tests/prog/gcd_test/main.go b/go/tests/tests/gcd_test/main.go
similarity index 100%
rename from go/tests/prog/gcd_test/main.go
rename to go/tests/tests/gcd_test/main.go
diff --git a/go/tests/prog/grouping_test/main.go b/go/tests/tests/grouping_test/main.go
similarity index 100%
rename from go/tests/prog/grouping_test/main.go
rename to go/tests/tests/grouping_test/main.go
diff --git a/go/tests/prog/halfcontest_test/main.go b/go/tests/tests/halfcontest_test/main.go
similarity index 100%
rename from go/tests/prog/halfcontest_test/main.go
rename to go/tests/tests/halfcontest_test/main.go
diff --git a/go/tests/prog/hello_test/main.go b/go/tests/tests/hello_test/main.go
similarity index 100%
rename from go/tests/prog/hello_test/main.go
rename to go/tests/tests/hello_test/main.go
diff --git a/go/tests/prog/hiddenp_test/main.go b/go/tests/tests/hiddenp_test/main.go
similarity index 100%
rename from go/tests/prog/hiddenp_test/main.go
rename to go/tests/tests/hiddenp_test/main.go
diff --git a/go/tests/prog/index_test/main.go b/go/tests/tests/index_test/main.go
similarity index 100%
rename from go/tests/prog/index_test/main.go
rename to go/tests/tests/index_test/main.go
diff --git a/go/tests/prog/inter_test/main.go b/go/tests/tests/inter_test/main.go
similarity index 100%
rename from go/tests/prog/inter_test/main.go
rename to go/tests/tests/inter_test/main.go
diff --git a/go/tests/prog/interestingnumber_test/main.go b/go/tests/tests/interestingnumber_test/main.go
similarity index 100%
rename from go/tests/prog/interestingnumber_test/main.go
rename to go/tests/tests/interestingnumber_test/main.go
diff --git a/go/tests/prog/isalpha_test/main.go b/go/tests/tests/isalpha_test/main.go
similarity index 100%
rename from go/tests/prog/isalpha_test/main.go
rename to go/tests/tests/isalpha_test/main.go
diff --git a/go/tests/prog/isanagram_test/main.go b/go/tests/tests/isanagram_test/main.go
similarity index 100%
rename from go/tests/prog/isanagram_test/main.go
rename to go/tests/tests/isanagram_test/main.go
diff --git a/go/tests/prog/islower_test/main.go b/go/tests/tests/islower_test/main.go
similarity index 100%
rename from go/tests/prog/islower_test/main.go
rename to go/tests/tests/islower_test/main.go
diff --git a/go/tests/prog/isnegative_test/main.go b/go/tests/tests/isnegative_test/main.go
similarity index 100%
rename from go/tests/prog/isnegative_test/main.go
rename to go/tests/tests/isnegative_test/main.go
diff --git a/go/tests/prog/isnumeric_test/main.go b/go/tests/tests/isnumeric_test/main.go
similarity index 100%
rename from go/tests/prog/isnumeric_test/main.go
rename to go/tests/tests/isnumeric_test/main.go
diff --git a/go/tests/prog/ispowerof2_test/main.go b/go/tests/tests/ispowerof2_test/main.go
similarity index 100%
rename from go/tests/prog/ispowerof2_test/main.go
rename to go/tests/tests/ispowerof2_test/main.go
diff --git a/go/tests/prog/isprime_test/main.go b/go/tests/tests/isprime_test/main.go
similarity index 100%
rename from go/tests/prog/isprime_test/main.go
rename to go/tests/tests/isprime_test/main.go
diff --git a/go/tests/prog/isprintable_test/main.go b/go/tests/tests/isprintable_test/main.go
similarity index 100%
rename from go/tests/prog/isprintable_test/main.go
rename to go/tests/tests/isprintable_test/main.go
diff --git a/go/tests/prog/issorted_test/main.go b/go/tests/tests/issorted_test/main.go
similarity index 100%
rename from go/tests/prog/issorted_test/main.go
rename to go/tests/tests/issorted_test/main.go
diff --git a/go/tests/prog/isupper_test/main.go b/go/tests/tests/isupper_test/main.go
similarity index 100%
rename from go/tests/prog/isupper_test/main.go
rename to go/tests/tests/isupper_test/main.go
diff --git a/go/tests/prog/iterativefactorial_test/main.go b/go/tests/tests/iterativefactorial_test/main.go
similarity index 100%
rename from go/tests/prog/iterativefactorial_test/main.go
rename to go/tests/tests/iterativefactorial_test/main.go
diff --git a/go/tests/prog/iterativepower_test/main.go b/go/tests/tests/iterativepower_test/main.go
similarity index 100%
rename from go/tests/prog/iterativepower_test/main.go
rename to go/tests/tests/iterativepower_test/main.go
diff --git a/go/tests/prog/itoa_test/main.go b/go/tests/tests/itoa_test/main.go
similarity index 100%
rename from go/tests/prog/itoa_test/main.go
rename to go/tests/tests/itoa_test/main.go
diff --git a/go/tests/prog/itoabase_test/main.go b/go/tests/tests/itoabase_test/main.go
similarity index 100%
rename from go/tests/prog/itoabase_test/main.go
rename to go/tests/tests/itoabase_test/main.go
diff --git a/go/tests/prog/join_test/main.go b/go/tests/tests/join_test/main.go
similarity index 100%
rename from go/tests/prog/join_test/main.go
rename to go/tests/tests/join_test/main.go
diff --git a/go/tests/prog/lastrune_test/main.go b/go/tests/tests/lastrune_test/main.go
similarity index 100%
rename from go/tests/prog/lastrune_test/main.go
rename to go/tests/tests/lastrune_test/main.go
diff --git a/go/tests/prog/lastword_test/main.go b/go/tests/tests/lastword_test/main.go
similarity index 100%
rename from go/tests/prog/lastword_test/main.go
rename to go/tests/tests/lastword_test/main.go
diff --git a/go/tests/prog/lcm_test/main.go b/go/tests/tests/lcm_test/main.go
similarity index 100%
rename from go/tests/prog/lcm_test/main.go
rename to go/tests/tests/lcm_test/main.go
diff --git a/go/tests/prog/listat_test/main.go b/go/tests/tests/listat_test/main.go
similarity index 100%
rename from go/tests/prog/listat_test/main.go
rename to go/tests/tests/listat_test/main.go
diff --git a/go/tests/prog/listclear_test/main.go b/go/tests/tests/listclear_test/main.go
similarity index 100%
rename from go/tests/prog/listclear_test/main.go
rename to go/tests/tests/listclear_test/main.go
diff --git a/go/tests/prog/listfind_test/main.go b/go/tests/tests/listfind_test/main.go
similarity index 100%
rename from go/tests/prog/listfind_test/main.go
rename to go/tests/tests/listfind_test/main.go
diff --git a/go/tests/prog/listforeach_test/main.go b/go/tests/tests/listforeach_test/main.go
similarity index 100%
rename from go/tests/prog/listforeach_test/main.go
rename to go/tests/tests/listforeach_test/main.go
diff --git a/go/tests/prog/listforeachif_test/main.go b/go/tests/tests/listforeachif_test/main.go
similarity index 100%
rename from go/tests/prog/listforeachif_test/main.go
rename to go/tests/tests/listforeachif_test/main.go
diff --git a/go/tests/prog/listlast_test/main.go b/go/tests/tests/listlast_test/main.go
similarity index 100%
rename from go/tests/prog/listlast_test/main.go
rename to go/tests/tests/listlast_test/main.go
diff --git a/go/tests/prog/listmerge_test/main.go b/go/tests/tests/listmerge_test/main.go
similarity index 100%
rename from go/tests/prog/listmerge_test/main.go
rename to go/tests/tests/listmerge_test/main.go
diff --git a/go/tests/prog/listpushback_test/main.go b/go/tests/tests/listpushback_test/main.go
similarity index 100%
rename from go/tests/prog/listpushback_test/main.go
rename to go/tests/tests/listpushback_test/main.go
diff --git a/go/tests/prog/listpushfront_test/main.go b/go/tests/tests/listpushfront_test/main.go
similarity index 100%
rename from go/tests/prog/listpushfront_test/main.go
rename to go/tests/tests/listpushfront_test/main.go
diff --git a/go/tests/prog/listremoveif_test/main.go b/go/tests/tests/listremoveif_test/main.go
similarity index 100%
rename from go/tests/prog/listremoveif_test/main.go
rename to go/tests/tests/listremoveif_test/main.go
diff --git a/go/tests/prog/listreverse_test/main.go b/go/tests/tests/listreverse_test/main.go
similarity index 100%
rename from go/tests/prog/listreverse_test/main.go
rename to go/tests/tests/listreverse_test/main.go
diff --git a/go/tests/prog/listsize_test/main.go b/go/tests/tests/listsize_test/main.go
similarity index 100%
rename from go/tests/prog/listsize_test/main.go
rename to go/tests/tests/listsize_test/main.go
diff --git a/go/tests/prog/listsort_test/main.go b/go/tests/tests/listsort_test/main.go
similarity index 100%
rename from go/tests/prog/listsort_test/main.go
rename to go/tests/tests/listsort_test/main.go
diff --git a/go/tests/prog/makerange_test/main.go b/go/tests/tests/makerange_test/main.go
similarity index 100%
rename from go/tests/prog/makerange_test/main.go
rename to go/tests/tests/makerange_test/main.go
diff --git a/go/tests/prog/map_test/main.go b/go/tests/tests/map_test/main.go
similarity index 100%
rename from go/tests/prog/map_test/main.go
rename to go/tests/tests/map_test/main.go
diff --git a/go/tests/prog/max_test/main.go b/go/tests/tests/max_test/main.go
similarity index 100%
rename from go/tests/prog/max_test/main.go
rename to go/tests/tests/max_test/main.go
diff --git a/go/tests/prog/nauuo_test/main.go b/go/tests/tests/nauuo_test/main.go
similarity index 100%
rename from go/tests/prog/nauuo_test/main.go
rename to go/tests/tests/nauuo_test/main.go
diff --git a/go/tests/prog/nbrconvertalpha_test/main.go b/go/tests/tests/nbrconvertalpha_test/main.go
similarity index 100%
rename from go/tests/prog/nbrconvertalpha_test/main.go
rename to go/tests/tests/nbrconvertalpha_test/main.go
diff --git a/go/tests/prog/nenokku_test/main.go b/go/tests/tests/nenokku_test/main.go
similarity index 100%
rename from go/tests/prog/nenokku_test/main.go
rename to go/tests/tests/nenokku_test/main.go
diff --git a/go/tests/prog/nrune_test/main.go b/go/tests/tests/nrune_test/main.go
similarity index 100%
rename from go/tests/prog/nrune_test/main.go
rename to go/tests/tests/nrune_test/main.go
diff --git a/go/tests/prog/onlya_test/main.go b/go/tests/tests/onlya_test/main.go
similarity index 100%
rename from go/tests/prog/onlya_test/main.go
rename to go/tests/tests/onlya_test/main.go
diff --git a/go/tests/prog/onlyz_test/main.go b/go/tests/tests/onlyz_test/main.go
similarity index 100%
rename from go/tests/prog/onlyz_test/main.go
rename to go/tests/tests/onlyz_test/main.go
diff --git a/go/tests/prog/options_test/main.go b/go/tests/tests/options_test/main.go
similarity index 100%
rename from go/tests/prog/options_test/main.go
rename to go/tests/tests/options_test/main.go
diff --git a/go/tests/prog/paramcount_test/main.go b/go/tests/tests/paramcount_test/main.go
similarity index 100%
rename from go/tests/prog/paramcount_test/main.go
rename to go/tests/tests/paramcount_test/main.go
diff --git a/go/tests/prog/piglatin_test/main.go b/go/tests/tests/piglatin_test/main.go
similarity index 100%
rename from go/tests/prog/piglatin_test/main.go
rename to go/tests/tests/piglatin_test/main.go
diff --git a/go/tests/prog/pilot_test/main.go b/go/tests/tests/pilot_test/main.go
similarity index 100%
rename from go/tests/prog/pilot_test/main.go
rename to go/tests/tests/pilot_test/main.go
diff --git a/go/tests/prog/point_test/main.go b/go/tests/tests/point_test/main.go
similarity index 100%
rename from go/tests/prog/point_test/main.go
rename to go/tests/tests/point_test/main.go
diff --git a/go/tests/prog/pointone_test/main.go b/go/tests/tests/pointone_test/main.go
similarity index 100%
rename from go/tests/prog/pointone_test/main.go
rename to go/tests/tests/pointone_test/main.go
diff --git a/go/tests/prog/printalphabet_test/main.go b/go/tests/tests/printalphabet_test/main.go
similarity index 100%
rename from go/tests/prog/printalphabet_test/main.go
rename to go/tests/tests/printalphabet_test/main.go
diff --git a/go/tests/prog/printalphabetalt2_test/main.go b/go/tests/tests/printalphabetalt2_test/main.go
similarity index 100%
rename from go/tests/prog/printalphabetalt2_test/main.go
rename to go/tests/tests/printalphabetalt2_test/main.go
diff --git a/go/tests/prog/printalphabetalt_test/main.go b/go/tests/tests/printalphabetalt_test/main.go
similarity index 100%
rename from go/tests/prog/printalphabetalt_test/main.go
rename to go/tests/tests/printalphabetalt_test/main.go
diff --git a/go/tests/prog/printalphabetg_test/main.go b/go/tests/tests/printalphabetg_test/main.go
similarity index 100%
rename from go/tests/prog/printalphabetg_test/main.go
rename to go/tests/tests/printalphabetg_test/main.go
diff --git a/go/tests/prog/printalt2_test/main.go b/go/tests/tests/printalt2_test/main.go
similarity index 100%
rename from go/tests/prog/printalt2_test/main.go
rename to go/tests/tests/printalt2_test/main.go
diff --git a/go/tests/prog/printalt_test/main.go b/go/tests/tests/printalt_test/main.go
similarity index 100%
rename from go/tests/prog/printalt_test/main.go
rename to go/tests/tests/printalt_test/main.go
diff --git a/go/tests/prog/printaltu2_test/main.go b/go/tests/tests/printaltu2_test/main.go
similarity index 100%
rename from go/tests/prog/printaltu2_test/main.go
rename to go/tests/tests/printaltu2_test/main.go
diff --git a/go/tests/prog/printaltu_test/main.go b/go/tests/tests/printaltu_test/main.go
similarity index 100%
rename from go/tests/prog/printaltu_test/main.go
rename to go/tests/tests/printaltu_test/main.go
diff --git a/go/tests/prog/printbits_test/main.go b/go/tests/tests/printbits_test/main.go
similarity index 100%
rename from go/tests/prog/printbits_test/main.go
rename to go/tests/tests/printbits_test/main.go
diff --git a/go/tests/prog/printchessboard_test/main.go b/go/tests/tests/printchessboard_test/main.go
similarity index 100%
rename from go/tests/prog/printchessboard_test/main.go
rename to go/tests/tests/printchessboard_test/main.go
diff --git a/go/tests/prog/printcomb2_test/main.go b/go/tests/tests/printcomb2_test/main.go
similarity index 100%
rename from go/tests/prog/printcomb2_test/main.go
rename to go/tests/tests/printcomb2_test/main.go
diff --git a/go/tests/prog/printcomb_test/main.go b/go/tests/tests/printcomb_test/main.go
similarity index 100%
rename from go/tests/prog/printcomb_test/main.go
rename to go/tests/tests/printcomb_test/main.go
diff --git a/go/tests/prog/printcombn_test/main.go b/go/tests/tests/printcombn_test/main.go
similarity index 100%
rename from go/tests/prog/printcombn_test/main.go
rename to go/tests/tests/printcombn_test/main.go
diff --git a/go/tests/prog/printdigits_test/main.go b/go/tests/tests/printdigits_test/main.go
similarity index 100%
rename from go/tests/prog/printdigits_test/main.go
rename to go/tests/tests/printdigits_test/main.go
diff --git a/go/tests/prog/printhex_test/main.go b/go/tests/tests/printhex_test/main.go
similarity index 100%
rename from go/tests/prog/printhex_test/main.go
rename to go/tests/tests/printhex_test/main.go
diff --git a/go/tests/prog/printmemory_test/main.go b/go/tests/tests/printmemory_test/main.go
similarity index 100%
rename from go/tests/prog/printmemory_test/main.go
rename to go/tests/tests/printmemory_test/main.go
diff --git a/go/tests/prog/printnbr_test/main.go b/go/tests/tests/printnbr_test/main.go
similarity index 100%
rename from go/tests/prog/printnbr_test/main.go
rename to go/tests/tests/printnbr_test/main.go
diff --git a/go/tests/prog/printnbrbase_test/main.go b/go/tests/tests/printnbrbase_test/main.go
similarity index 100%
rename from go/tests/prog/printnbrbase_test/main.go
rename to go/tests/tests/printnbrbase_test/main.go
diff --git a/go/tests/prog/printnbrinorder_test/main.go b/go/tests/tests/printnbrinorder_test/main.go
similarity index 100%
rename from go/tests/prog/printnbrinorder_test/main.go
rename to go/tests/tests/printnbrinorder_test/main.go
diff --git a/go/tests/prog/printparams_test/main.go b/go/tests/tests/printparams_test/main.go
similarity index 100%
rename from go/tests/prog/printparams_test/main.go
rename to go/tests/tests/printparams_test/main.go
diff --git a/go/tests/prog/printprogramname_test/main.go b/go/tests/tests/printprogramname_test/main.go
similarity index 100%
rename from go/tests/prog/printprogramname_test/main.go
rename to go/tests/tests/printprogramname_test/main.go
diff --git a/go/tests/prog/printrevcomb_test/main.go b/go/tests/tests/printrevcomb_test/main.go
similarity index 100%
rename from go/tests/prog/printrevcomb_test/main.go
rename to go/tests/tests/printrevcomb_test/main.go
diff --git a/go/tests/prog/printreversealphabet_test/main.go b/go/tests/tests/printreversealphabet_test/main.go
similarity index 100%
rename from go/tests/prog/printreversealphabet_test/main.go
rename to go/tests/tests/printreversealphabet_test/main.go
diff --git a/go/tests/prog/printreversealphabetalt2_test/main.go b/go/tests/tests/printreversealphabetalt2_test/main.go
similarity index 100%
rename from go/tests/prog/printreversealphabetalt2_test/main.go
rename to go/tests/tests/printreversealphabetalt2_test/main.go
diff --git a/go/tests/prog/printreversealphabetalt_test/main.go b/go/tests/tests/printreversealphabetalt_test/main.go
similarity index 100%
rename from go/tests/prog/printreversealphabetalt_test/main.go
rename to go/tests/tests/printreversealphabetalt_test/main.go
diff --git a/go/tests/prog/printreversealphabetg_test/main.go b/go/tests/tests/printreversealphabetg_test/main.go
similarity index 100%
rename from go/tests/prog/printreversealphabetg_test/main.go
rename to go/tests/tests/printreversealphabetg_test/main.go
diff --git a/go/tests/prog/printrot_test/main.go b/go/tests/tests/printrot_test/main.go
similarity index 100%
rename from go/tests/prog/printrot_test/main.go
rename to go/tests/tests/printrot_test/main.go
diff --git a/go/tests/prog/printstr_test/main.go b/go/tests/tests/printstr_test/main.go
similarity index 100%
rename from go/tests/prog/printstr_test/main.go
rename to go/tests/tests/printstr_test/main.go
diff --git a/go/tests/prog/printwordstables_test/main.go b/go/tests/tests/printwordstables_test/main.go
similarity index 100%
rename from go/tests/prog/printwordstables_test/main.go
rename to go/tests/tests/printwordstables_test/main.go
diff --git a/go/tests/prog/priorprime_test/main.go b/go/tests/tests/priorprime_test/main.go
similarity index 100%
rename from go/tests/prog/priorprime_test/main.go
rename to go/tests/tests/priorprime_test/main.go
diff --git a/go/tests/prog/quada_test/main.go b/go/tests/tests/quada_test/main.go
similarity index 100%
rename from go/tests/prog/quada_test/main.go
rename to go/tests/tests/quada_test/main.go
diff --git a/go/tests/prog/quadb_test/main.go b/go/tests/tests/quadb_test/main.go
similarity index 100%
rename from go/tests/prog/quadb_test/main.go
rename to go/tests/tests/quadb_test/main.go
diff --git a/go/tests/prog/quadc_test/main.go b/go/tests/tests/quadc_test/main.go
similarity index 100%
rename from go/tests/prog/quadc_test/main.go
rename to go/tests/tests/quadc_test/main.go
diff --git a/go/tests/prog/quadd_test/main.go b/go/tests/tests/quadd_test/main.go
similarity index 100%
rename from go/tests/prog/quadd_test/main.go
rename to go/tests/tests/quadd_test/main.go
diff --git a/go/tests/prog/quade_test/main.go b/go/tests/tests/quade_test/main.go
similarity index 100%
rename from go/tests/prog/quade_test/main.go
rename to go/tests/tests/quade_test/main.go
diff --git a/go/tests/prog/raid3_test/main.go b/go/tests/tests/raid3_test/main.go
similarity index 100%
rename from go/tests/prog/raid3_test/main.go
rename to go/tests/tests/raid3_test/main.go
diff --git a/go/tests/prog/range_test/main.go b/go/tests/tests/range_test/main.go
similarity index 100%
rename from go/tests/prog/range_test/main.go
rename to go/tests/tests/range_test/main.go
diff --git a/go/tests/prog/reachablenumber_test/main.go b/go/tests/tests/reachablenumber_test/main.go
similarity index 100%
rename from go/tests/prog/reachablenumber_test/main.go
rename to go/tests/tests/reachablenumber_test/main.go
diff --git a/go/tests/prog/rectangle_test/main.go b/go/tests/tests/rectangle_test/main.go
similarity index 100%
rename from go/tests/prog/rectangle_test/main.go
rename to go/tests/tests/rectangle_test/main.go
diff --git a/go/tests/prog/recursivefactorial_test/main.go b/go/tests/tests/recursivefactorial_test/main.go
similarity index 100%
rename from go/tests/prog/recursivefactorial_test/main.go
rename to go/tests/tests/recursivefactorial_test/main.go
diff --git a/go/tests/prog/recursivepower_test/main.go b/go/tests/tests/recursivepower_test/main.go
similarity index 100%
rename from go/tests/prog/recursivepower_test/main.go
rename to go/tests/tests/recursivepower_test/main.go
diff --git a/go/tests/prog/reduceint_test/main.go b/go/tests/tests/reduceint_test/main.go
similarity index 100%
rename from go/tests/prog/reduceint_test/main.go
rename to go/tests/tests/reduceint_test/main.go
diff --git a/go/tests/prog/repeatalpha_test/main.go b/go/tests/tests/repeatalpha_test/main.go
similarity index 100%
rename from go/tests/prog/repeatalpha_test/main.go
rename to go/tests/tests/repeatalpha_test/main.go
diff --git a/go/tests/prog/reversebits_test/main.go b/go/tests/tests/reversebits_test/main.go
similarity index 100%
rename from go/tests/prog/reversebits_test/main.go
rename to go/tests/tests/reversebits_test/main.go
diff --git a/go/tests/prog/reverserange_test/main.go b/go/tests/tests/reverserange_test/main.go
similarity index 100%
rename from go/tests/prog/reverserange_test/main.go
rename to go/tests/tests/reverserange_test/main.go
diff --git a/go/tests/prog/reversestrcap_test/main.go b/go/tests/tests/reversestrcap_test/main.go
similarity index 100%
rename from go/tests/prog/reversestrcap_test/main.go
rename to go/tests/tests/reversestrcap_test/main.go
diff --git a/go/tests/prog/revivethreenums_test/main.go b/go/tests/tests/revivethreenums_test/main.go
similarity index 100%
rename from go/tests/prog/revivethreenums_test/main.go
rename to go/tests/tests/revivethreenums_test/main.go
diff --git a/go/tests/prog/revparams_test/main.go b/go/tests/tests/revparams_test/main.go
similarity index 100%
rename from go/tests/prog/revparams_test/main.go
rename to go/tests/tests/revparams_test/main.go
diff --git a/go/tests/prog/revwstr_test/main.go b/go/tests/tests/revwstr_test/main.go
similarity index 100%
rename from go/tests/prog/revwstr_test/main.go
rename to go/tests/tests/revwstr_test/main.go
diff --git a/go/tests/prog/robottoorigin_test/main.go b/go/tests/tests/robottoorigin_test/main.go
similarity index 100%
rename from go/tests/prog/robottoorigin_test/main.go
rename to go/tests/tests/robottoorigin_test/main.go
diff --git a/go/tests/prog/romannumbers_test/main.go b/go/tests/tests/romannumbers_test/main.go
similarity index 100%
rename from go/tests/prog/romannumbers_test/main.go
rename to go/tests/tests/romannumbers_test/main.go
diff --git a/go/tests/prog/rostring_test/main.go b/go/tests/tests/rostring_test/main.go
similarity index 100%
rename from go/tests/prog/rostring_test/main.go
rename to go/tests/tests/rostring_test/main.go
diff --git a/go/tests/prog/rot13_test/main.go b/go/tests/tests/rot13_test/main.go
similarity index 100%
rename from go/tests/prog/rot13_test/main.go
rename to go/tests/tests/rot13_test/main.go
diff --git a/go/tests/prog/rot14_test/main.go b/go/tests/tests/rot14_test/main.go
similarity index 100%
rename from go/tests/prog/rot14_test/main.go
rename to go/tests/tests/rot14_test/main.go
diff --git a/go/tests/prog/rotatevowels_test/main.go b/go/tests/tests/rotatevowels_test/main.go
similarity index 100%
rename from go/tests/prog/rotatevowels_test/main.go
rename to go/tests/tests/rotatevowels_test/main.go
diff --git a/go/tests/prog/rpncalc_test/main.go b/go/tests/tests/rpncalc_test/main.go
similarity index 100%
rename from go/tests/prog/rpncalc_test/main.go
rename to go/tests/tests/rpncalc_test/main.go
diff --git a/go/tests/prog/searchreplace_test/main.go b/go/tests/tests/searchreplace_test/main.go
similarity index 100%
rename from go/tests/prog/searchreplace_test/main.go
rename to go/tests/tests/searchreplace_test/main.go
diff --git a/go/tests/prog/slice_test/main.go b/go/tests/tests/slice_test/main.go
similarity index 100%
rename from go/tests/prog/slice_test/main.go
rename to go/tests/tests/slice_test/main.go
diff --git a/go/tests/prog/sortedlistmerge_test/main.go b/go/tests/tests/sortedlistmerge_test/main.go
similarity index 100%
rename from go/tests/prog/sortedlistmerge_test/main.go
rename to go/tests/tests/sortedlistmerge_test/main.go
diff --git a/go/tests/prog/sortintegertable_test/main.go b/go/tests/tests/sortintegertable_test/main.go
similarity index 100%
rename from go/tests/prog/sortintegertable_test/main.go
rename to go/tests/tests/sortintegertable_test/main.go
diff --git a/go/tests/prog/sortlistinsert_test/main.go b/go/tests/tests/sortlistinsert_test/main.go
similarity index 100%
rename from go/tests/prog/sortlistinsert_test/main.go
rename to go/tests/tests/sortlistinsert_test/main.go
diff --git a/go/tests/prog/sortparams_test/main.go b/go/tests/tests/sortparams_test/main.go
similarity index 100%
rename from go/tests/prog/sortparams_test/main.go
rename to go/tests/tests/sortparams_test/main.go
diff --git a/go/tests/prog/sortwordarr_test/main.go b/go/tests/tests/sortwordarr_test/main.go
similarity index 100%
rename from go/tests/prog/sortwordarr_test/main.go
rename to go/tests/tests/sortwordarr_test/main.go
diff --git a/go/tests/prog/split_test/main.go b/go/tests/tests/split_test/main.go
similarity index 100%
rename from go/tests/prog/split_test/main.go
rename to go/tests/tests/split_test/main.go
diff --git a/go/tests/prog/splitwhitespaces_test/main.go b/go/tests/tests/splitwhitespaces_test/main.go
similarity index 100%
rename from go/tests/prog/splitwhitespaces_test/main.go
rename to go/tests/tests/splitwhitespaces_test/main.go
diff --git a/go/tests/prog/sqrt_test/main.go b/go/tests/tests/sqrt_test/main.go
similarity index 100%
rename from go/tests/prog/sqrt_test/main.go
rename to go/tests/tests/sqrt_test/main.go
diff --git a/go/tests/prog/strlen_test/main.go b/go/tests/tests/strlen_test/main.go
similarity index 100%
rename from go/tests/prog/strlen_test/main.go
rename to go/tests/tests/strlen_test/main.go
diff --git a/go/tests/prog/strrev_test/main.go b/go/tests/tests/strrev_test/main.go
similarity index 100%
rename from go/tests/prog/strrev_test/main.go
rename to go/tests/tests/strrev_test/main.go
diff --git a/go/tests/prog/sudoku_test/main.go b/go/tests/tests/sudoku_test/main.go
similarity index 100%
rename from go/tests/prog/sudoku_test/main.go
rename to go/tests/tests/sudoku_test/main.go
diff --git a/go/tests/prog/swap_test/main.go b/go/tests/tests/swap_test/main.go
similarity index 100%
rename from go/tests/prog/swap_test/main.go
rename to go/tests/tests/swap_test/main.go
diff --git a/go/tests/prog/swapbits_test/main.go b/go/tests/tests/swapbits_test/main.go
similarity index 100%
rename from go/tests/prog/swapbits_test/main.go
rename to go/tests/tests/swapbits_test/main.go
diff --git a/go/tests/prog/sweetproblem_test/main.go b/go/tests/tests/sweetproblem_test/main.go
similarity index 100%
rename from go/tests/prog/sweetproblem_test/main.go
rename to go/tests/tests/sweetproblem_test/main.go
diff --git a/go/tests/prog/switchcase_test/main.go b/go/tests/tests/switchcase_test/main.go
similarity index 100%
rename from go/tests/prog/switchcase_test/main.go
rename to go/tests/tests/switchcase_test/main.go
diff --git a/go/tests/prog/tabmult_test/main.go b/go/tests/tests/tabmult_test/main.go
similarity index 100%
rename from go/tests/prog/tabmult_test/main.go
rename to go/tests/tests/tabmult_test/main.go
diff --git a/go/tests/prog/tetrisoptimizer_test/main.go b/go/tests/tests/tetrisoptimizer_test/main.go
similarity index 100%
rename from go/tests/prog/tetrisoptimizer_test/main.go
rename to go/tests/tests/tetrisoptimizer_test/main.go
diff --git a/go/tests/prog/tolower_test/main.go b/go/tests/tests/tolower_test/main.go
similarity index 100%
rename from go/tests/prog/tolower_test/main.go
rename to go/tests/tests/tolower_test/main.go
diff --git a/go/tests/prog/toupper_test/main.go b/go/tests/tests/toupper_test/main.go
similarity index 100%
rename from go/tests/prog/toupper_test/main.go
rename to go/tests/tests/toupper_test/main.go
diff --git a/go/tests/prog/trimatoi_test/main.go b/go/tests/tests/trimatoi_test/main.go
similarity index 100%
rename from go/tests/prog/trimatoi_test/main.go
rename to go/tests/tests/trimatoi_test/main.go
diff --git a/go/tests/prog/twosum_test/main.go b/go/tests/tests/twosum_test/main.go
similarity index 100%
rename from go/tests/prog/twosum_test/main.go
rename to go/tests/tests/twosum_test/main.go
diff --git a/go/tests/prog/ultimatedivmod_test/main.go b/go/tests/tests/ultimatedivmod_test/main.go
similarity index 100%
rename from go/tests/prog/ultimatedivmod_test/main.go
rename to go/tests/tests/ultimatedivmod_test/main.go
diff --git a/go/tests/prog/ultimatepointone_test/main.go b/go/tests/tests/ultimatepointone_test/main.go
similarity index 100%
rename from go/tests/prog/ultimatepointone_test/main.go
rename to go/tests/tests/ultimatepointone_test/main.go
diff --git a/go/tests/prog/union_test/main.go b/go/tests/tests/union_test/main.go
similarity index 100%
rename from go/tests/prog/union_test/main.go
rename to go/tests/tests/union_test/main.go
diff --git a/go/tests/prog/uniqueoccurences_test/main.go b/go/tests/tests/uniqueoccurences_test/main.go
similarity index 100%
rename from go/tests/prog/uniqueoccurences_test/main.go
rename to go/tests/tests/uniqueoccurences_test/main.go
diff --git a/go/tests/prog/unmatch_test/main.go b/go/tests/tests/unmatch_test/main.go
similarity index 100%
rename from go/tests/prog/unmatch_test/main.go
rename to go/tests/tests/unmatch_test/main.go
diff --git a/go/tests/prog/volumechanger_test/main.go b/go/tests/tests/volumechanger_test/main.go
similarity index 100%
rename from go/tests/prog/volumechanger_test/main.go
rename to go/tests/tests/volumechanger_test/main.go
diff --git a/go/tests/prog/wdmatch_test/main.go b/go/tests/tests/wdmatch_test/main.go
similarity index 100%
rename from go/tests/prog/wdmatch_test/main.go
rename to go/tests/tests/wdmatch_test/main.go
diff --git a/go/tests/prog/ztail_test/main.go b/go/tests/tests/ztail_test/main.go
similarity index 100%
rename from go/tests/prog/ztail_test/main.go
rename to go/tests/tests/ztail_test/main.go