diff --git a/cmd/experiments/cli-parser/arch/args_notwindows.go b/cmd/experiments/cli_parser/arch/args_notwindows.go
similarity index 100%
rename from cmd/experiments/cli-parser/arch/args_notwindows.go
rename to cmd/experiments/cli_parser/arch/args_notwindows.go
diff --git a/cmd/experiments/cli-parser/arch/args_windows.go b/cmd/experiments/cli_parser/arch/args_windows.go
similarity index 100%
rename from cmd/experiments/cli-parser/arch/args_windows.go
rename to cmd/experiments/cli_parser/arch/args_windows.go
diff --git a/cmd/experiments/cli-parser/cliparse.go b/cmd/experiments/cli_parser/cliparse.go
similarity index 100%
rename from cmd/experiments/cli-parser/cliparse.go
rename to cmd/experiments/cli_parser/cliparse.go
diff --git a/cmd/experiments/cli-parser/go.mod b/cmd/experiments/cli_parser/go.mod
similarity index 100%
rename from cmd/experiments/cli-parser/go.mod
rename to cmd/experiments/cli_parser/go.mod
diff --git a/cmd/experiments/cli-parser/go.sum b/cmd/experiments/cli_parser/go.sum
similarity index 100%
rename from cmd/experiments/cli-parser/go.sum
rename to cmd/experiments/cli_parser/go.sum
diff --git a/cmd/experiments/cli-parser/msys2in.sh b/cmd/experiments/cli_parser/msys2in.sh
similarity index 100%
rename from cmd/experiments/cli-parser/msys2in.sh
rename to cmd/experiments/cli_parser/msys2in.sh
diff --git a/cmd/experiments/cli-parser/msys2out.bat b/cmd/experiments/cli_parser/msys2out.bat
similarity index 100%
rename from cmd/experiments/cli-parser/msys2out.bat
rename to cmd/experiments/cli_parser/msys2out.bat
diff --git a/cmd/experiments/dsl-parser/.vimrc b/cmd/experiments/dsl_parser/.vimrc
similarity index 100%
rename from cmd/experiments/dsl-parser/.vimrc
rename to cmd/experiments/dsl_parser/.vimrc
diff --git a/cmd/experiments/dsl-parser/README.md b/cmd/experiments/dsl_parser/README.md
similarity index 100%
rename from cmd/experiments/dsl-parser/README.md
rename to cmd/experiments/dsl_parser/README.md
diff --git a/cmd/experiments/dsl-parser/one/build b/cmd/experiments/dsl_parser/one/build
similarity index 100%
rename from cmd/experiments/dsl-parser/one/build
rename to cmd/experiments/dsl_parser/one/build
diff --git a/cmd/experiments/dsl-parser/one/go.mod b/cmd/experiments/dsl_parser/one/go.mod
similarity index 100%
rename from cmd/experiments/dsl-parser/one/go.mod
rename to cmd/experiments/dsl_parser/one/go.mod
diff --git a/cmd/experiments/dsl-parser/one/go.sum b/cmd/experiments/dsl_parser/one/go.sum
similarity index 100%
rename from cmd/experiments/dsl-parser/one/go.sum
rename to cmd/experiments/dsl_parser/one/go.sum
diff --git a/cmd/experiments/dsl-parser/one/main.go b/cmd/experiments/dsl_parser/one/main.go
similarity index 100%
rename from cmd/experiments/dsl-parser/one/main.go
rename to cmd/experiments/dsl_parser/one/main.go
diff --git a/cmd/experiments/dsl-parser/one/run b/cmd/experiments/dsl_parser/one/run
similarity index 100%
rename from cmd/experiments/dsl-parser/one/run
rename to cmd/experiments/dsl_parser/one/run
diff --git a/cmd/experiments/dsl-parser/one/semi1.bnf b/cmd/experiments/dsl_parser/one/semi1.bnf
similarity index 100%
rename from cmd/experiments/dsl-parser/one/semi1.bnf
rename to cmd/experiments/dsl_parser/one/semi1.bnf
diff --git a/cmd/experiments/dsl-parser/one/semi2.bnf b/cmd/experiments/dsl_parser/one/semi2.bnf
similarity index 100%
rename from cmd/experiments/dsl-parser/one/semi2.bnf
rename to cmd/experiments/dsl_parser/one/semi2.bnf
diff --git a/cmd/experiments/dsl-parser/two/brackets.bnf b/cmd/experiments/dsl_parser/two/brackets.bnf
similarity index 100%
rename from cmd/experiments/dsl-parser/two/brackets.bnf
rename to cmd/experiments/dsl_parser/two/brackets.bnf
diff --git a/cmd/experiments/dsl-parser/two/build b/cmd/experiments/dsl_parser/two/build
similarity index 100%
rename from cmd/experiments/dsl-parser/two/build
rename to cmd/experiments/dsl_parser/two/build
diff --git a/cmd/experiments/dsl-parser/two/emit01.bnf b/cmd/experiments/dsl_parser/two/emit01.bnf
similarity index 100%
rename from cmd/experiments/dsl-parser/two/emit01.bnf
rename to cmd/experiments/dsl_parser/two/emit01.bnf
diff --git a/cmd/experiments/dsl-parser/two/emit02.bnf b/cmd/experiments/dsl_parser/two/emit02.bnf
similarity index 100%
rename from cmd/experiments/dsl-parser/two/emit02.bnf
rename to cmd/experiments/dsl_parser/two/emit02.bnf
diff --git a/cmd/experiments/dsl-parser/two/go.mod b/cmd/experiments/dsl_parser/two/go.mod
similarity index 100%
rename from cmd/experiments/dsl-parser/two/go.mod
rename to cmd/experiments/dsl_parser/two/go.mod
diff --git a/cmd/experiments/dsl-parser/two/go.sum b/cmd/experiments/dsl_parser/two/go.sum
similarity index 100%
rename from cmd/experiments/dsl-parser/two/go.sum
rename to cmd/experiments/dsl_parser/two/go.sum
diff --git a/cmd/experiments/dsl-parser/two/main.go b/cmd/experiments/dsl_parser/two/main.go
similarity index 100%
rename from cmd/experiments/dsl-parser/two/main.go
rename to cmd/experiments/dsl_parser/two/main.go
diff --git a/cmd/experiments/dsl-parser/two/mktags b/cmd/experiments/dsl_parser/two/mktags
similarity index 100%
rename from cmd/experiments/dsl-parser/two/mktags
rename to cmd/experiments/dsl_parser/two/mktags
diff --git a/cmd/experiments/dsl-parser/two/run b/cmd/experiments/dsl_parser/two/run
similarity index 100%
rename from cmd/experiments/dsl-parser/two/run
rename to cmd/experiments/dsl_parser/two/run
diff --git a/cmd/experiments/dsl-parser/two/semi3.bnf b/cmd/experiments/dsl_parser/two/semi3.bnf
similarity index 100%
rename from cmd/experiments/dsl-parser/two/semi3.bnf
rename to cmd/experiments/dsl_parser/two/semi3.bnf
diff --git a/cmd/experiments/dsl-parser/two/temp.bnf b/cmd/experiments/dsl_parser/two/temp.bnf
similarity index 100%
rename from cmd/experiments/dsl-parser/two/temp.bnf
rename to cmd/experiments/dsl_parser/two/temp.bnf
diff --git a/cmd/experiments/line-parser/README.txt b/cmd/experiments/line_parser/README.txt
similarity index 100%
rename from cmd/experiments/line-parser/README.txt
rename to cmd/experiments/line_parser/README.txt
diff --git a/cmd/experiments/line-parser/read-string.go b/cmd/experiments/line_parser/read_string.go
similarity index 100%
rename from cmd/experiments/line-parser/read-string.go
rename to cmd/experiments/line_parser/read_string.go
diff --git a/cmd/experiments/line-parser/scanner.go b/cmd/experiments/line_parser/scanner.go
similarity index 100%
rename from cmd/experiments/line-parser/scanner.go
rename to cmd/experiments/line_parser/scanner.go
diff --git a/cmd/experiments/line-parser/splitter.go b/cmd/experiments/line_parser/splitter.go
similarity index 100%
rename from cmd/experiments/line-parser/splitter.go
rename to cmd/experiments/line_parser/splitter.go
diff --git a/internal/pkg/dsl/cst/block-exit.go b/internal/pkg/dsl/cst/block_exit.go
similarity index 100%
rename from internal/pkg/dsl/cst/block-exit.go
rename to internal/pkg/dsl/cst/block_exit.go
diff --git a/internal/pkg/lib/file-readers.go b/internal/pkg/lib/file_readers.go
similarity index 100%
rename from internal/pkg/lib/file-readers.go
rename to internal/pkg/lib/file_readers.go
diff --git a/internal/pkg/lib/ordered-map.go b/internal/pkg/lib/ordered_map.go
similarity index 100%
rename from internal/pkg/lib/ordered-map.go
rename to internal/pkg/lib/ordered_map.go
diff --git a/internal/pkg/output/file-output-handlers.go b/internal/pkg/output/file_output_handlers.go
similarity index 100%
rename from internal/pkg/output/file-output-handlers.go
rename to internal/pkg/output/file_output_handlers.go
diff --git a/internal/pkg/transformers/clean-whitespace.go b/internal/pkg/transformers/clean_whitespace.go
similarity index 100%
rename from internal/pkg/transformers/clean-whitespace.go
rename to internal/pkg/transformers/clean_whitespace.go
diff --git a/internal/pkg/transformers/count-similar.go b/internal/pkg/transformers/count_similar.go
similarity index 100%
rename from internal/pkg/transformers/count-similar.go
rename to internal/pkg/transformers/count_similar.go
diff --git a/internal/pkg/transformers/fill-down.go b/internal/pkg/transformers/fill_down.go
similarity index 100%
rename from internal/pkg/transformers/fill-down.go
rename to internal/pkg/transformers/fill_down.go
diff --git a/internal/pkg/transformers/fill-empty.go b/internal/pkg/transformers/fill_empty.go
similarity index 100%
rename from internal/pkg/transformers/fill-empty.go
rename to internal/pkg/transformers/fill_empty.go
diff --git a/internal/pkg/transformers/format-values.go b/internal/pkg/transformers/format_values.go
similarity index 100%
rename from internal/pkg/transformers/format-values.go
rename to internal/pkg/transformers/format_values.go
diff --git a/internal/pkg/transformers/group-by.go b/internal/pkg/transformers/group_by.go
similarity index 100%
rename from internal/pkg/transformers/group-by.go
rename to internal/pkg/transformers/group_by.go
diff --git a/internal/pkg/transformers/group-like.go b/internal/pkg/transformers/group_like.go
similarity index 100%
rename from internal/pkg/transformers/group-like.go
rename to internal/pkg/transformers/group_like.go
diff --git a/internal/pkg/transformers/having-fields.go b/internal/pkg/transformers/having_fields.go
similarity index 100%
rename from internal/pkg/transformers/having-fields.go
rename to internal/pkg/transformers/having_fields.go
diff --git a/internal/pkg/transformers/json-parse.go b/internal/pkg/transformers/json_parse.go
similarity index 100%
rename from internal/pkg/transformers/json-parse.go
rename to internal/pkg/transformers/json_parse.go
diff --git a/internal/pkg/transformers/json-stringify.go b/internal/pkg/transformers/json_stringify.go
similarity index 100%
rename from internal/pkg/transformers/json-stringify.go
rename to internal/pkg/transformers/json_stringify.go
diff --git a/internal/pkg/transformers/merge-fields.go b/internal/pkg/transformers/merge_fields.go
similarity index 100%
rename from internal/pkg/transformers/merge-fields.go
rename to internal/pkg/transformers/merge_fields.go
diff --git a/internal/pkg/transformers/most-or-least-frequent.go b/internal/pkg/transformers/most_or_least_frequent.go
similarity index 100%
rename from internal/pkg/transformers/most-or-least-frequent.go
rename to internal/pkg/transformers/most_or_least_frequent.go
diff --git a/internal/pkg/transformers/put-or-filter.go b/internal/pkg/transformers/put_or_filter.go
similarity index 100%
rename from internal/pkg/transformers/put-or-filter.go
rename to internal/pkg/transformers/put_or_filter.go
diff --git a/internal/pkg/transformers/remove-empty-columns.go b/internal/pkg/transformers/remove_empty_columns.go
similarity index 100%
rename from internal/pkg/transformers/remove-empty-columns.go
rename to internal/pkg/transformers/remove_empty_columns.go
diff --git a/internal/pkg/transformers/skip-trivial-records.go b/internal/pkg/transformers/skip_trivial_records.go
similarity index 100%
rename from internal/pkg/transformers/skip-trivial-records.go
rename to internal/pkg/transformers/skip_trivial_records.go
diff --git a/internal/pkg/transformers/sort-within-records.go b/internal/pkg/transformers/sort_within_records.go
similarity index 100%
rename from internal/pkg/transformers/sort-within-records.go
rename to internal/pkg/transformers/sort_within_records.go
diff --git a/internal/pkg/transformers/utils/join-bucket.go b/internal/pkg/transformers/utils/join_bucket.go
similarity index 100%
rename from internal/pkg/transformers/utils/join-bucket.go
rename to internal/pkg/transformers/utils/join_bucket.go
diff --git a/internal/pkg/transformers/utils/join-bucket-keeper.go b/internal/pkg/transformers/utils/join_bucket_keeper.go
similarity index 100%
rename from internal/pkg/transformers/utils/join-bucket-keeper.go
rename to internal/pkg/transformers/utils/join_bucket_keeper.go
diff --git a/internal/pkg/transformers/utils/percentile-keeper.go b/internal/pkg/transformers/utils/percentile_keeper.go
similarity index 100%
rename from internal/pkg/transformers/utils/percentile-keeper.go
rename to internal/pkg/transformers/utils/percentile_keeper.go
diff --git a/internal/pkg/transformers/utils/stats1-accumulators.go b/internal/pkg/transformers/utils/stats1_accumulators.go
similarity index 100%
rename from internal/pkg/transformers/utils/stats1-accumulators.go
rename to internal/pkg/transformers/utils/stats1_accumulators.go
diff --git a/internal/pkg/transformers/utils/stats2-accumulators.go b/internal/pkg/transformers/utils/stats2_accumulators.go
similarity index 100%
rename from internal/pkg/transformers/utils/stats2-accumulators.go
rename to internal/pkg/transformers/utils/stats2_accumulators.go
diff --git a/internal/pkg/transformers/utils/top-keeper.go b/internal/pkg/transformers/utils/top_keeper.go
similarity index 100%
rename from internal/pkg/transformers/utils/top-keeper.go
rename to internal/pkg/transformers/utils/top_keeper.go
diff --git a/internal/pkg/transformers/utils/window-keeper.go b/internal/pkg/transformers/utils/window_keeper.go
similarity index 100%
rename from internal/pkg/transformers/utils/window-keeper.go
rename to internal/pkg/transformers/utils/window_keeper.go