diff --git a/BashScripts/install-openvpn-server.sh b/BashScripts/install-openvpn-server.sh
index 8827c55..9972c69 100644
--- a/BashScripts/install-openvpn-server.sh
+++ b/BashScripts/install-openvpn-server.sh
@@ -61,7 +61,7 @@ if ufw status | grep -q "Status: active"; then
 	systemctl restart ufw
 fi
 
-if [ ! -f /etc/openvpn/myserver.conf ] || [[ " $@ " == *" --force "* ]]; then
+if [ ! -f /etc/openvpn/server/myserver.conf ] || [[ " $@ " == *" --force "* ]]; then
 	read -n 1 -p "Do you want to use username and password for login (y/N)? " answer
 	if [[ ! -z "$answer" && "${answer^^}"=="Y" ]]; then
 		EXTRA_CONFIG=$(cat <<-END
@@ -74,16 +74,16 @@ END
 )
 	fi
 
-	tee /etc/openvpn/myserver.conf > /dev/null <<EOL
+	tee /etc/openvpn/server/myserver.conf > /dev/null <<EOL
 #public-host $VPN_PUBLIC_HOST
 port $VPN_PUBLIC_PORT
 proto udp
 dev tun
 
-ca ca.crt
-cert myservername.crt
-key myservername.key
-dh dh.pem
+ca ../ca.crt
+cert ../myservername.crt
+key ../myservername.key
+dh ../dh.pem
 
 server $VPN_SUBNET.0 255.255.255.0 nopool
 ifconfig-pool-persist /var/log/openvpn/ipp.txt
@@ -95,7 +95,7 @@ push "route $LAN_SUBNET.0 255.255.255.0"
 $EXTRA_CONFIG
 
 keepalive 10 120
-tls-auth ta.key 0
+tls-auth ../ta.key 0
 cipher AES-256-CBC
 persist-key
 persist-tun
@@ -134,16 +134,16 @@ for i in {1..255}; do
 		break
 	fi
 done
-VPN_SUBNET=$(grep -E '^server ' "/etc/openvpn/myserver.conf" | awk '{print $2}')
-VPN_PUBLIC_HOST=$(grep -E '^#public-host ' "/etc/openvpn/myserver.conf" | awk '{print $2}')
-VPN_PUBLIC_PORT=$(grep -E '^port ' "/etc/openvpn/myserver.conf" | awk '{print $2}')
+VPN_SUBNET=$(grep -E '^server ' "/etc/openvpn/server/myserver.conf" | awk '{print $2}')
+VPN_PUBLIC_HOST=$(grep -E '^#public-host ' "/etc/openvpn/server/myserver.conf" | awk '{print $2}')
+VPN_PUBLIC_PORT=$(grep -E '^port ' "/etc/openvpn/server/myserver.conf" | awk '{print $2}')
 echo "Adding VPN client to $VPN_PUBLIC_HOST:$VPN_PUBLIC_PORT"
 read -e -p "Enter client name: " -i "$CLIENT_NAME" CLIENT_NAME
 if [ -f "/etc/openvpn/easy-rsa/pki/issued/$CLIENT_NAME.crt" ]; then
 	echo Client $CLIENT_NAME already exists...
 	exit 1
 fi
-if grep -q "^auth-user-pass-verify" "/etc/openvpn/myserver.conf"; then
+if grep -q "^auth-user-pass-verify" "/etc/openvpn/server/myserver.conf"; then
 	read -e -p "Enter username: " -i "$CLIENT_NAME" CLIENT_USERNAME
 	if grep -i -q "^$CLIENT_USERNAME" "/etc/openvpn/credentials"; then
 		echo "Username $CLIENT_USERNAME already exists"