diff --git a/app/schemas/net.foucry.pilldroid.PilldroidDatabase/1.json b/app/schemas/net.foucry.pilldroid.databases.MedicineDatabase/1.json
similarity index 62%
rename from app/schemas/net.foucry.pilldroid.PilldroidDatabase/1.json
rename to app/schemas/net.foucry.pilldroid.databases.MedicineDatabase/1.json
index d4fe768..15114b9 100644
--- a/app/schemas/net.foucry.pilldroid.PilldroidDatabase/1.json
+++ b/app/schemas/net.foucry.pilldroid.databases.MedicineDatabase/1.json
@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "5ac4c79044120e5fa2716c6a89eff9bf",
+    "identityHash": "71fee21ecfa4bc2a534eca55c0f0cd49",
     "entities": [
       {
-        "tableName": "medics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`cis` TEXT NOT NULL, `cip13` TEXT, `name` TEXT, `administration_mode` TEXT, `presentation` TEXT, `stock` INTEGER, `take` INTEGER, `warning` INTEGER, `alert` INTEGER, `last_update` INTEGER, PRIMARY KEY(`cis`))",
+        "tableName": "medicines",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`cis` TEXT NOT NULL, `cip13` TEXT, `cip7` TEXT, `administration_mode` TEXT, `name` TEXT, `presentation` TEXT, `label_group` TEXT, `generic_type` INTEGER, PRIMARY KEY(`cis`))",
         "fields": [
           {
             "fieldPath": "cis",
@@ -21,8 +21,8 @@
             "notNull": false
           },
           {
-            "fieldPath": "name",
-            "columnName": "name",
+            "fieldPath": "cip7",
+            "columnName": "cip7",
             "affinity": "TEXT",
             "notNull": false
           },
@@ -32,6 +32,12 @@
             "affinity": "TEXT",
             "notNull": false
           },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
           {
             "fieldPath": "presentation",
             "columnName": "presentation",
@@ -39,32 +45,14 @@
             "notNull": false
           },
           {
-            "fieldPath": "stock",
-            "columnName": "stock",
-            "affinity": "INTEGER",
+            "fieldPath": "label_group",
+            "columnName": "label_group",
+            "affinity": "TEXT",
             "notNull": false
           },
           {
-            "fieldPath": "take",
-            "columnName": "take",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "warning",
-            "columnName": "warning",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "last_update",
-            "columnName": "last_update",
+            "fieldPath": "generic_type",
+            "columnName": "generic_type",
             "affinity": "INTEGER",
             "notNull": false
           }
@@ -82,7 +70,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5ac4c79044120e5fa2716c6a89eff9bf')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '71fee21ecfa4bc2a534eca55c0f0cd49')"
     ]
   }
 }
\ No newline at end of file
diff --git a/app/schemas/net.foucry.pilldroid.PilldroidDatabase/2.json b/app/schemas/net.foucry.pilldroid.databases.PrescriptionDatabase/1.json
similarity index 93%
rename from app/schemas/net.foucry.pilldroid.PilldroidDatabase/2.json
rename to app/schemas/net.foucry.pilldroid.databases.PrescriptionDatabase/1.json
index b18c00f..64b56b9 100644
--- a/app/schemas/net.foucry.pilldroid.PilldroidDatabase/2.json
+++ b/app/schemas/net.foucry.pilldroid.databases.PrescriptionDatabase/1.json
@@ -1,11 +1,11 @@
 {
   "formatVersion": 1,
   "database": {
-    "version": 2,
-    "identityHash": "ed6d0a13273d73ba9fcec1f374251efa",
+    "version": 1,
+    "identityHash": "46c4983931eaf7414e25dfd9e1a55e0f",
     "entities": [
       {
-        "tableName": "medics",
+        "tableName": "prescriptions",
         "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`cis` TEXT NOT NULL, `cip13` TEXT, `name` TEXT, `administration_mode` TEXT, `presentation` TEXT, `stock` REAL, `take` REAL, `warning` INTEGER, `alert` INTEGER, `last_update` INTEGER, PRIMARY KEY(`cis`))",
         "fields": [
           {
@@ -82,7 +82,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ed6d0a13273d73ba9fcec1f374251efa')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '46c4983931eaf7414e25dfd9e1a55e0f')"
     ]
   }
 }
\ No newline at end of file