diff --git a/matrix/config/element/element-config.json b/config/element/element-config.json
similarity index 100%
rename from matrix/config/element/element-config.json
rename to config/element/element-config.json
diff --git a/matrix/config/turnserver.conf b/config/turnserver.conf
similarity index 100%
rename from matrix/config/turnserver.conf
rename to config/turnserver.conf
diff --git a/matrix/coturn.service b/coturn.service
similarity index 100%
rename from matrix/coturn.service
rename to coturn.service
diff --git a/matrix/docker-compose.yaml b/docker-compose.yaml
similarity index 100%
rename from matrix/docker-compose.yaml
rename to docker-compose.yaml
diff --git a/matrix/homeserver.yaml.db b/homeserver.yaml.db
similarity index 100%
rename from matrix/homeserver.yaml.db
rename to homeserver.yaml.db
diff --git a/matrix/install.sh b/install.sh
similarity index 98%
rename from matrix/install.sh
rename to install.sh
index 40edaa2..9cb357f 100755
--- a/matrix/install.sh
+++ b/install.sh
@@ -11,7 +11,7 @@ fi
 BASE_DIR=/opt/matrix
 
 # Create directory and copy configs + docker-compose YAML
-mkdir -p ${BASE_DIR}
+mkdir -p ${BASE_DIR}/db
 cp -R . ${BASE_DIR}
 cd ${BASE_DIR}
 
@@ -116,7 +116,7 @@ EOF
 PG_PASS=$(pwgen -s 28 -1)
 
 # Replace Password in homeserver.yaml
-sed -i "s|PG_PASS|\"${PG_PASS}\"|g" "${BASE_DIR}/config/synapse/homeserver.yaml"
+sed -i "s|PG_PASS|${PG_PASS}|g" "${BASE_DIR}/config/synapse/homeserver.yaml"
 
 # Replace PG_PASS Password and DOMAIN in docker compose YAML
 sed -i "s|DOMAIN|${DOMAIN}|g" "${BASE_DIR}/docker-compose.yaml"
diff --git a/matrix/matrix.service b/matrix.service
similarity index 100%
rename from matrix/matrix.service
rename to matrix.service