diff --git a/rootfs/usr/local/etc/docker/init.d/01-tor-server.sh b/rootfs/usr/local/etc/docker/init.d/01-tor-server.sh
index eb139f6..692d4d3 100755
--- a/rootfs/usr/local/etc/docker/init.d/01-tor-server.sh
+++ b/rootfs/usr/local/etc/docker/init.d/01-tor-server.sh
@@ -65,11 +65,11 @@ RESET_ENV="yes"
 WWW_ROOT_DIR="/usr/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default predefined variables
-DATA_DIR="/data/tor"   # set data directory
-CONF_DIR="/config/tor" # set config directory
+DATA_DIR="/data/tor"          # set data directory
+CONF_DIR="/config/tor/server" # set config directory
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # set the containers etc directory
-ETC_DIR="/etc/tor"
+ETC_DIR="/etc/tor/server"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # set the var dir
 VAR_DIR=""
diff --git a/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh b/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh
index 0c99521..3c1c977 100755
--- a/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh
+++ b/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh
@@ -65,11 +65,11 @@ RESET_ENV="yes"
 WWW_ROOT_DIR="/usr/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default predefined variables
-DATA_DIR="/data/tor"   # set data directory
-CONF_DIR="/config/tor" # set config directory
+DATA_DIR="/data/tor"         # set data directory
+CONF_DIR="/config/tor/relay" # set config directory
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # set the containers etc directory
-ETC_DIR="/etc/tor"
+ETC_DIR="/etc/tor/relay"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # set the var dir
 VAR_DIR=""
diff --git a/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh b/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh
index 1aa58da..c4ac2f5 100755
--- a/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh
+++ b/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh
@@ -65,11 +65,11 @@ RESET_ENV="yes"
 WWW_ROOT_DIR="/usr/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default predefined variables
-DATA_DIR="/data/tor"   # set data directory
-CONF_DIR="/config/tor" # set config directory
+DATA_DIR="/data/tor"          # set data directory
+CONF_DIR="/config/tor/bridge" # set config directory
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # set the containers etc directory
-ETC_DIR="/etc/tor"
+ETC_DIR="/etc/tor/bridge"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # set the var dir
 VAR_DIR=""
diff --git a/rootfs/usr/local/etc/docker/init.d/04-tor-hidden.sh b/rootfs/usr/local/etc/docker/init.d/04-tor-hidden.sh
index 61ec949..6248169 100755
--- a/rootfs/usr/local/etc/docker/init.d/04-tor-hidden.sh
+++ b/rootfs/usr/local/etc/docker/init.d/04-tor-hidden.sh
@@ -65,11 +65,11 @@ RESET_ENV="yes"
 WWW_ROOT_DIR="/usr/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default predefined variables
-DATA_DIR="/data/tor"   # set data directory
-CONF_DIR="/config/tor" # set config directory
+DATA_DIR="/data/tor"          # set data directory
+CONF_DIR="/config/tor/hidden" # set config directory
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # set the containers etc directory
-ETC_DIR="/etc/tor"
+ETC_DIR="/etc/tor/hidden"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # set the var dir
 VAR_DIR=""