diff --git a/db/0.services.ddl.sql b/db/0.services.ddl.sql
index 502c5a0..8c5ac7d 100644
--- a/db/0.services.ddl.sql
+++ b/db/0.services.ddl.sql
@@ -1,44 +1,26 @@
 CREATE TABLE IF NOT EXISTS users (
     id SERIAL PRIMARY KEY,
-    Email VARCHAR(255) UNIQUE NOT NULL,
-    firstname VARCHAR(100) NOT NULL,
-    surname VARCHAR(100) NOT NULL,
+    username VARCHAR(255) UNIQUE NOT NULL,
+    password VARCHAR(255) NOT NULL,
+    email VARCHAR(255) UNIQUE NULL,
+    firstname VARCHAR(100) NULL,
+    surname VARCHAR(100) NULL,
     avatar VARCHAR(100) NULL,
     active INT NOT NULL
 );
 
-CREATE TABLE IF NOT EXISTS profiles
+CREATE TABLE IF NOT EXISTS roles
 (
     id SERIAL PRIMARY KEY,
     name VARCHAR(100) NOT NULL,
     active INT NOT NULL
 );
 
-CREATE TABLE IF NOT EXISTS usersprofiles
+CREATE TABLE IF NOT EXISTS users_roles
 (
-    id SERIAL PRIMARY KEY,
-    idusers INT NOT NULL,
-    idprofiles INT NOT NULL,
-    active INT NOT NULL,
-    FOREIGN KEY (idusers) REFERENCES users (id),
-    FOREIGN KEY (idprofiles) REFERENCES profiles (id)
-);
-
-CREATE TABLE IF NOT EXISTS permissions
-(
-    id SERIAL PRIMARY KEY,
-    name VARCHAR(100) NOT NULL,
-    active INT NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS profilespermissions
-(
-    id SERIAL PRIMARY KEY,
-    idprofiles INT NOT NULL,
-    idpermissions INT NOT NULL,
-    active INT NOT NULL,
-    FOREIGN KEY (idprofiles) REFERENCES profiles (id),
-    FOREIGN KEY (idpermissions) REFERENCES permissions (id)
+    users_id INT NOT NULL,
+    roles INT NOT NULL,
+    FOREIGN KEY (users_id) REFERENCES users (id)
 );
 
 CREATE TABLE IF NOT EXISTS formsorigins
diff --git a/db/create_config_tables.sql b/db/2.wp6.create_config_tables.sql
similarity index 99%
rename from db/create_config_tables.sql
rename to db/2.wp6.create_config_tables.sql
index 10cb2f3..dceb77b 100644
--- a/db/create_config_tables.sql
+++ b/db/2.wp6.create_config_tables.sql
@@ -1,7 +1,7 @@
 DO $$
 DECLARE
 --id fields
-idfieldsituationcode  bigint;
+idfieldsituationcode bigint;
 idfieldslatitude bigint;
 idfieldslongitude bigint;
 idfieldsaddress bigint;
@@ -277,4 +277,4 @@ BEGIN
     INSERT INTO formsfields(id, idforms, idfields, active) 
       VALUES (DEFAULT, idpluvregsform, idfieldsinsname, 1);  
 --End Pluviometer Registration Form
-END $$'
+END $$;
diff --git a/db/floodzones-river-rain-api.json b/db/wp6.sample.floodzones-river-rain-api.json
similarity index 100%
rename from db/floodzones-river-rain-api.json
rename to db/wp6.sample.floodzones-river-rain-api.json
diff --git a/db/forms-fields-answers.json b/db/wp6.sample.forms-fields-answers.json
similarity index 100%
rename from db/forms-fields-answers.json
rename to db/wp6.sample.forms-fields-answers.json
diff --git a/db/pluviometer-api.json b/db/wp6.sample.pluviometer-api.json
similarity index 100%
rename from db/pluviometer-api.json
rename to db/wp6.sample.pluviometer-api.json
diff --git a/db/pluviometer-forms-api.json b/db/wp6.sample.pluviometer-forms-api.json
similarity index 100%
rename from db/pluviometer-forms-api.json
rename to db/wp6.sample.pluviometer-forms-api.json
diff --git a/db/pluviometer-modal-api.json b/db/wp6.sample.pluviometer-modal-api.json
similarity index 100%
rename from db/pluviometer-modal-api.json
rename to db/wp6.sample.pluviometer-modal-api.json
diff --git a/db/pluviometer-register-api.json b/db/wp6.sample.pluviometer-register-api.json
similarity index 100%
rename from db/pluviometer-register-api.json
rename to db/wp6.sample.pluviometer-register-api.json