diff --git a/test/db_tests/group_test.dart b/test/db_tests/aggregates/group_test.dart
similarity index 100%
rename from test/db_tests/group_test.dart
rename to test/db_tests/aggregates/group_test.dart
diff --git a/test/db_tests/match_test.dart b/test/db_tests/aggregates/match_test.dart
similarity index 100%
rename from test/db_tests/match_test.dart
rename to test/db_tests/aggregates/match_test.dart
diff --git a/test/db_tests/team_test.dart b/test/db_tests/aggregates/team_test.dart
similarity index 100%
rename from test/db_tests/team_test.dart
rename to test/db_tests/aggregates/team_test.dart
diff --git a/test/db_tests/game_test.dart b/test/db_tests/entities/game_test.dart
similarity index 100%
rename from test/db_tests/game_test.dart
rename to test/db_tests/entities/game_test.dart
diff --git a/test/db_tests/player_test.dart b/test/db_tests/entities/player_test.dart
similarity index 100%
rename from test/db_tests/player_test.dart
rename to test/db_tests/entities/player_test.dart
diff --git a/test/db_tests/player_group_test.dart b/test/db_tests/relationships/player_group_test.dart
similarity index 100%
rename from test/db_tests/player_group_test.dart
rename to test/db_tests/relationships/player_group_test.dart
diff --git a/test/db_tests/player_match_test.dart b/test/db_tests/relationships/player_match_test.dart
similarity index 100%
rename from test/db_tests/player_match_test.dart
rename to test/db_tests/relationships/player_match_test.dart
diff --git a/test/db_tests/score_test.dart b/test/db_tests/values/score_test.dart
similarity index 100%
rename from test/db_tests/score_test.dart
rename to test/db_tests/values/score_test.dart