diff --git a/reasoning_gym/exercises/algebra/__init__.py b/reasoning_gym/algebra/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/algebra/__init__.py
rename to reasoning_gym/algebra/__init__.py
diff --git a/reasoning_gym/exercises/algebra/polynomial_equations.py b/reasoning_gym/algebra/polynomial_equations.py
similarity index 100%
rename from reasoning_gym/exercises/algebra/polynomial_equations.py
rename to reasoning_gym/algebra/polynomial_equations.py
diff --git a/reasoning_gym/exercises/algebra/simple_equations.py b/reasoning_gym/algebra/simple_equations.py
similarity index 100%
rename from reasoning_gym/exercises/algebra/simple_equations.py
rename to reasoning_gym/algebra/simple_equations.py
diff --git a/reasoning_gym/exercises/algorithmic/__init__.py b/reasoning_gym/algorithmic/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/__init__.py
rename to reasoning_gym/algorithmic/__init__.py
diff --git a/reasoning_gym/exercises/algorithmic/base_conversion.py b/reasoning_gym/algorithmic/base_conversion.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/base_conversion.py
rename to reasoning_gym/algorithmic/base_conversion.py
diff --git a/reasoning_gym/exercises/algorithmic/caesar_cipher.py b/reasoning_gym/algorithmic/caesar_cipher.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/caesar_cipher.py
rename to reasoning_gym/algorithmic/caesar_cipher.py
diff --git a/reasoning_gym/exercises/algorithmic/letter_counting.py b/reasoning_gym/algorithmic/letter_counting.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/letter_counting.py
rename to reasoning_gym/algorithmic/letter_counting.py
diff --git a/reasoning_gym/exercises/algorithmic/letter_jumble.py b/reasoning_gym/algorithmic/letter_jumble.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/letter_jumble.py
rename to reasoning_gym/algorithmic/letter_jumble.py
diff --git a/reasoning_gym/exercises/algorithmic/number_filtering.py b/reasoning_gym/algorithmic/number_filtering.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/number_filtering.py
rename to reasoning_gym/algorithmic/number_filtering.py
diff --git a/reasoning_gym/exercises/algorithmic/number_sorting.py b/reasoning_gym/algorithmic/number_sorting.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/number_sorting.py
rename to reasoning_gym/algorithmic/number_sorting.py
diff --git a/reasoning_gym/exercises/algorithmic/sentence_reordering.py b/reasoning_gym/algorithmic/sentence_reordering.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/sentence_reordering.py
rename to reasoning_gym/algorithmic/sentence_reordering.py
diff --git a/reasoning_gym/exercises/algorithmic/spell_backward.py b/reasoning_gym/algorithmic/spell_backward.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/spell_backward.py
rename to reasoning_gym/algorithmic/spell_backward.py
diff --git a/reasoning_gym/exercises/algorithmic/word_ladder.py b/reasoning_gym/algorithmic/word_ladder.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/word_ladder.py
rename to reasoning_gym/algorithmic/word_ladder.py
diff --git a/reasoning_gym/exercises/algorithmic/word_sequence_reversal.py b/reasoning_gym/algorithmic/word_sequence_reversal.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/word_sequence_reversal.py
rename to reasoning_gym/algorithmic/word_sequence_reversal.py
diff --git a/reasoning_gym/exercises/algorithmic/word_sorting.py b/reasoning_gym/algorithmic/word_sorting.py
similarity index 100%
rename from reasoning_gym/exercises/algorithmic/word_sorting.py
rename to reasoning_gym/algorithmic/word_sorting.py
diff --git a/reasoning_gym/exercises/arithmetic/__init__.py b/reasoning_gym/arithmetic/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/arithmetic/__init__.py
rename to reasoning_gym/arithmetic/__init__.py
diff --git a/reasoning_gym/exercises/arithmetic/basic_arithmetic.py b/reasoning_gym/arithmetic/basic_arithmetic.py
similarity index 100%
rename from reasoning_gym/exercises/arithmetic/basic_arithmetic.py
rename to reasoning_gym/arithmetic/basic_arithmetic.py
diff --git a/reasoning_gym/exercises/arithmetic/calendar_arithmetic.py b/reasoning_gym/arithmetic/calendar_arithmetic.py
similarity index 100%
rename from reasoning_gym/exercises/arithmetic/calendar_arithmetic.py
rename to reasoning_gym/arithmetic/calendar_arithmetic.py
diff --git a/reasoning_gym/exercises/arithmetic/chain_sum.py b/reasoning_gym/arithmetic/chain_sum.py
similarity index 100%
rename from reasoning_gym/exercises/arithmetic/chain_sum.py
rename to reasoning_gym/arithmetic/chain_sum.py
diff --git a/reasoning_gym/exercises/arithmetic/fraction_simplification.py b/reasoning_gym/arithmetic/fraction_simplification.py
similarity index 100%
rename from reasoning_gym/exercises/arithmetic/fraction_simplification.py
rename to reasoning_gym/arithmetic/fraction_simplification.py
diff --git a/reasoning_gym/exercises/arithmetic/gcd.py b/reasoning_gym/arithmetic/gcd.py
similarity index 100%
rename from reasoning_gym/exercises/arithmetic/gcd.py
rename to reasoning_gym/arithmetic/gcd.py
diff --git a/reasoning_gym/exercises/arithmetic/lcm.py b/reasoning_gym/arithmetic/lcm.py
similarity index 100%
rename from reasoning_gym/exercises/arithmetic/lcm.py
rename to reasoning_gym/arithmetic/lcm.py
diff --git a/reasoning_gym/exercises/arithmetic/leg_counting.py b/reasoning_gym/arithmetic/leg_counting.py
similarity index 100%
rename from reasoning_gym/exercises/arithmetic/leg_counting.py
rename to reasoning_gym/arithmetic/leg_counting.py
diff --git a/reasoning_gym/exercises/arithmetic/prime_factorization.py b/reasoning_gym/arithmetic/prime_factorization.py
similarity index 100%
rename from reasoning_gym/exercises/arithmetic/prime_factorization.py
rename to reasoning_gym/arithmetic/prime_factorization.py
diff --git a/reasoning_gym/exercises/arithmetic/time_intervals.py b/reasoning_gym/arithmetic/time_intervals.py
similarity index 100%
rename from reasoning_gym/exercises/arithmetic/time_intervals.py
rename to reasoning_gym/arithmetic/time_intervals.py
diff --git a/reasoning_gym/exercises/code/__init__.py b/reasoning_gym/code/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/code/__init__.py
rename to reasoning_gym/code/__init__.py
diff --git a/reasoning_gym/exercises/code/bf.py b/reasoning_gym/code/bf.py
similarity index 100%
rename from reasoning_gym/exercises/code/bf.py
rename to reasoning_gym/code/bf.py
diff --git a/reasoning_gym/exercises/code/contrib/__init__.py b/reasoning_gym/code/contrib/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/__init__.py
rename to reasoning_gym/code/contrib/__init__.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/BF-it.py b/reasoning_gym/code/contrib/bfit/BF-it.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/BF-it.py
rename to reasoning_gym/code/contrib/bfit/BF-it.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/Compiler.py b/reasoning_gym/code/contrib/bfit/Compiler/Compiler.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/Compiler.py
rename to reasoning_gym/code/contrib/bfit/Compiler/Compiler.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/Exceptions.py b/reasoning_gym/code/contrib/bfit/Compiler/Exceptions.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/Exceptions.py
rename to reasoning_gym/code/contrib/bfit/Compiler/Exceptions.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/FunctionCompiler.py b/reasoning_gym/code/contrib/bfit/Compiler/FunctionCompiler.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/FunctionCompiler.py
rename to reasoning_gym/code/contrib/bfit/Compiler/FunctionCompiler.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/Functions.py b/reasoning_gym/code/contrib/bfit/Compiler/Functions.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/Functions.py
rename to reasoning_gym/code/contrib/bfit/Compiler/Functions.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/General.py b/reasoning_gym/code/contrib/bfit/Compiler/General.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/General.py
rename to reasoning_gym/code/contrib/bfit/Compiler/General.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/Globals.py b/reasoning_gym/code/contrib/bfit/Compiler/Globals.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/Globals.py
rename to reasoning_gym/code/contrib/bfit/Compiler/Globals.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/Lexical_analyzer.py b/reasoning_gym/code/contrib/bfit/Compiler/Lexical_analyzer.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/Lexical_analyzer.py
rename to reasoning_gym/code/contrib/bfit/Compiler/Lexical_analyzer.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/LibraryFunctionCompiler.py b/reasoning_gym/code/contrib/bfit/Compiler/LibraryFunctionCompiler.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/LibraryFunctionCompiler.py
rename to reasoning_gym/code/contrib/bfit/Compiler/LibraryFunctionCompiler.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/Minify.py b/reasoning_gym/code/contrib/bfit/Compiler/Minify.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/Minify.py
rename to reasoning_gym/code/contrib/bfit/Compiler/Minify.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/Node.py b/reasoning_gym/code/contrib/bfit/Compiler/Node.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/Node.py
rename to reasoning_gym/code/contrib/bfit/Compiler/Node.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/Optimizer.py b/reasoning_gym/code/contrib/bfit/Compiler/Optimizer.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/Optimizer.py
rename to reasoning_gym/code/contrib/bfit/Compiler/Optimizer.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/Parser.py b/reasoning_gym/code/contrib/bfit/Compiler/Parser.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/Parser.py
rename to reasoning_gym/code/contrib/bfit/Compiler/Parser.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/Token.py b/reasoning_gym/code/contrib/bfit/Compiler/Token.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/Token.py
rename to reasoning_gym/code/contrib/bfit/Compiler/Token.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Compiler/__init__.py b/reasoning_gym/code/contrib/bfit/Compiler/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Compiler/__init__.py
rename to reasoning_gym/code/contrib/bfit/Compiler/__init__.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/Interpreter.py b/reasoning_gym/code/contrib/bfit/Interpreter.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/Interpreter.py
rename to reasoning_gym/code/contrib/bfit/Interpreter.py
diff --git a/reasoning_gym/exercises/code/contrib/bfit/LICENSE.md b/reasoning_gym/code/contrib/bfit/LICENSE.md
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/LICENSE.md
rename to reasoning_gym/code/contrib/bfit/LICENSE.md
diff --git a/reasoning_gym/exercises/code/contrib/bfit/README.md b/reasoning_gym/code/contrib/bfit/README.md
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/README.md
rename to reasoning_gym/code/contrib/bfit/README.md
diff --git a/reasoning_gym/exercises/code/contrib/bfit/__init__.py b/reasoning_gym/code/contrib/bfit/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/code/contrib/bfit/__init__.py
rename to reasoning_gym/code/contrib/bfit/__init__.py
diff --git a/reasoning_gym/exercises/cognition/__init__.py b/reasoning_gym/cognition/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/cognition/__init__.py
rename to reasoning_gym/cognition/__init__.py
diff --git a/reasoning_gym/exercises/cognition/color_cube_rotation.py b/reasoning_gym/cognition/color_cube_rotation.py
similarity index 100%
rename from reasoning_gym/exercises/cognition/color_cube_rotation.py
rename to reasoning_gym/cognition/color_cube_rotation.py
diff --git a/reasoning_gym/exercises/cognition/figlet_fonts.py b/reasoning_gym/cognition/figlet_fonts.py
similarity index 100%
rename from reasoning_gym/exercises/cognition/figlet_fonts.py
rename to reasoning_gym/cognition/figlet_fonts.py
diff --git a/reasoning_gym/exercises/cognition/number_sequences.py b/reasoning_gym/cognition/number_sequences.py
similarity index 100%
rename from reasoning_gym/exercises/cognition/number_sequences.py
rename to reasoning_gym/cognition/number_sequences.py
diff --git a/reasoning_gym/exercises/cognition/rubiks_cube.py b/reasoning_gym/cognition/rubiks_cube.py
similarity index 100%
rename from reasoning_gym/exercises/cognition/rubiks_cube.py
rename to reasoning_gym/cognition/rubiks_cube.py
diff --git a/reasoning_gym/exercises/games/__init__.py b/reasoning_gym/games/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/games/__init__.py
rename to reasoning_gym/games/__init__.py
diff --git a/reasoning_gym/exercises/games/countdown.py b/reasoning_gym/games/countdown.py
similarity index 100%
rename from reasoning_gym/exercises/games/countdown.py
rename to reasoning_gym/games/countdown.py
diff --git a/reasoning_gym/exercises/games/game_of_life.py b/reasoning_gym/games/game_of_life.py
similarity index 100%
rename from reasoning_gym/exercises/games/game_of_life.py
rename to reasoning_gym/games/game_of_life.py
diff --git a/reasoning_gym/exercises/games/maze.py b/reasoning_gym/games/maze.py
similarity index 100%
rename from reasoning_gym/exercises/games/maze.py
rename to reasoning_gym/games/maze.py
diff --git a/reasoning_gym/exercises/games/mini_sudoku.py b/reasoning_gym/games/mini_sudoku.py
similarity index 100%
rename from reasoning_gym/exercises/games/mini_sudoku.py
rename to reasoning_gym/games/mini_sudoku.py
diff --git a/reasoning_gym/exercises/games/sudoku.py b/reasoning_gym/games/sudoku.py
similarity index 100%
rename from reasoning_gym/exercises/games/sudoku.py
rename to reasoning_gym/games/sudoku.py
diff --git a/reasoning_gym/exercises/games/tower_of_hanoi.py b/reasoning_gym/games/tower_of_hanoi.py
similarity index 100%
rename from reasoning_gym/exercises/games/tower_of_hanoi.py
rename to reasoning_gym/games/tower_of_hanoi.py
diff --git a/reasoning_gym/exercises/geometry/__init__.py b/reasoning_gym/geometry/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/geometry/__init__.py
rename to reasoning_gym/geometry/__init__.py
diff --git a/reasoning_gym/exercises/geometry/advanced_geometry.py b/reasoning_gym/geometry/advanced_geometry.py
similarity index 100%
rename from reasoning_gym/exercises/geometry/advanced_geometry.py
rename to reasoning_gym/geometry/advanced_geometry.py
diff --git a/reasoning_gym/exercises/geometry/simple_geometry.py b/reasoning_gym/geometry/simple_geometry.py
similarity index 100%
rename from reasoning_gym/exercises/geometry/simple_geometry.py
rename to reasoning_gym/geometry/simple_geometry.py
diff --git a/reasoning_gym/exercises/graphs/__init__.py b/reasoning_gym/graphs/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/graphs/__init__.py
rename to reasoning_gym/graphs/__init__.py
diff --git a/reasoning_gym/exercises/graphs/family_relationships.py b/reasoning_gym/graphs/family_relationships.py
similarity index 100%
rename from reasoning_gym/exercises/graphs/family_relationships.py
rename to reasoning_gym/graphs/family_relationships.py
diff --git a/reasoning_gym/exercises/graphs/quantum_lock.py b/reasoning_gym/graphs/quantum_lock.py
similarity index 100%
rename from reasoning_gym/exercises/graphs/quantum_lock.py
rename to reasoning_gym/graphs/quantum_lock.py
diff --git a/reasoning_gym/exercises/logic/__init__.py b/reasoning_gym/logic/__init__.py
similarity index 100%
rename from reasoning_gym/exercises/logic/__init__.py
rename to reasoning_gym/logic/__init__.py
diff --git a/reasoning_gym/exercises/logic/aiw.py b/reasoning_gym/logic/aiw.py
similarity index 100%
rename from reasoning_gym/exercises/logic/aiw.py
rename to reasoning_gym/logic/aiw.py
diff --git a/reasoning_gym/exercises/logic/propositional_logic.py b/reasoning_gym/logic/propositional_logic.py
similarity index 100%
rename from reasoning_gym/exercises/logic/propositional_logic.py
rename to reasoning_gym/logic/propositional_logic.py
diff --git a/reasoning_gym/exercises/logic/syllogisms.py b/reasoning_gym/logic/syllogisms.py
similarity index 100%
rename from reasoning_gym/exercises/logic/syllogisms.py
rename to reasoning_gym/logic/syllogisms.py
diff --git a/tests/exercises/geometry/test_advanced_geometry.py b/tests/test_advanced_geometry.py
similarity index 100%
rename from tests/exercises/geometry/test_advanced_geometry.py
rename to tests/test_advanced_geometry.py
diff --git a/tests/exercises/logic/test_aiw.py b/tests/test_aiw.py
similarity index 100%
rename from tests/exercises/logic/test_aiw.py
rename to tests/test_aiw.py
diff --git a/tests/exercises/arithmetic/test_basic_arithmetic.py b/tests/test_arithmetic.py
similarity index 100%
rename from tests/exercises/arithmetic/test_basic_arithmetic.py
rename to tests/test_arithmetic.py
diff --git a/tests/exercises/algorithmic/test_base_conversion.py b/tests/test_base_conversion.py
similarity index 100%
rename from tests/exercises/algorithmic/test_base_conversion.py
rename to tests/test_base_conversion.py
diff --git a/tests/exercises/code/test_bf.py b/tests/test_bf.py
similarity index 100%
rename from tests/exercises/code/test_bf.py
rename to tests/test_bf.py
diff --git a/tests/exercises/algorithmic/test_caesar_cipher.py b/tests/test_caesar_cipher.py
similarity index 100%
rename from tests/exercises/algorithmic/test_caesar_cipher.py
rename to tests/test_caesar_cipher.py
diff --git a/tests/exercises/arithmetic/test_calendar_arithmetic.py b/tests/test_calendar_arithmetic.py
similarity index 100%
rename from tests/exercises/arithmetic/test_calendar_arithmetic.py
rename to tests/test_calendar_arithmetic.py
diff --git a/tests/exercises/arithmetic/test_chain_sum.py b/tests/test_chain_sum.py
similarity index 100%
rename from tests/exercises/arithmetic/test_chain_sum.py
rename to tests/test_chain_sum.py
diff --git a/tests/exercises/cognition/test_color_cube_rotation.py b/tests/test_color_cube_rotation.py
similarity index 100%
rename from tests/exercises/cognition/test_color_cube_rotation.py
rename to tests/test_color_cube_rotation.py
diff --git a/tests/exercises/games/test_countdown.py b/tests/test_countdown.py
similarity index 100%
rename from tests/exercises/games/test_countdown.py
rename to tests/test_countdown.py
diff --git a/tests/exercises/graphs/test_family_relationships.py b/tests/test_family_relationships.py
similarity index 100%
rename from tests/exercises/graphs/test_family_relationships.py
rename to tests/test_family_relationships.py
diff --git a/tests/exercises/cognition/test_figlet_fonts.py b/tests/test_figlet_fonts.py
similarity index 100%
rename from tests/exercises/cognition/test_figlet_fonts.py
rename to tests/test_figlet_fonts.py
diff --git a/tests/exercises/arithmetic/test_fraction_simplification.py b/tests/test_fraction_simplification.py
similarity index 100%
rename from tests/exercises/arithmetic/test_fraction_simplification.py
rename to tests/test_fraction_simplification.py
diff --git a/tests/exercises/games/test_game_of_life.py b/tests/test_game_of_life.py
similarity index 100%
rename from tests/exercises/games/test_game_of_life.py
rename to tests/test_game_of_life.py
diff --git a/tests/exercises/arithmetic/test_gcd.py b/tests/test_gcd.py
similarity index 100%
rename from tests/exercises/arithmetic/test_gcd.py
rename to tests/test_gcd.py
diff --git a/tests/exercises/arithmetic/test_lcm.py b/tests/test_lcm.py
similarity index 100%
rename from tests/exercises/arithmetic/test_lcm.py
rename to tests/test_lcm.py
diff --git a/tests/exercises/arithmetic/test_leg_counting.py b/tests/test_leg_counting.py
similarity index 100%
rename from tests/exercises/arithmetic/test_leg_counting.py
rename to tests/test_leg_counting.py
diff --git a/tests/exercises/algorithmic/test_letter_counting.py b/tests/test_letter_counting.py
similarity index 100%
rename from tests/exercises/algorithmic/test_letter_counting.py
rename to tests/test_letter_counting.py
diff --git a/tests/exercises/algorithmic/test_letter_jumble.py b/tests/test_letter_jumble.py
similarity index 100%
rename from tests/exercises/algorithmic/test_letter_jumble.py
rename to tests/test_letter_jumble.py
diff --git a/tests/exercises/games/test_maze.py b/tests/test_maze.py
similarity index 100%
rename from tests/exercises/games/test_maze.py
rename to tests/test_maze.py
diff --git a/tests/exercises/games/test_mini_sudoku.py b/tests/test_mini_sudoku.py
similarity index 100%
rename from tests/exercises/games/test_mini_sudoku.py
rename to tests/test_mini_sudoku.py
diff --git a/tests/exercises/algorithmic/test_number_filtering.py b/tests/test_number_filtering.py
similarity index 100%
rename from tests/exercises/algorithmic/test_number_filtering.py
rename to tests/test_number_filtering.py
diff --git a/tests/exercises/cognition/test_number_sequences.py b/tests/test_number_sequences.py
similarity index 100%
rename from tests/exercises/cognition/test_number_sequences.py
rename to tests/test_number_sequences.py
diff --git a/tests/exercises/algorithmic/test_number_sorting.py b/tests/test_number_sorting.py
similarity index 100%
rename from tests/exercises/algorithmic/test_number_sorting.py
rename to tests/test_number_sorting.py
diff --git a/tests/exercises/algebra/test_polynomial_equations.py b/tests/test_polynomial_equations.py
similarity index 100%
rename from tests/exercises/algebra/test_polynomial_equations.py
rename to tests/test_polynomial_equations.py
diff --git a/tests/exercises/arithmetic/test_prime_factorization.py b/tests/test_prime_factorization.py
similarity index 100%
rename from tests/exercises/arithmetic/test_prime_factorization.py
rename to tests/test_prime_factorization.py
diff --git a/tests/exercises/logic/test_propositional_logic.py b/tests/test_propositional_logic.py
similarity index 100%
rename from tests/exercises/logic/test_propositional_logic.py
rename to tests/test_propositional_logic.py
diff --git a/tests/exercises/graphs/test_quantum_lock.py b/tests/test_quantum_lock.py
similarity index 100%
rename from tests/exercises/graphs/test_quantum_lock.py
rename to tests/test_quantum_lock.py
diff --git a/tests/exercises/cognition/test_rubiks_cube.py b/tests/test_rubiks_cube.py
similarity index 100%
rename from tests/exercises/cognition/test_rubiks_cube.py
rename to tests/test_rubiks_cube.py
diff --git a/tests/exercises/algorithmic/test_sentence_reordering.py b/tests/test_sentence_reordering.py
similarity index 100%
rename from tests/exercises/algorithmic/test_sentence_reordering.py
rename to tests/test_sentence_reordering.py
diff --git a/tests/exercises/algebra/test_simple_equations.py b/tests/test_simple_equations.py
similarity index 100%
rename from tests/exercises/algebra/test_simple_equations.py
rename to tests/test_simple_equations.py
diff --git a/tests/exercises/geometry/test_simple_geometry.py b/tests/test_simple_geometry.py
similarity index 100%
rename from tests/exercises/geometry/test_simple_geometry.py
rename to tests/test_simple_geometry.py
diff --git a/tests/exercises/algorithmic/test_spell_backward.py b/tests/test_spell_backward.py
similarity index 100%
rename from tests/exercises/algorithmic/test_spell_backward.py
rename to tests/test_spell_backward.py
diff --git a/tests/exercises/games/test_sudoku.py b/tests/test_sudoku.py
similarity index 100%
rename from tests/exercises/games/test_sudoku.py
rename to tests/test_sudoku.py
diff --git a/tests/exercises/logic/test_syllogisms.py b/tests/test_syllogisms.py
similarity index 100%
rename from tests/exercises/logic/test_syllogisms.py
rename to tests/test_syllogisms.py
diff --git a/tests/exercises/arithmetic/test_time_intervals.py b/tests/test_time_intervals.py
similarity index 100%
rename from tests/exercises/arithmetic/test_time_intervals.py
rename to tests/test_time_intervals.py
diff --git a/tests/exercises/games/test_tower_of_hanoi.py b/tests/test_tower_of_hanoi.py
similarity index 100%
rename from tests/exercises/games/test_tower_of_hanoi.py
rename to tests/test_tower_of_hanoi.py
diff --git a/tests/exercises/algorithmic/test_word_ladder.py b/tests/test_word_ladder.py
similarity index 100%
rename from tests/exercises/algorithmic/test_word_ladder.py
rename to tests/test_word_ladder.py
diff --git a/tests/exercises/algorithmic/test_word_sequence_reversal.py b/tests/test_word_sequence_reversal.py
similarity index 100%
rename from tests/exercises/algorithmic/test_word_sequence_reversal.py
rename to tests/test_word_sequence_reversal.py
diff --git a/tests/exercises/algorithmic/test_word_sorting.py b/tests/test_word_sorting.py
similarity index 100%
rename from tests/exercises/algorithmic/test_word_sorting.py
rename to tests/test_word_sorting.py