diff --git a/lib/database/database.dart b/lib/database/database.dart
new file mode 100644
index 0000000..10474b8
--- /dev/null
+++ b/lib/database/database.dart
@@ -0,0 +1,37 @@
+
+import 'package:progetto_m335_flutter/model/note.dart';
+
+class Database{
+  static final Database _instance = Database._init();
+  static Database? _database;
+
+  Database._init();
+
+  Future<Database> get database async {
+    if (_database != null) return _database!;
+    _database = await _initDB('database.db');
+
+    return _database!;
+  }
+
+  Future _createDB(Database database) async{
+    const integerPrimaryKeyAutoincrement = 'INTEGER PRIMARY KEY AUTOINCREMENT';
+    const textNotNull = 'TEXT NOT NULL';
+    const integerNotNull = 'INTEGER NOT NULL';
+    const integer = 'INTEGER';
+    const real = 'REAL';
+    const text = 'TEXT';
+
+
+    await database.execute('''
+      CREATE TABLE $Note (
+        ${Note.id} $integerPrimaryKeyAutoincrement,
+        
+      )
+    ''');
+  }
+
+  execute(String s) {
+
+  }
+}
\ No newline at end of file
diff --git a/lib/database/note.dart b/lib/database/note.dart
deleted file mode 100644
index ece0167..0000000
--- a/lib/database/note.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-import 'base_entity.dart';
-
-class Note extends BaseEntity{
-  static String id = BaseEntity.getId;
-  static String Title = BaseEntity.getTitle;
-  static String CreationDate = BaseEntity.getCreationDate;
-
-}
\ No newline at end of file
diff --git a/lib/database/base_entity.dart b/lib/model/base_entity.dart
similarity index 100%
rename from lib/database/base_entity.dart
rename to lib/model/base_entity.dart
diff --git a/lib/database/identifiers/enum/color.dart b/lib/model/identifiers/enum/color.dart
similarity index 100%
rename from lib/database/identifiers/enum/color.dart
rename to lib/model/identifiers/enum/color.dart
diff --git a/lib/database/identifiers/enum/priority.dart b/lib/model/identifiers/enum/priority.dart
similarity index 100%
rename from lib/database/identifiers/enum/priority.dart
rename to lib/model/identifiers/enum/priority.dart
diff --git a/lib/database/identifiers/tag.dart b/lib/model/identifiers/tag.dart
similarity index 100%
rename from lib/database/identifiers/tag.dart
rename to lib/model/identifiers/tag.dart
diff --git a/lib/database/promemoria.dart b/lib/model/note.dart
similarity index 51%
rename from lib/database/promemoria.dart
rename to lib/model/note.dart
index baa8ddd..df6bed2 100644
--- a/lib/database/promemoria.dart
+++ b/lib/model/note.dart
@@ -1,11 +1,11 @@
 import 'base_entity.dart';
-import 'identifiers/enum/priority.dart';
 
-class Note extends BaseEntity{
+const String noteTable = 'note';
+
+class Note extends BaseEntity {
   static String id = BaseEntity.getId;
   static String title = BaseEntity.getTitle;
   static String creationDate = BaseEntity.getCreationDate;
-  static String expirationDate = 'expirationDate';
-  Priority priority = Priority.low;
+  static String lastModificationDate = BaseEntity.getLastEditDate;
+  static String description = '';
 }
-
diff --git a/lib/model/promemoria.dart b/lib/model/promemoria.dart
new file mode 100644
index 0000000..32f4ebc
--- /dev/null
+++ b/lib/model/promemoria.dart
@@ -0,0 +1,23 @@
+import 'dart:ui';
+
+import 'base_entity.dart';
+import 'identifiers/enum/color.dart';
+import 'identifiers/enum/priority.dart';
+
+const String promemoriaTable = 'promemoria';
+
+class Promemoria extends BaseEntity{
+  static String id = BaseEntity.getId;
+  static String title = BaseEntity.getTitle;
+  static String creationDate = BaseEntity.getCreationDate;
+  static String lastModificationDate = BaseEntity.getLastEditDate;
+  static String expirationDate = '';
+  static String description = '';
+
+  static Priority priority = Priority.none;
+  static Color color = Color.none;
+
+
+
+}
+
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 5e5d15e..bb5dffa 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -8,7 +8,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:progetto_m335_flutter/main.dart';
+import 'package:progetto_m335_flutter/myApp.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {