diff --git a/CU2/common.inc b/CU2/common.inc
index ae59759..b45276a 100644
--- a/CU2/common.inc
+++ b/CU2/common.inc
@@ -1,12 +1,13 @@
 
-DNSCRYPT_BASE_DIR='/Library/Application Support/DNSCrypt'
+DNSCRYPT_USR_BASE_DIR='/Library/PreferencePanes/DNSCrypt.prefPane/Contents/Resources/usr'
+DNSCRYPT_VAR_BASE_DIR='/Library/Application Support/DNSCrypt'
 
-cd -- "${DNSCRYPT_BASE_DIR}/scripts" || exit 1
+cd -- "${DNSCRYPT_USR_BASE_DIR}/scripts" || exit 1
 
-CONTROL_DIR="${DNSCRYPT_BASE_DIR}/control"
-DNSCRYPT_PROXY_BASE_DIR="${DNSCRYPT_BASE_DIR}/dnscrypt-proxy"
-PROXY_PID_FILE="${DNSCRYPT_PROXY_BASE_DIR}/dnscrypt-proxy.pid"
-STATES_DIR="${DNSCRYPT_BASE_DIR}/states"
+CONTROL_DIR="${DNSCRYPT_VAR_BASE_DIR}/control"
+DNSCRYPT_PROXY_BASE_DIR="${DNSCRYPT_VAR_BASE_DIR}/dnscrypt-proxy"
+PROXY_PID_FILE="${DNSCRYPT_PROXY_VAR_BASE_DIR}/dnscrypt-proxy.pid"
+STATES_DIR="${DNSCRYPT_VAR_BASE_DIR}/states"
 
 DNSCRYPT_FILE="${CONTROL_DIR}/dnscrypt"
 
@@ -17,7 +18,7 @@ INTERFACE_PROXY_MASK="24"
 INTERFACE_PROBES="127.0.0.55"
 INTERFACE_PROBES_MASK="24"
 
-export PATH="${DNSCRYPT_BASE_DIR}/bin:${DNSCRYPT_BASE_DIR}/scripts:$PATH"
+export PATH="${DNSCRYPT_USR_BASE_DIR}/bin:${DNSCRYPT_USR_BASE_DIR}/scripts:$PATH"
 
 init_interfaces() {
   sudo ifconfig lo0 alias ${INTERFACE_UNBOUND}/${INTERFACE_UNBOUND_MASK}
diff --git a/CU2/handle-console-change.sh b/CU2/handle-console-change.sh
index db72c30..7752f28 100755
--- a/CU2/handle-console-change.sh
+++ b/CU2/handle-console-change.sh
@@ -4,11 +4,11 @@
 
 eval $(stat -s '/dev/console') || exit 1
 wanted_uid="$st_uid"
-if [ ! -d "$DNSCRYPT_BASE_DIR" ]; then
-  mkdir -p "$DNSCRYPT_BASE_DIR" || exit 1
-  chown -R 0:0 "$DNSCRYPT_BASE_DIR"
+if [ ! -d "$DNSCRYPT_VAR_BASE_DIR" ]; then
+  mkdir -p "$DNSCRYPT_VAR_BASE_DIR" || exit 1
+  chown -R 0:0 "$DNSCRYPT_VAR_BASE_DIR"
 fi
 eval $(stat -s "$CONTROL_DIR") || exit 1
 [ "$st_uid" = "$wanted_uid" ] && exit 0
 chown -R "${wanted_uid}:0" "$CONTROL_DIR"
-find "$DNSCRYPT_BASE_DIR" -type d -exec chmod 755 {} \;
+find "$DNSCRYPT_VAR_BASE_DIR" -type d -exec chmod 755 {} \;
diff --git a/CU2/start-dnscrypt-proxy.sh b/CU2/start-dnscrypt-proxy.sh
index 6f60609..a5ea13e 100755
--- a/CU2/start-dnscrypt-proxy.sh
+++ b/CU2/start-dnscrypt-proxy.sh
@@ -6,19 +6,19 @@ FAMILYSHIELD_FILE="${CONTROL_DIR}/familyshield"
 
 init_interfaces
 
-mkdir -p -- "$DNSCRYPT_BASE_DIR" || exit 1
+mkdir -p -- "$DNSCRYPT_VAR_BASE_DIR" || exit 1
 
-PROBES_BASE_DIR='/var/run/dnscrypt/probes'
+PROBES_BASE_DIR='${DNSCRYPT_VAR_BASE_DIR}/probes'
 rm -fr $PROBES_BASE_DIR || exit 1
-mkdir -p -- "$PROBES_BASE_DIR" || exit 1
+mkdir -p -- "$PROBES_VAR_BASE_DIR" || exit 1
 
-RES_DIR="${PROBES_BASE_DIR}/results" || exit 1
+RES_DIR="${PROBES_VAR_BASE_DIR}/results" || exit 1
 mkdir -p -- "$RES_DIR" || exit 1
 
-PID_DIR="${PROBES_BASE_DIR}/pids" || exit 1
+PID_DIR="${PROBES_VAR_BASE_DIR}/pids" || exit 1
 mkdir -p -- "$PID_DIR" || exit 1
 
-mkdir -p -- "$DNSCRYPT_PROXY_BASE_DIR" || exit 1
+mkdir -p -- "$DNSCRYPT_PROXY_VAR_BASE_DIR" || exit 1
 
 try_resolver() {
   local priority="$1"