diff --git a/config/config.properties b/config/config.properties
index f09f7ec..c7c404b 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,4 +1,4 @@
-#Wed Jul 29 14:45:52 CEST 2015
+#Tue Aug 18 10:28:55 CEST 2015
 autoSaveScanData=true
 createSessionFiles=false
 dataFilesCreation=true
@@ -12,6 +12,7 @@ imageSourcesFile={config}/imaging.properties
 logDaysToLive=-1
 logLevel=Fine
 logLevelConsole=Off
+logPath={logs}/{date}_{time}
 scriptType=py
 serverEnabled=true
 serverPort=8085
diff --git a/config/devices.properties b/config/devices.properties
index 3ddbf1d..81b6793 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -11,10 +11,10 @@ scintillatorY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY3
 scintillatorZ=ch.psi.pshell.epics.Positionable X10SA-ES-SCINTI:SET-FOCUS X10SA-ES-SCINTI:GET-FOCUS
 detectorZ=ch.psi.pshell.epics.Motor X10SA-ES-D:TRZ1
 detectorY=ch.psi.pshell.epics.Motor X10SA-ES-D:TRY1
-apertureTable=ch.psi.pshell.dev.MotorGroupBase apertureX apertureY
-beamstopTable=ch.psi.pshell.dev.MotorGroupBase beamstopX beamstopY beamstopZ
-collimatorTable=ch.psi.pshell.dev.MotorGroupBase collimatorX collimatorY
-collimator=ch.psi.pshell.dev.MotorGroupDiscretePositioner collimatorTable
+apertureTable=ch.psi.pshell.device.MotorGroupBase apertureX apertureY
+beamstopTable=ch.psi.pshell.device.MotorGroupBase beamstopX beamstopY beamstopZ
+collimatorTable=ch.psi.pshell.device.MotorGroupBase collimatorX collimatorY
+collimator=ch.psi.pshell.device.MotorGroupDiscretePositioner collimatorTable
 #scintillator=ch.psi.pshell.epics.Manipulator 
 slit1H=ch.psi.pshell.epics.Slit X10SA-OP-SH1:TRX2 X10SA-OP-SH1:TRX1
 slit1V=ch.psi.pshell.epics.Slit X10SA-OP-SV1:TRY1 X10SA-OP-SV1:TRY2
diff --git a/config/devices.properties~ b/config/devices.properties~
new file mode 100644
index 0000000..3ddbf1d
--- /dev/null
+++ b/config/devices.properties~
@@ -0,0 +1,22 @@
+diode=ch.psi.pshell.epics.ChannelDouble X10SA-ES-KBOX_K:READOUT Read 6
+shutter=ch.psi.pshell.epics.ChannelInteger X10SA-ES-PH1:SET
+apertureX=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRX1
+apertureY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY1
+beamstopX=ch.psi.pshell.epics.Motor X10SA-ES-BS:TRX1
+beamstopY=ch.psi.pshell.epics.Motor X10SA-ES-BS:TRY1
+beamstopZ=ch.psi.pshell.epics.Motor X10SA-ES-BS:TRZ1
+collimatorX=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRX2
+collimatorY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY2
+scintillatorY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY3
+scintillatorZ=ch.psi.pshell.epics.Positionable X10SA-ES-SCINTI:SET-FOCUS X10SA-ES-SCINTI:GET-FOCUS
+detectorZ=ch.psi.pshell.epics.Motor X10SA-ES-D:TRZ1
+detectorY=ch.psi.pshell.epics.Motor X10SA-ES-D:TRY1
+apertureTable=ch.psi.pshell.dev.MotorGroupBase apertureX apertureY
+beamstopTable=ch.psi.pshell.dev.MotorGroupBase beamstopX beamstopY beamstopZ
+collimatorTable=ch.psi.pshell.dev.MotorGroupBase collimatorX collimatorY
+collimator=ch.psi.pshell.dev.MotorGroupDiscretePositioner collimatorTable
+#scintillator=ch.psi.pshell.epics.Manipulator 
+slit1H=ch.psi.pshell.epics.Slit X10SA-OP-SH1:TRX2 X10SA-OP-SH1:TRX1
+slit1V=ch.psi.pshell.epics.Slit X10SA-OP-SV1:TRY1 X10SA-OP-SV1:TRY2
+slit2H=ch.psi.pshell.epics.Slit X10SA-OP-SH2:TRX2 X10SA-OP-SH2:TRX1
+slit2V=ch.psi.pshell.epics.Slit X10SA-OP-SV2:TRY1 X10SA-OP-SV2:TRY2