diff --git a/site_ansto/instrument/dingo/camtest_configuration.tcl b/site_ansto/instrument/dingo/camtest_configuration.tcl
index d7619acc..2167cc08 100644
--- a/site_ansto/instrument/dingo/camtest_configuration.tcl
+++ b/site_ansto/instrument/dingo/camtest_configuration.tcl
@@ -24,54 +24,18 @@ Instrument bare_dingo
 Instrument lock
 
 #START SERVER CONFIGURATION SECTION
+source util/dmc2280/dmc2280_util.tcl
 source sics_ports.tcl
-
 source server_config.tcl
-
-set sicsroot ../
-source util/utility.tcl
-ServerOption LogFileBaseName $sicsroot/log/serverlog
-
-###### installprotocolhandler
-
-ServerOption statusfile $sicsroot/log/status.tcl
-ServerOption RedirectFile $sicsroot/log/stdout
-ServerOption LogFileDir $sicsroot/log
-ServerOption QuieckPort [get_portnum $quieckport ]
-ServerOption ServerPort [get_portnum $serverport ]
-ServerOption InterruptPort [get_portnum $interruptport ]
-ServerOption TelWord sicslogin
-ServerOption TelnetPort [get_portnum $telnetport ]
-ServerOption ReadUserPasswdTimeout 600000
-ServerOption AcceptTimeOut 10
-ServerOption ReadTimeOut 1000
-SicsUser manager ansto 1
-SicsUser user sydney 2
-SicsUser spy 007 3
-
-Motor dummy_motor asim [params \
- asyncqueue mc1\
- host mc1-dingo\
- port pmc1-dingo\
- axis A\
- units mm\
- hardlowerlim -500\
- hardupperlim 500\
- maxSpeed 1\
- maxAccel 5\
- maxDecel 5\
- stepsPerX [expr 25000.0/5.0]\
- absEnc 1\
- absEncHome 0\
- cntsPerX [expr 8192.0/5.0]]
-dummy_motor part instrument
-dummy_motor long_name dummy_motor
-dummy_motor softlowerlim -500
-dummy_motor softupperlim 500
-dummy_motor home 0
-
-
 MakeDrive
+#END SERVER CONFIGURATION SECTION
+
+########################################
+# INSTRUMENT SPECIFIC CONFIGURATION
+fileeval $cfPath(source)/source.tcl
+fileeval $cfPath(plc)/plc.tcl
+fileeval $cfPath(motors)/motor_configuration.tcl
+
 #MakeAsyncQueue cmserver CAMERA localhost 63300
 MakeAsyncQueue cmserver CAMERA [dict get $::CAMERA_HOSTPORT HOST] [dict get $::CAMERA_HOSTPORT PORT]
 #MakeAsyncQueue cmserver CAMERA 137.157.204.193 33000
@@ -81,6 +45,7 @@ MakeAsyncQueue cmserver CAMERA [dict get $::CAMERA_HOSTPORT HOST] [dict get $::C
 MakeCounter cm1 anstocamera cmserver
 MakeScanCommand iscan cm1 dingo.hdd recover.bin
 foreach {n v} {
+  debug            0
   clock            1
   bin              1
   size             2048