--- nxloadconfig.old	2005-02-14 01:08:56.482546352 +0100
+++ nxloadconfig	2005-02-14 01:09:40.109913984 +0100
@@ -56,12 +56,12 @@
 NX_LICENSE="OS (GPL)"
 
 # Where can different nx components be found
-NX_DIR=/usr
+NX_DIR=/usr/NX
 PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
 PATH_LIB=$NX_DIR/lib
-NX_ETC_DIR=/etc/nxserver
-NX_SESS_DIR=/var/lib/nxserver/db
-NX_HOME_DIR=/var/lib/nxserver/home
+NX_ETC_DIR=$NX_DIR/etc
+NX_SESS_DIR=$NX_DIR/var/db
+NX_HOME_DIR=$NX_DIR/home/nx
 
 # Advanced users ONLY
 AGENT_LIBRARY_PATH="" #Calculated