diff --git a/debian/dirs b/debian/dirs
index 4ca46ac5d..b83fd9e89 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,9 +1,13 @@
-var/lib/cgrates/cache_dump
 var/log/cgrates
 var/spool/cgrates/analyzers
-var/spool/cgrates/cdre/csv
-var/spool/cgrates/cdre/fwv
+var/spool/cgrates/ees
 var/spool/cgrates/ers/in
 var/spool/cgrates/ers/out
 var/spool/cgrates/failed_posts
+var/spool/cgrates/loader/in
+var/spool/cgrates/loader/out
 var/spool/cgrates/tpe
+var/lib/cgrates/internal_db/datadb
+var/lib/cgrates/internal_db/backup/datadb
+var/lib/cgrates/internal_db/stordb
+var/lib/cgrates/internal_db/backup/stordb
\ No newline at end of file
diff --git a/debian/postinst b/debian/postinst
index 60f420436..14df524ed 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -29,12 +29,18 @@ case "$1" in
 	configure)
 		adduser --quiet --system --group --disabled-password --shell /bin/false --home /run/cgrates --gecos "CGRateS" cgrates || true
 		chown cgrates:cgrates /var/lib/cgrates/
-		chown cgrates:cgrates /var/lib/cgrates/cache_dump/
+		chown cgrates:cgrates /var/lib/cgrates/internal_db/
+		chown cgrates:cgrates /var/lib/cgrates/internal_db/datadb/
+		chown cgrates:cgrates /var/lib/cgrates/internal_db/backup/
+		chown cgrates:cgrates /var/lib/cgrates/internal_db/backup/datadb/
+		chown cgrates:cgrates /var/lib/cgrates/internal_db/stordb/
+		chown cgrates:cgrates /var/lib/cgrates/internal_db/backup/stordb/
 		chown cgrates:cgrates /var/spool/cgrates/
 		chown cgrates:cgrates /var/spool/cgrates/analyzers/
-		chown cgrates:cgrates /var/spool/cgrates/cdre/
-		chown cgrates:cgrates /var/spool/cgrates/cdre/csv/
-		chown cgrates:cgrates /var/spool/cgrates/cdre/fwv/
+		chown cgrates:cgrates /var/spool/cgrates/ees/
+		chown cgrates:cgrates /var/spool/cgrates/loader/
+		chown cgrates:cgrates /var/spool/cgrates/loader/in/
+		chown cgrates:cgrates /var/spool/cgrates/loader/out/
 		chown cgrates:cgrates /var/spool/cgrates/ers/
 		chown cgrates:cgrates /var/spool/cgrates/ers/in/
 		chown cgrates:cgrates /var/spool/cgrates/ers/out/
diff --git a/packages/copr.fedorainfracloud.org/cgrates.spec b/packages/copr.fedorainfracloud.org/cgrates.spec
index 8ae1bd594..eac72f9ae 100644
--- a/packages/copr.fedorainfracloud.org/cgrates.spec
+++ b/packages/copr.fedorainfracloud.org/cgrates.spec
@@ -71,13 +71,18 @@ install -D -m 0755 -p go/bin/cgr-engine %{buildroot}%{_bindir}/cgr-engine
 install -D -m 0755 -p go/bin/cgr-loader %{buildroot}%{_bindir}/cgr-loader
 install -D -m 0755 -p go/bin/cgr-tester %{buildroot}%{_bindir}/cgr-tester
 install -D -m 0755 -p go/bin/cgr-migrator %{buildroot}%{_bindir}/cgr-migrator
-mkdir -p %{buildroot}%{_logdir}/cdre/csv
-mkdir -p %{buildroot}%{_logdir}/cdre/fwv
-mkdir -p %{buildroot}%{_spooldir}/cdre/csv
-mkdir -p %{buildroot}%{_spooldir}/cdre/fwv
-mkdir -p %{buildroot}%{_spooldir}/tpe
+mkdir -p %{buildroot}%{_spooldir}/analyzers
+mkdir -p %{buildroot}%{_spooldir}/ees
+mkdir -p %{buildroot}%{_spooldir}/ers/in
+mkdir -p %{buildroot}%{_spooldir}/ers/out
 mkdir -p %{buildroot}%{_spooldir}/failed_posts
-mkdir -p %{buildroot}%{_libdir}/cache_dump
+mkdir -p %{buildroot}%{_spooldir}/loader/in
+mkdir -p %{buildroot}%{_spooldir}/loader/out
+mkdir -p %{buildroot}%{_spooldir}/tpe
+mkdir -p %{buildroot}%{_libdir}/internal_db/datadb
+mkdir -p %{buildroot}%{_libdir}/internal_db/backup/datadb
+mkdir -p %{buildroot}%{_libdir}/internal_db/stordb
+mkdir -p %{buildroot}%{_libdir}/internal_db/backup/stordb
 mkdir -p %{buildroot}/etc/logrotate.d
 mkdir -p %{buildroot}/etc/rsyslog.d
 install -m 0644 src/github.com/cgrates/cgrates/data/conf/logging/logrotate.conf %{buildroot}/etc/logrotate.d/%{name}
diff --git a/packages/redhat_fedora/cgrates.spec b/packages/redhat_fedora/cgrates.spec
index 7729ac834..b055c6104 100644
--- a/packages/redhat_fedora/cgrates.spec
+++ b/packages/redhat_fedora/cgrates.spec
@@ -72,13 +72,18 @@ install -D -m 0755 -p bin/cgr-engine %{buildroot}%{_bindir}/cgr-engine
 install -D -m 0755 -p bin/cgr-loader %{buildroot}%{_bindir}/cgr-loader
 install -D -m 0755 -p bin/cgr-tester %{buildroot}%{_bindir}/cgr-tester
 install -D -m 0755 -p bin/cgr-migrator %{buildroot}%{_bindir}/cgr-migrator
-mkdir -p %{buildroot}%{_logdir}/cdre/csv
-mkdir -p %{buildroot}%{_logdir}/cdre/fwv
-mkdir -p %{buildroot}%{_spooldir}/cdre/csv
-mkdir -p %{buildroot}%{_spooldir}/cdre/fwv
-mkdir -p %{buildroot}%{_spooldir}/tpe
+mkdir -p %{buildroot}%{_spooldir}/analyzers
+mkdir -p %{buildroot}%{_spooldir}/ees
+mkdir -p %{buildroot}%{_spooldir}/ers/in
+mkdir -p %{buildroot}%{_spooldir}/ers/out
 mkdir -p %{buildroot}%{_spooldir}/failed_posts
-mkdir -p %{buildroot}%{_libdir}/cache_dump
+mkdir -p %{buildroot}%{_spooldir}/loader/in
+mkdir -p %{buildroot}%{_spooldir}/loader/out
+mkdir -p %{buildroot}%{_spooldir}/tpe
+mkdir -p %{buildroot}%{_libdir}/internal_db/datadb
+mkdir -p %{buildroot}%{_libdir}/internal_db/backup/datadb
+mkdir -p %{buildroot}%{_libdir}/internal_db/stordb
+mkdir -p %{buildroot}%{_libdir}/internal_db/backup/stordb
 mkdir -p %{buildroot}/etc/logrotate.d
 mkdir -p %{buildroot}/etc/rsyslog.d
 install -m 0644 src/github.com/cgrates/cgrates/data/conf/logging/logrotate.conf %{buildroot}/etc/logrotate.d/%{name}