--- /etc/profile.d/ccp4.setup.sh.orig	2009-08-15 11:39:02.000000000 -0700
+++ /etc/profile.d/ccp4.setup.sh	2009-08-15 11:44:09.000000000 -0700
@@ -228,9 +228,9 @@
 #Python path for the subprocess fixed module
 
 if test $ccp4_first_in_path -eq 1; then
-    export PYTHONPATH=${CCP4}/share/python:${PYTHONPATH}
+    export PYTHONPATH=${CCP4}/share/ccp4/smartie:${PYTHONPATH}
 else
-    export PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python
+    export PYTHONPATH=${PYTHONPATH}:${CCP4}/share/ccp4/smartie
 fi
 
 ################### THE REST SHOULDN'T NEED EDITING #####################
@@ -253,7 +253,7 @@
 ### MOLREPLIB Point to the location of the files bs-zeros.dat  ps.resource  symlib.blc
 # They are distributed with CCP4 in $CLIBD. This env must have the trailing \ or /
 
-export MOLREPLIB=$CCP4/lib/data/monomers/
+export MOLREPLIB=$CCP4/share/ccp4/data/monomers/
 
 ### CRANK points to location of Crank automation suite within ccp4i
 
@@ -263,9 +263,9 @@
 ### XIA2 setup
 # XIAROOT directory (default is under the share folder)
 
-if test -e $CCP4/share/XIAROOT/setup.sh
+if test -e $CCP4/share/ccp4/XIAROOT/setup.sh
 then
-. $CCP4/share/XIAROOT/setup.sh
+. $CCP4/share/ccp4/XIAROOT/setup.sh
 fi
 
 # Note: The PATH is updated with the xia2 Applications directory in the 
@@ -283,7 +283,7 @@
 # They are distributed with CCP4 in $CLIBD/monomers. This env must have 
 # the trailing \ or /
 
-export CLIBD_MON=$CCP4/lib/data/monomers/
+export CLIBD_MON=$CCP4/share/ccp4/data/monomers/
 
 ### PUBLIC_FONT84, CCP4_HELPDIR, HELPDIR, MOSHELPFILE ###
 # (essential for the relevant programs)
@@ -323,7 +323,7 @@
   export CETC=$CCP4/etc
   export CEXAM=$CCP4/examples
   export CINCL=$CCP4/share/ccp4/include
-  export CLIBD=$CCP4/lib/data
+  export CLIBD=$CCP4/share/ccp4/data
   export CLIBS=$CCP4/lib/src
   export CPROG=$CCP4/src