diff --git a/src/bin/attribute/cfg.rs b/src/bin/attribute_cfg.rs
similarity index 100%
rename from src/bin/attribute/cfg.rs
rename to src/bin/attribute_cfg.rs
diff --git a/src/bin/attribute/cfg/custom.rs b/src/bin/attribute_cfg_custom.rs
similarity index 100%
rename from src/bin/attribute/cfg/custom.rs
rename to src/bin/attribute_cfg_custom.rs
diff --git a/src/bin/attribute/unused.rs b/src/bin/attribute_unused.rs
similarity index 100%
rename from src/bin/attribute/unused.rs
rename to src/bin/attribute_unused.rs
diff --git a/src/bin/conversion/from_into.rs b/src/bin/conversion_from_into.rs
similarity index 100%
rename from src/bin/conversion/from_into.rs
rename to src/bin/conversion_from_into.rs
diff --git a/src/bin/conversion/string.rs b/src/bin/conversion_string.rs
similarity index 100%
rename from src/bin/conversion/string.rs
rename to src/bin/conversion_string.rs
diff --git a/src/bin/conversion/try_from_try_into.rs b/src/bin/conversion_try_from_try_into.rs
similarity index 100%
rename from src/bin/conversion/try_from_try_into.rs
rename to src/bin/conversion_try_from_try_into.rs
diff --git a/src/bin/custom_types/constants.rs b/src/bin/custom_types_constants.rs
similarity index 100%
rename from src/bin/custom_types/constants.rs
rename to src/bin/custom_types_constants.rs
diff --git a/src/bin/custom_types/enum.rs b/src/bin/custom_types_enum.rs
similarity index 100%
rename from src/bin/custom_types/enum.rs
rename to src/bin/custom_types_enum.rs
diff --git a/src/bin/custom_types/enum/c_like.rs b/src/bin/custom_types_enum_c_like.rs
similarity index 100%
rename from src/bin/custom_types/enum/c_like.rs
rename to src/bin/custom_types_enum_c_like.rs
diff --git a/src/bin/custom_types/enum/enum_use.rs b/src/bin/custom_types_enum_enum_use.rs
similarity index 100%
rename from src/bin/custom_types/enum/enum_use.rs
rename to src/bin/custom_types_enum_enum_use.rs
diff --git a/src/bin/custom_types/enum/testcase_linked_list.rs b/src/bin/custom_types_enum_testcase_linked_list.rs
similarity index 100%
rename from src/bin/custom_types/enum/testcase_linked_list.rs
rename to src/bin/custom_types_enum_testcase_linked_list.rs
diff --git a/src/bin/custom_types/structs.rs b/src/bin/custom_types_structs.rs
similarity index 100%
rename from src/bin/custom_types/structs.rs
rename to src/bin/custom_types_structs.rs
diff --git a/src/bin/error/abort_unwind.rs b/src/bin/error_abort_unwind.rs
similarity index 100%
rename from src/bin/error/abort_unwind.rs
rename to src/bin/error_abort_unwind.rs
diff --git a/src/bin/error/iter_result.rs b/src/bin/error_iter_result.rs
similarity index 100%
rename from src/bin/error/iter_result.rs
rename to src/bin/error_iter_result.rs
diff --git a/src/bin/error/multiple_error_types.rs b/src/bin/error_multiple_error_types.rs
similarity index 100%
rename from src/bin/error/multiple_error_types.rs
rename to src/bin/error_multiple_error_types.rs
diff --git a/src/bin/error/multiple_error_types/boxing_errors.rs b/src/bin/error_multiple_error_types_boxing_errors.rs
similarity index 100%
rename from src/bin/error/multiple_error_types/boxing_errors.rs
rename to src/bin/error_multiple_error_types_boxing_errors.rs
diff --git a/src/bin/error/multiple_error_types/define_error_type.rs b/src/bin/error_multiple_error_types_define_error_type.rs
similarity index 100%
rename from src/bin/error/multiple_error_types/define_error_type.rs
rename to src/bin/error_multiple_error_types_define_error_type.rs
diff --git a/src/bin/error/multiple_error_types/option_result.rs b/src/bin/error_multiple_error_types_option_result.rs
similarity index 100%
rename from src/bin/error/multiple_error_types/option_result.rs
rename to src/bin/error_multiple_error_types_option_result.rs
diff --git a/src/bin/error/multiple_error_types/reenter_question_mark.rs b/src/bin/error_multiple_error_types_reenter_question_mark.rs
similarity index 100%
rename from src/bin/error/multiple_error_types/reenter_question_mark.rs
rename to src/bin/error_multiple_error_types_reenter_question_mark.rs
diff --git a/src/bin/error/multiple_error_types/wrap_error.rs b/src/bin/error_multiple_error_types_wrap_error.rs
similarity index 100%
rename from src/bin/error/multiple_error_types/wrap_error.rs
rename to src/bin/error_multiple_error_types_wrap_error.rs
diff --git a/src/bin/error/option_unwrap.rs b/src/bin/error_option_unwrap.rs
similarity index 100%
rename from src/bin/error/option_unwrap.rs
rename to src/bin/error_option_unwrap.rs
diff --git a/src/bin/error/option_unwrap/and_then.rs b/src/bin/error_option_unwrap_and_then.rs
similarity index 100%
rename from src/bin/error/option_unwrap/and_then.rs
rename to src/bin/error_option_unwrap_and_then.rs
diff --git a/src/bin/error/option_unwrap/defaults.rs b/src/bin/error_option_unwrap_defaults.rs
similarity index 100%
rename from src/bin/error/option_unwrap/defaults.rs
rename to src/bin/error_option_unwrap_defaults.rs
diff --git a/src/bin/error/option_unwrap/map.rs b/src/bin/error_option_unwrap_map.rs
similarity index 100%
rename from src/bin/error/option_unwrap/map.rs
rename to src/bin/error_option_unwrap_map.rs
diff --git a/src/bin/error/option_unwrap/question_mark.rs b/src/bin/error_option_unwrap_question_mark.rs
similarity index 100%
rename from src/bin/error/option_unwrap/question_mark.rs
rename to src/bin/error_option_unwrap_question_mark.rs
diff --git a/src/bin/error/panic.rs b/src/bin/error_panic.rs
similarity index 100%
rename from src/bin/error/panic.rs
rename to src/bin/error_panic.rs
diff --git a/src/bin/error/result.rs b/src/bin/error_result.rs
similarity index 100%
rename from src/bin/error/result.rs
rename to src/bin/error_result.rs
diff --git a/src/bin/error/result/early_returns.rs b/src/bin/error_result_early_returns.rs
similarity index 100%
rename from src/bin/error/result/early_returns.rs
rename to src/bin/error_result_early_returns.rs
diff --git a/src/bin/error/result/enter_question_mark.rs b/src/bin/error_result_enter_question_mark.rs
similarity index 100%
rename from src/bin/error/result/enter_question_mark.rs
rename to src/bin/error_result_enter_question_mark.rs
diff --git a/src/bin/error/result/result_alias.rs b/src/bin/error_result_result_alias.rs
similarity index 100%
rename from src/bin/error/result/result_alias.rs
rename to src/bin/error_result_result_alias.rs
diff --git a/src/bin/error/result/result_map.rs b/src/bin/error_result_result_map.rs
similarity index 100%
rename from src/bin/error/result/result_map.rs
rename to src/bin/error_result_result_map.rs
diff --git a/src/bin/flow_control/for.rs b/src/bin/flow_control_for.rs
similarity index 100%
rename from src/bin/flow_control/for.rs
rename to src/bin/flow_control_for.rs
diff --git a/src/bin/flow_control/if_else.rs b/src/bin/flow_control_if_else.rs
similarity index 100%
rename from src/bin/flow_control/if_else.rs
rename to src/bin/flow_control_if_else.rs
diff --git a/src/bin/flow_control/if_let.rs b/src/bin/flow_control_if_let.rs
similarity index 100%
rename from src/bin/flow_control/if_let.rs
rename to src/bin/flow_control_if_let.rs
diff --git a/src/bin/flow_control/loop.rs b/src/bin/flow_control_loop.rs
similarity index 100%
rename from src/bin/flow_control/loop.rs
rename to src/bin/flow_control_loop.rs
diff --git a/src/bin/flow_control/loop/nested.rs b/src/bin/flow_control_loop_nested.rs
similarity index 100%
rename from src/bin/flow_control/loop/nested.rs
rename to src/bin/flow_control_loop_nested.rs
diff --git a/src/bin/flow_control/loop/return.rs b/src/bin/flow_control_loop_return.rs
similarity index 100%
rename from src/bin/flow_control/loop/return.rs
rename to src/bin/flow_control_loop_return.rs
diff --git a/src/bin/flow_control/match.rs b/src/bin/flow_control_match.rs
similarity index 100%
rename from src/bin/flow_control/match.rs
rename to src/bin/flow_control_match.rs
diff --git a/src/bin/flow_control/match/binding.rs b/src/bin/flow_control_match_binding.rs
similarity index 100%
rename from src/bin/flow_control/match/binding.rs
rename to src/bin/flow_control_match_binding.rs
diff --git a/src/bin/flow_control/match/destructuring/destructure_enum.rs b/src/bin/flow_control_match_destructuring_destructure_enum.rs
similarity index 100%
rename from src/bin/flow_control/match/destructuring/destructure_enum.rs
rename to src/bin/flow_control_match_destructuring_destructure_enum.rs
diff --git a/src/bin/flow_control/match/destructuring/destructure_pointers.rs b/src/bin/flow_control_match_destructuring_destructure_pointers.rs
similarity index 100%
rename from src/bin/flow_control/match/destructuring/destructure_pointers.rs
rename to src/bin/flow_control_match_destructuring_destructure_pointers.rs
diff --git a/src/bin/flow_control/match/destructuring/destructure_slice.rs b/src/bin/flow_control_match_destructuring_destructure_slice.rs
similarity index 100%
rename from src/bin/flow_control/match/destructuring/destructure_slice.rs
rename to src/bin/flow_control_match_destructuring_destructure_slice.rs
diff --git a/src/bin/flow_control/match/destructuring/destructure_structures.rs b/src/bin/flow_control_match_destructuring_destructure_structures.rs
similarity index 100%
rename from src/bin/flow_control/match/destructuring/destructure_structures.rs
rename to src/bin/flow_control_match_destructuring_destructure_structures.rs
diff --git a/src/bin/flow_control/match/destructuring/destructure_tuple.rs b/src/bin/flow_control_match_destructuring_destructure_tuple.rs
similarity index 100%
rename from src/bin/flow_control/match/destructuring/destructure_tuple.rs
rename to src/bin/flow_control_match_destructuring_destructure_tuple.rs
diff --git a/src/bin/flow_control/match/guard.rs b/src/bin/flow_control_match_guard.rs
similarity index 100%
rename from src/bin/flow_control/match/guard.rs
rename to src/bin/flow_control_match_guard.rs
diff --git a/src/bin/flow_control/while.rs b/src/bin/flow_control_while.rs
similarity index 100%
rename from src/bin/flow_control/while.rs
rename to src/bin/flow_control_while.rs
diff --git a/src/bin/flow_control/while_let.rs b/src/bin/flow_control_while_let.rs
similarity index 100%
rename from src/bin/flow_control/while_let.rs
rename to src/bin/flow_control_while_let.rs
diff --git a/src/bin/fn/closures.rs b/src/bin/fn_closures.rs
similarity index 100%
rename from src/bin/fn/closures.rs
rename to src/bin/fn_closures.rs
diff --git a/src/bin/fn/closures/anonymity.rs b/src/bin/fn_closures_anonymity.rs
similarity index 100%
rename from src/bin/fn/closures/anonymity.rs
rename to src/bin/fn_closures_anonymity.rs
diff --git a/src/bin/fn/closures/capture.rs b/src/bin/fn_closures_capture.rs
similarity index 100%
rename from src/bin/fn/closures/capture.rs
rename to src/bin/fn_closures_capture.rs
diff --git a/src/bin/fn/closures/closure_examples/iter_any.rs b/src/bin/fn_closures_closure_examples_iter_any.rs
similarity index 100%
rename from src/bin/fn/closures/closure_examples/iter_any.rs
rename to src/bin/fn_closures_closure_examples_iter_any.rs
diff --git a/src/bin/fn/closures/closure_examples/iter_find.rs b/src/bin/fn_closures_closure_examples_iter_find.rs
similarity index 100%
rename from src/bin/fn/closures/closure_examples/iter_find.rs
rename to src/bin/fn_closures_closure_examples_iter_find.rs
diff --git a/src/bin/fn/closures/input_functions.rs b/src/bin/fn_closures_input_functions.rs
similarity index 100%
rename from src/bin/fn/closures/input_functions.rs
rename to src/bin/fn_closures_input_functions.rs
diff --git a/src/bin/fn/closures/input_parameters.rs b/src/bin/fn_closures_input_parameters.rs
similarity index 100%
rename from src/bin/fn/closures/input_parameters.rs
rename to src/bin/fn_closures_input_parameters.rs
diff --git a/src/bin/fn/closures/output_parameters.rs b/src/bin/fn_closures_output_parameters.rs
similarity index 100%
rename from src/bin/fn/closures/output_parameters.rs
rename to src/bin/fn_closures_output_parameters.rs
diff --git a/src/bin/fn/hof.rs b/src/bin/fn_hof.rs
similarity index 100%
rename from src/bin/fn/hof.rs
rename to src/bin/fn_hof.rs
diff --git a/src/bin/fn/methods.rs b/src/bin/fn_methods.rs
similarity index 100%
rename from src/bin/fn/methods.rs
rename to src/bin/fn_methods.rs
diff --git a/src/bin/generics/assoc_items/the_problem.rs b/src/bin/generics_assoc_items_the_problem.rs
similarity index 100%
rename from src/bin/generics/assoc_items/the_problem.rs
rename to src/bin/generics_assoc_items_the_problem.rs
diff --git a/src/bin/generics/assoc_items/types.rs b/src/bin/generics_assoc_items_types.rs
similarity index 100%
rename from src/bin/generics/assoc_items/types.rs
rename to src/bin/generics_assoc_items_types.rs
diff --git a/src/bin/generics/bounds.rs b/src/bin/generics_bounds.rs
similarity index 100%
rename from src/bin/generics/bounds.rs
rename to src/bin/generics_bounds.rs
diff --git a/src/bin/generics/bounds/testcase_empty.rs b/src/bin/generics_bounds_testcase_empty.rs
similarity index 100%
rename from src/bin/generics/bounds/testcase_empty.rs
rename to src/bin/generics_bounds_testcase_empty.rs
diff --git a/src/bin/generics/gen_fn.rs b/src/bin/generics_gen_fn.rs
similarity index 100%
rename from src/bin/generics/gen_fn.rs
rename to src/bin/generics_gen_fn.rs
diff --git a/src/bin/generics/gen_trait.rs b/src/bin/generics_gen_trait.rs
similarity index 100%
rename from src/bin/generics/gen_trait.rs
rename to src/bin/generics_gen_trait.rs
diff --git a/src/bin/generics/impl.rs b/src/bin/generics_impl.rs
similarity index 100%
rename from src/bin/generics/impl.rs
rename to src/bin/generics_impl.rs
diff --git a/src/bin/generics/multi_bounds.rs b/src/bin/generics_multi_bounds.rs
similarity index 100%
rename from src/bin/generics/multi_bounds.rs
rename to src/bin/generics_multi_bounds.rs
diff --git a/src/bin/generics/phantom.rs b/src/bin/generics_phantom.rs
similarity index 100%
rename from src/bin/generics/phantom.rs
rename to src/bin/generics_phantom.rs
diff --git a/src/bin/generics/phantom/testcase_units.rs b/src/bin/generics_phantom_testcase_units.rs
similarity index 100%
rename from src/bin/generics/phantom/testcase_units.rs
rename to src/bin/generics_phantom_testcase_units.rs
diff --git a/src/bin/generics/where.rs b/src/bin/generics_where.rs
similarity index 100%
rename from src/bin/generics/where.rs
rename to src/bin/generics_where.rs
diff --git a/src/bin/hello/comment.rs b/src/bin/hello_comment.rs
similarity index 100%
rename from src/bin/hello/comment.rs
rename to src/bin/hello_comment.rs
diff --git a/src/bin/hello/print.rs b/src/bin/hello_print.rs
similarity index 100%
rename from src/bin/hello/print.rs
rename to src/bin/hello_print.rs
diff --git a/src/bin/hello/print/fmt.rs b/src/bin/hello_print_fmt.rs
similarity index 100%
rename from src/bin/hello/print/fmt.rs
rename to src/bin/hello_print_fmt.rs
diff --git a/src/bin/hello/print/print_debug.rs b/src/bin/hello_print_print_debug.rs
similarity index 100%
rename from src/bin/hello/print/print_debug.rs
rename to src/bin/hello_print_print_debug.rs
diff --git a/src/bin/hello/print/print_display.rs b/src/bin/hello_print_print_display.rs
similarity index 100%
rename from src/bin/hello/print/print_display.rs
rename to src/bin/hello_print_print_display.rs
diff --git a/src/bin/hello/print/print_display/testcase_list.rs b/src/bin/hello_print_print_display_testcase_list.rs
similarity index 100%
rename from src/bin/hello/print/print_display/testcase_list.rs
rename to src/bin/hello_print_print_display_testcase_list.rs
diff --git a/src/bin/macros/designators.rs b/src/bin/macros_designators.rs
similarity index 100%
rename from src/bin/macros/designators.rs
rename to src/bin/macros_designators.rs
diff --git a/src/bin/macros/dsl.rs b/src/bin/macros_dsl.rs
similarity index 100%
rename from src/bin/macros/dsl.rs
rename to src/bin/macros_dsl.rs
diff --git a/src/bin/macros/overload.rs b/src/bin/macros_overload.rs
similarity index 100%
rename from src/bin/macros/overload.rs
rename to src/bin/macros_overload.rs
diff --git a/src/bin/macros/repeat.rs b/src/bin/macros_repeat.rs
similarity index 100%
rename from src/bin/macros/repeat.rs
rename to src/bin/macros_repeat.rs
diff --git a/src/bin/macros/variadics.rs b/src/bin/macros_variadics.rs
similarity index 100%
rename from src/bin/macros/variadics.rs
rename to src/bin/macros_variadics.rs
diff --git a/src/bin/meta/doc.rs b/src/bin/meta_doc.rs
similarity index 100%
rename from src/bin/meta/doc.rs
rename to src/bin/meta_doc.rs
diff --git a/src/bin/meta/playground.rs b/src/bin/meta_playground.rs
similarity index 100%
rename from src/bin/meta/playground.rs
rename to src/bin/meta_playground.rs
diff --git a/src/bin/mod/struct_visibility.rs b/src/bin/mod_struct_visibility.rs
similarity index 100%
rename from src/bin/mod/struct_visibility.rs
rename to src/bin/mod_struct_visibility.rs
diff --git a/src/bin/mod/super.rs b/src/bin/mod_super.rs
similarity index 100%
rename from src/bin/mod/super.rs
rename to src/bin/mod_super.rs
diff --git a/src/bin/mod/use.rs b/src/bin/mod_use.rs
similarity index 100%
rename from src/bin/mod/use.rs
rename to src/bin/mod_use.rs
diff --git a/src/bin/mod/visibility.rs b/src/bin/mod_visibility.rs
similarity index 100%
rename from src/bin/mod/visibility.rs
rename to src/bin/mod_visibility.rs
diff --git a/src/bin/primitives/array.rs b/src/bin/primitives_array.rs
similarity index 100%
rename from src/bin/primitives/array.rs
rename to src/bin/primitives_array.rs
diff --git a/src/bin/primitives/literals.rs b/src/bin/primitives_literals.rs
similarity index 100%
rename from src/bin/primitives/literals.rs
rename to src/bin/primitives_literals.rs
diff --git a/src/bin/primitives/tuples.rs b/src/bin/primitives_tuples.rs
similarity index 100%
rename from src/bin/primitives/tuples.rs
rename to src/bin/primitives_tuples.rs
diff --git a/src/bin/scope/borrow.rs b/src/bin/scope_borrow.rs
similarity index 100%
rename from src/bin/scope/borrow.rs
rename to src/bin/scope_borrow.rs
diff --git a/src/bin/scope/borrow/alias.rs b/src/bin/scope_borrow_alias.rs
similarity index 100%
rename from src/bin/scope/borrow/alias.rs
rename to src/bin/scope_borrow_alias.rs
diff --git a/src/bin/scope/borrow/mut.rs b/src/bin/scope_borrow_mut.rs
similarity index 100%
rename from src/bin/scope/borrow/mut.rs
rename to src/bin/scope_borrow_mut.rs
diff --git a/src/bin/scope/borrow/ref.rs b/src/bin/scope_borrow_ref.rs
similarity index 100%
rename from src/bin/scope/borrow/ref.rs
rename to src/bin/scope_borrow_ref.rs
diff --git a/src/bin/scope/lifetime.rs b/src/bin/scope_lifetime.rs
similarity index 100%
rename from src/bin/scope/lifetime.rs
rename to src/bin/scope_lifetime.rs
diff --git a/src/bin/scope/lifetime/elision.rs b/src/bin/scope_lifetime_elision.rs
similarity index 100%
rename from src/bin/scope/lifetime/elision.rs
rename to src/bin/scope_lifetime_elision.rs
diff --git a/src/bin/scope/lifetime/explicit.rs b/src/bin/scope_lifetime_explicit.rs
similarity index 100%
rename from src/bin/scope/lifetime/explicit.rs
rename to src/bin/scope_lifetime_explicit.rs
diff --git a/src/bin/scope/lifetime/fn.rs b/src/bin/scope_lifetime_fn.rs
similarity index 100%
rename from src/bin/scope/lifetime/fn.rs
rename to src/bin/scope_lifetime_fn.rs
diff --git a/src/bin/scope/lifetime/lifetime_bounds.rs b/src/bin/scope_lifetime_lifetime_bounds.rs
similarity index 100%
rename from src/bin/scope/lifetime/lifetime_bounds.rs
rename to src/bin/scope_lifetime_lifetime_bounds.rs
diff --git a/src/bin/scope/lifetime/lifetime_coercion.rs b/src/bin/scope_lifetime_lifetime_coercion.rs
similarity index 100%
rename from src/bin/scope/lifetime/lifetime_coercion.rs
rename to src/bin/scope_lifetime_lifetime_coercion.rs
diff --git a/src/bin/scope/lifetime/methods.rs b/src/bin/scope_lifetime_methods.rs
similarity index 100%
rename from src/bin/scope/lifetime/methods.rs
rename to src/bin/scope_lifetime_methods.rs
diff --git a/src/bin/scope/lifetime/static_lifetime.rs b/src/bin/scope_lifetime_static_lifetime.rs
similarity index 100%
rename from src/bin/scope/lifetime/static_lifetime.rs
rename to src/bin/scope_lifetime_static_lifetime.rs
diff --git a/src/bin/scope/lifetime/struct.rs b/src/bin/scope_lifetime_struct.rs
similarity index 100%
rename from src/bin/scope/lifetime/struct.rs
rename to src/bin/scope_lifetime_struct.rs
diff --git a/src/bin/scope/lifetime/trait.rs b/src/bin/scope_lifetime_trait.rs
similarity index 100%
rename from src/bin/scope/lifetime/trait.rs
rename to src/bin/scope_lifetime_trait.rs
diff --git a/src/bin/scope/move.rs b/src/bin/scope_move.rs
similarity index 100%
rename from src/bin/scope/move.rs
rename to src/bin/scope_move.rs
diff --git a/src/bin/scope/move/mut.rs b/src/bin/scope_move_mut.rs
similarity index 100%
rename from src/bin/scope/move/mut.rs
rename to src/bin/scope_move_mut.rs
diff --git a/src/bin/scope/move/partial_move.rs b/src/bin/scope_move_partial_move.rs
similarity index 100%
rename from src/bin/scope/move/partial_move.rs
rename to src/bin/scope_move_partial_move.rs
diff --git a/src/bin/scope/raii.rs b/src/bin/scope_raii.rs
similarity index 100%
rename from src/bin/scope/raii.rs
rename to src/bin/scope_raii.rs
diff --git a/src/bin/std/arc.rs b/src/bin/std_arc.rs
similarity index 100%
rename from src/bin/std/arc.rs
rename to src/bin/std_arc.rs
diff --git a/src/bin/std/box.rs b/src/bin/std_box.rs
similarity index 100%
rename from src/bin/std/box.rs
rename to src/bin/std_box.rs
diff --git a/src/bin/std/hash.rs b/src/bin/std_hash.rs
similarity index 100%
rename from src/bin/std/hash.rs
rename to src/bin/std_hash.rs
diff --git a/src/bin/std/hash/alt_key_types.rs b/src/bin/std_hash_alt_key_types.rs
similarity index 100%
rename from src/bin/std/hash/alt_key_types.rs
rename to src/bin/std_hash_alt_key_types.rs
diff --git a/src/bin/std/hash/hashset.rs b/src/bin/std_hash_hashset.rs
similarity index 100%
rename from src/bin/std/hash/hashset.rs
rename to src/bin/std_hash_hashset.rs
diff --git a/src/bin/std_misc/arg.rs b/src/bin/std_misc_arg.rs
similarity index 100%
rename from src/bin/std_misc/arg.rs
rename to src/bin/std_misc_arg.rs
diff --git a/src/bin/std_misc/arg/matching.rs b/src/bin/std_misc_arg_matching.rs
similarity index 100%
rename from src/bin/std_misc/arg/matching.rs
rename to src/bin/std_misc_arg_matching.rs
diff --git a/src/bin/std_misc/channels.rs b/src/bin/std_misc_channels.rs
similarity index 100%
rename from src/bin/std_misc/channels.rs
rename to src/bin/std_misc_channels.rs
diff --git a/src/bin/std_misc/file/open.rs b/src/bin/std_misc_file_open.rs
similarity index 100%
rename from src/bin/std_misc/file/open.rs
rename to src/bin/std_misc_file_open.rs
diff --git a/src/bin/std_misc/path.rs b/src/bin/std_misc_path.rs
similarity index 100%
rename from src/bin/std_misc/path.rs
rename to src/bin/std_misc_path.rs
diff --git a/src/bin/std_misc/process.rs b/src/bin/std_misc_process.rs
similarity index 96%
rename from src/bin/std_misc/process.rs
rename to src/bin/std_misc_process.rs
index 891d1cc..0ee81cc 100644
--- a/src/bin/std_misc/process.rs
+++ b/src/bin/std_misc_process.rs
@@ -2,7 +2,7 @@
 
 
 use std::process::Command;
-
+/*
 fn part0() {
     let output = Command::new("rustc")
         .arg("--version")
@@ -19,9 +19,9 @@ fn part0() {
 
         print!("rustc failed and stderr was:\n{}", s);
     }
-}
+}*/
 
 pub fn main() {
-	part0();
+	// part0();
 }
 
diff --git a/src/bin/std_misc/threads.rs b/src/bin/std_misc_threads.rs
similarity index 100%
rename from src/bin/std_misc/threads.rs
rename to src/bin/std_misc_threads.rs
diff --git a/src/bin/std_misc/threads/testcase_mapreduce.rs b/src/bin/std_misc_threads_testcase_mapreduce.rs
similarity index 100%
rename from src/bin/std_misc/threads/testcase_mapreduce.rs
rename to src/bin/std_misc_threads_testcase_mapreduce.rs
diff --git a/src/bin/std/option.rs b/src/bin/std_option.rs
similarity index 100%
rename from src/bin/std/option.rs
rename to src/bin/std_option.rs
diff --git a/src/bin/std/panic.rs b/src/bin/std_panic.rs
similarity index 100%
rename from src/bin/std/panic.rs
rename to src/bin/std_panic.rs
diff --git a/src/bin/std/rc.rs b/src/bin/std_rc.rs
similarity index 100%
rename from src/bin/std/rc.rs
rename to src/bin/std_rc.rs
diff --git a/src/bin/std/result.rs b/src/bin/std_result.rs
similarity index 100%
rename from src/bin/std/result.rs
rename to src/bin/std_result.rs
diff --git a/src/bin/std/result/question_mark.rs b/src/bin/std_result_question_mark.rs
similarity index 100%
rename from src/bin/std/result/question_mark.rs
rename to src/bin/std_result_question_mark.rs
diff --git a/src/bin/std/str.rs b/src/bin/std_str.rs
similarity index 100%
rename from src/bin/std/str.rs
rename to src/bin/std_str.rs
diff --git a/src/bin/std/vec.rs b/src/bin/std_vec.rs
similarity index 100%
rename from src/bin/std/vec.rs
rename to src/bin/std_vec.rs
diff --git a/src/bin/trait/clone.rs b/src/bin/trait_clone.rs
similarity index 100%
rename from src/bin/trait/clone.rs
rename to src/bin/trait_clone.rs
diff --git a/src/bin/trait/derive.rs b/src/bin/trait_derive.rs
similarity index 100%
rename from src/bin/trait/derive.rs
rename to src/bin/trait_derive.rs
diff --git a/src/bin/trait/disambiguating.rs b/src/bin/trait_disambiguating.rs
similarity index 100%
rename from src/bin/trait/disambiguating.rs
rename to src/bin/trait_disambiguating.rs
diff --git a/src/bin/trait/drop.rs b/src/bin/trait_drop.rs
similarity index 100%
rename from src/bin/trait/drop.rs
rename to src/bin/trait_drop.rs
diff --git a/src/bin/trait/dyn.rs b/src/bin/trait_dyn.rs
similarity index 100%
rename from src/bin/trait/dyn.rs
rename to src/bin/trait_dyn.rs
diff --git a/src/bin/trait/impl_trait.rs b/src/bin/trait_impl_trait.rs
similarity index 100%
rename from src/bin/trait/impl_trait.rs
rename to src/bin/trait_impl_trait.rs
diff --git a/src/bin/trait/iter.rs b/src/bin/trait_iter.rs
similarity index 100%
rename from src/bin/trait/iter.rs
rename to src/bin/trait_iter.rs
diff --git a/src/bin/trait/ops.rs b/src/bin/trait_ops.rs
similarity index 100%
rename from src/bin/trait/ops.rs
rename to src/bin/trait_ops.rs
diff --git a/src/bin/trait/supertraits.rs b/src/bin/trait_supertraits.rs
similarity index 100%
rename from src/bin/trait/supertraits.rs
rename to src/bin/trait_supertraits.rs
diff --git a/src/bin/types/alias.rs b/src/bin/types_alias.rs
similarity index 100%
rename from src/bin/types/alias.rs
rename to src/bin/types_alias.rs
diff --git a/src/bin/types/cast.rs b/src/bin/types_cast.rs
similarity index 100%
rename from src/bin/types/cast.rs
rename to src/bin/types_cast.rs
diff --git a/src/bin/types/inference.rs b/src/bin/types_inference.rs
similarity index 100%
rename from src/bin/types/inference.rs
rename to src/bin/types_inference.rs
diff --git a/src/bin/types/literals.rs b/src/bin/types_literals.rs
similarity index 100%
rename from src/bin/types/literals.rs
rename to src/bin/types_literals.rs
diff --git a/src/bin/variable_bindings/declare.rs b/src/bin/variable_bindings_declare.rs
similarity index 100%
rename from src/bin/variable_bindings/declare.rs
rename to src/bin/variable_bindings_declare.rs
diff --git a/src/bin/variable_bindings/freeze.rs b/src/bin/variable_bindings_freeze.rs
similarity index 100%
rename from src/bin/variable_bindings/freeze.rs
rename to src/bin/variable_bindings_freeze.rs
diff --git a/src/bin/variable_bindings/mut.rs b/src/bin/variable_bindings_mut.rs
similarity index 100%
rename from src/bin/variable_bindings/mut.rs
rename to src/bin/variable_bindings_mut.rs
diff --git a/src/bin/variable_bindings/scope.rs b/src/bin/variable_bindings_scope.rs
similarity index 100%
rename from src/bin/variable_bindings/scope.rs
rename to src/bin/variable_bindings_scope.rs