Updated folder structure

lib/data/db/database.dart

@@ -1,5 +1,5 @@
 import 'package:cabo_counter/data/db/tables/game_session_table.dart';
-import 'package:cabo_counter/data/db/tables/player_scores.dart';
+import 'package:cabo_counter/data/db/tables/player_scores_table.dart';
 import 'package:cabo_counter/data/db/tables/players_table.dart';
 import 'package:cabo_counter/data/db/tables/round_scores_table.dart';
 import 'package:cabo_counter/data/db/tables/rounds_table.dart';

lib/data/db/database.g.dart

@@ -505,7 +505,7 @@ class $PlayersTableTable extends PlayersTable
   $PlayersTableTable(this.attachedDatabase, [this._alias]);
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
-  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+  late final GeneratedColumn<String> playerId = GeneratedColumn<String>(
       'id', aliasedName, false,
       type: DriftSqlType.string,
       requiredDuringInsert: true,
@@ -517,7 +517,7 @@ class $PlayersTableTable extends PlayersTable
       'name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
   @override
-  List<GeneratedColumn> get $columns => [id, name];
+  List<GeneratedColumn> get $columns => [playerId, name];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -529,7 +529,7 @@ class $PlayersTableTable extends PlayersTable
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
-      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+      context.handle(_idMeta, playerId.isAcceptableOrUnknown(data['id']!, _idMeta));
     } else if (isInserting) {
       context.missing(_idMeta);
     }
@@ -1599,7 +1599,7 @@ final class $$GameSessionTableTableReferences extends BaseReferences<
       _playersTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable(
           db.playersTable,
           aliasName:
-              $_aliasNameGenerator(db.gameSessionTable.id, db.playersTable.id));
+              $_aliasNameGenerator(db.gameSessionTable.id, db.playersTable.playerId));
 
   $$PlayersTableTableProcessedTableManager get playersTableRefs {
     final manager = $$PlayersTableTableTableManager($_db, $_db.playersTable)
@@ -1688,7 +1688,7 @@ class $$GameSessionTableTableFilterComposer
         composer: this,
         getCurrentColumn: (t) => t.id,
         referencedTable: $db.playersTable,
-        getReferencedColumn: (t) => t.id,
+        getReferencedColumn: (t) => t.playerId,
         builder: (joinBuilder,
                 {$addJoinBuilderToRootComposer,
                 $removeJoinBuilderFromRootComposer}) =>
@@ -1827,7 +1827,7 @@ class $$GameSessionTableTableAnnotationComposer
         composer: this,
         getCurrentColumn: (t) => t.id,
         referencedTable: $db.playersTable,
-        getReferencedColumn: (t) => t.id,
+        getReferencedColumn: (t) => t.playerId,
         builder: (joinBuilder,
                 {$addJoinBuilderToRootComposer,
                 $removeJoinBuilderFromRootComposer}) =>
@@ -2060,7 +2060,7 @@ final class $$PlayersTableTableReferences extends BaseReferences<_$AppDatabase,
 
   static $GameSessionTableTable _idTable(_$AppDatabase db) =>
       db.gameSessionTable.createAlias(
-          $_aliasNameGenerator(db.playersTable.id, db.gameSessionTable.id));
+          $_aliasNameGenerator(db.playersTable.playerId, db.gameSessionTable.id));
 
   $$GameSessionTableTableProcessedTableManager get id {
     final $_column = $_itemColumn<String>('id')!;
@@ -2109,7 +2109,7 @@ class $$PlayersTableTableFilterComposer
   $$GameSessionTableTableFilterComposer get id {
     final $$GameSessionTableTableFilterComposer composer = $composerBuilder(
         composer: this,
-        getCurrentColumn: (t) => t.id,
+        getCurrentColumn: (t) => t.playerId,
         referencedTable: $db.gameSessionTable,
         getReferencedColumn: (t) => t.id,
         builder: (joinBuilder,
@@ -2163,7 +2163,7 @@ class $$PlayersTableTableOrderingComposer
   $$GameSessionTableTableOrderingComposer get id {
     final $$GameSessionTableTableOrderingComposer composer = $composerBuilder(
         composer: this,
-        getCurrentColumn: (t) => t.id,
+        getCurrentColumn: (t) => t.playerId,
         referencedTable: $db.gameSessionTable,
         getReferencedColumn: (t) => t.id,
         builder: (joinBuilder,
@@ -2196,7 +2196,7 @@ class $$PlayersTableTableAnnotationComposer
   $$GameSessionTableTableAnnotationComposer get id {
     final $$GameSessionTableTableAnnotationComposer composer = $composerBuilder(
         composer: this,
-        getCurrentColumn: (t) => t.id,
+        getCurrentColumn: (t) => t.playerId,
         referencedTable: $db.gameSessionTable,
         getReferencedColumn: (t) => t.id,
         builder: (joinBuilder,
@@ -2306,7 +2306,7 @@ class $$PlayersTableTableTableManager extends RootTableManager<
                 if (id) {
                   state = state.withJoin(
                     currentTable: table,
-                    currentColumn: table.id,
+                    currentColumn: table.playerId,
                     referencedTable: $$PlayersTableTableReferences._idTable(db),
                     referencedColumn:
                         $$PlayersTableTableReferences._idTable(db).id,

lib/data/db/tables/players_table.dart

@@ -2,7 +2,8 @@ import 'package:cabo_counter/data/db/tables/game_session_table.dart';
 import 'package:drift/drift.dart';
 
 class PlayersTable extends Table {
-  TextColumn get id =>
+  TextColumn get playerId =>
       text().references(GameSessionTable, #id, onDelete: KeyAction.cascade)();
+  IntColumn get position => integer()();
   TextColumn get name => text()();
 }

lib/data/db/tables/rounds_table.dart

@@ -2,12 +2,12 @@ import 'package:cabo_counter/data/db/tables/game_session_table.dart';
 import 'package:drift/drift.dart';
 
 class RoundsTable extends Table {
-  TextColumn get id => text()();
+  TextColumn get roundId => text()();
   TextColumn get gameId =>
       text().references(GameSessionTable, #id, onDelete: KeyAction.cascade)();
   IntColumn get roundNumber => integer()();
   TextColumn get kamikazePlayer => text().nullable()();
 
   @override
-  Set<Column<Object>> get primaryKey => {id};
+  Set<Column<Object>> get primaryKey => {roundId};
 }

lib/data/dto/game_manager.dart

@@ -1,4 +1,4 @@
-import 'package:cabo_counter/data/models/game_session.dart';
+import 'package:cabo_counter/data/dto/game_session.dart';
 import 'package:cabo_counter/services/local_storage_service.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';

lib/data/dto/game_session.dart

@@ -1,4 +1,4 @@
-import 'package:cabo_counter/data/models/round.dart';
+import 'package:cabo_counter/data/dto/round.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:uuid/uuid.dart';
 

lib/data/dto/round.dart

@@ -1,5 +1,3 @@
-import 'package:cabo_counter/data/models/game_session.dart';
-
 /// This class represents a single round in the game.
 /// It is stored within the [GameSession] class.
 /// [roundNum] is the number of the round its reppresenting.

lib/presentation/views/home/active_game/active_game_view.dart

@@ -1,7 +1,7 @@
 import 'package:cabo_counter/core/constants.dart';
 import 'package:cabo_counter/core/custom_theme.dart';
-import 'package:cabo_counter/data/game_manager.dart';
-import 'package:cabo_counter/data/game_session.dart';
+import 'package:cabo_counter/data/dto/game_manager.dart';
+import 'package:cabo_counter/data/dto/game_session.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/home/active_game/graph_view.dart';
 import 'package:cabo_counter/presentation/views/home/active_game/mode_selection_view.dart';

lib/presentation/views/home/active_game/graph_view.dart

@@ -1,5 +1,5 @@
 import 'package:cabo_counter/core/custom_theme.dart';
-import 'package:cabo_counter/data/game_session.dart';
+import 'package:cabo_counter/data/dto/game_session.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:syncfusion_flutter_charts/charts.dart';

lib/presentation/views/home/active_game/points_view.dart

@@ -1,5 +1,5 @@
 import 'package:cabo_counter/core/custom_theme.dart';
-import 'package:cabo_counter/data/game_session.dart';
+import 'package:cabo_counter/data/dto/game_session.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

lib/presentation/views/home/active_game/round_view.dart

@@ -1,5 +1,5 @@
 import 'package:cabo_counter/core/custom_theme.dart';
-import 'package:cabo_counter/data/game_session.dart';
+import 'package:cabo_counter/data/dto/game_session.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/widgets/custom_button.dart';
 import 'package:cabo_counter/services/local_storage_service.dart';

lib/presentation/views/home/create_game_view.dart

@@ -1,7 +1,7 @@
 import 'package:cabo_counter/core/constants.dart';
 import 'package:cabo_counter/core/custom_theme.dart';
-import 'package:cabo_counter/data/game_manager.dart';
-import 'package:cabo_counter/data/game_session.dart';
+import 'package:cabo_counter/data/dto/game_manager.dart';
+import 'package:cabo_counter/data/dto/game_session.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/home/active_game/active_game_view.dart';
 import 'package:cabo_counter/presentation/views/home/active_game/mode_selection_view.dart';

lib/presentation/views/home/main_menu_view.dart

@@ -1,7 +1,7 @@
 import 'package:cabo_counter/core/constants.dart';
 import 'package:cabo_counter/core/custom_theme.dart';
-import 'package:cabo_counter/data/game_manager.dart';
-import 'package:cabo_counter/data/game_session.dart';
+import 'package:cabo_counter/data/dto/game_manager.dart';
+import 'package:cabo_counter/data/dto/game_session.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/home/active_game/active_game_view.dart';
 import 'package:cabo_counter/presentation/views/home/create_game_view.dart';

lib/services/local_storage_service.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:cabo_counter/data/models/game_manager.dart';
-import 'package:cabo_counter/data/models/game_session.dart';
+import 'package:cabo_counter/data/dto/game_manager.dart';
+import 'package:cabo_counter/data/dto/game_session.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:file_saver/file_saver.dart';
 import 'package:flutter/services.dart';

test/data/game_session_test.dart

@@ -1,4 +1,4 @@
-import 'package:cabo_counter/data/models/game_session.dart';
+import 'package:cabo_counter/data/dto/game_session.dart';
 import 'package:test/test.dart';
 
 void main() {

test/data/round_test.dart

@@ -1,4 +1,4 @@
-import 'package:cabo_counter/data/models/round.dart';
+import 'package:cabo_counter/data/dto/round.dart';
 import 'package:test/test.dart';
 
 void main() {