diff --git a/ADApp/Db/ADBase.template b/andorApp/Db/ADBase.template similarity index 100% rename from ADApp/Db/ADBase.template rename to andorApp/Db/ADBase.template diff --git a/ADApp/Db/ADBase_settings.req b/andorApp/Db/ADBase_settings.req similarity index 100% rename from ADApp/Db/ADBase_settings.req rename to andorApp/Db/ADBase_settings.req diff --git a/ADApp/Db/ADPrefixes.template b/andorApp/Db/ADPrefixes.template similarity index 100% rename from ADApp/Db/ADPrefixes.template rename to andorApp/Db/ADPrefixes.template diff --git a/ADApp/Db/BIS.template b/andorApp/Db/BIS.template similarity index 100% rename from ADApp/Db/BIS.template rename to andorApp/Db/BIS.template diff --git a/ADApp/Db/BIS_settings.req b/andorApp/Db/BIS_settings.req similarity index 100% rename from ADApp/Db/BIS_settings.req rename to andorApp/Db/BIS_settings.req diff --git a/ADApp/Db/LightField.template b/andorApp/Db/LightField.template similarity index 100% rename from ADApp/Db/LightField.template rename to andorApp/Db/LightField.template diff --git a/ADApp/Db/LightField_settings.req b/andorApp/Db/LightField_settings.req similarity index 100% rename from ADApp/Db/LightField_settings.req rename to andorApp/Db/LightField_settings.req diff --git a/ADApp/Db/Makefile b/andorApp/Db/Makefile similarity index 100% rename from ADApp/Db/Makefile rename to andorApp/Db/Makefile diff --git a/ADApp/Db/NDColorConvert.template b/andorApp/Db/NDColorConvert.template similarity index 100% rename from ADApp/Db/NDColorConvert.template rename to andorApp/Db/NDColorConvert.template diff --git a/ADApp/Db/NDColorConvert_settings.req b/andorApp/Db/NDColorConvert_settings.req similarity index 100% rename from ADApp/Db/NDColorConvert_settings.req rename to andorApp/Db/NDColorConvert_settings.req diff --git a/ADApp/Db/NDFile.template b/andorApp/Db/NDFile.template similarity index 100% rename from ADApp/Db/NDFile.template rename to andorApp/Db/NDFile.template diff --git a/ADApp/Db/NDFileHDF5.template b/andorApp/Db/NDFileHDF5.template similarity index 100% rename from ADApp/Db/NDFileHDF5.template rename to andorApp/Db/NDFileHDF5.template diff --git a/ADApp/Db/NDFileHDF5_settings.req b/andorApp/Db/NDFileHDF5_settings.req similarity index 100% rename from ADApp/Db/NDFileHDF5_settings.req rename to andorApp/Db/NDFileHDF5_settings.req diff --git a/ADApp/Db/NDFileJPEG.template b/andorApp/Db/NDFileJPEG.template similarity index 100% rename from ADApp/Db/NDFileJPEG.template rename to andorApp/Db/NDFileJPEG.template diff --git a/ADApp/Db/NDFileJPEG_settings.req b/andorApp/Db/NDFileJPEG_settings.req similarity index 100% rename from ADApp/Db/NDFileJPEG_settings.req rename to andorApp/Db/NDFileJPEG_settings.req diff --git a/ADApp/Db/NDFileMagick.template b/andorApp/Db/NDFileMagick.template similarity index 100% rename from ADApp/Db/NDFileMagick.template rename to andorApp/Db/NDFileMagick.template diff --git a/ADApp/Db/NDFileMagick_settings.req b/andorApp/Db/NDFileMagick_settings.req similarity index 100% rename from ADApp/Db/NDFileMagick_settings.req rename to andorApp/Db/NDFileMagick_settings.req diff --git a/ADApp/Db/NDFileNetCDF.template b/andorApp/Db/NDFileNetCDF.template similarity index 100% rename from ADApp/Db/NDFileNetCDF.template rename to andorApp/Db/NDFileNetCDF.template diff --git a/ADApp/Db/NDFileNexus.template b/andorApp/Db/NDFileNexus.template similarity index 100% rename from ADApp/Db/NDFileNexus.template rename to andorApp/Db/NDFileNexus.template diff --git a/ADApp/Db/NDFileNexus_settings.req b/andorApp/Db/NDFileNexus_settings.req similarity index 100% rename from ADApp/Db/NDFileNexus_settings.req rename to andorApp/Db/NDFileNexus_settings.req diff --git a/ADApp/Db/NDFileTIFF.template b/andorApp/Db/NDFileTIFF.template similarity index 100% rename from ADApp/Db/NDFileTIFF.template rename to andorApp/Db/NDFileTIFF.template diff --git a/ADApp/Db/NDFile_settings.req b/andorApp/Db/NDFile_settings.req similarity index 100% rename from ADApp/Db/NDFile_settings.req rename to andorApp/Db/NDFile_settings.req diff --git a/ADApp/Db/NDOverlay.template b/andorApp/Db/NDOverlay.template similarity index 100% rename from ADApp/Db/NDOverlay.template rename to andorApp/Db/NDOverlay.template diff --git a/ADApp/Db/NDOverlayN.template b/andorApp/Db/NDOverlayN.template similarity index 100% rename from ADApp/Db/NDOverlayN.template rename to andorApp/Db/NDOverlayN.template diff --git a/ADApp/Db/NDOverlayN_settings.req b/andorApp/Db/NDOverlayN_settings.req similarity index 100% rename from ADApp/Db/NDOverlayN_settings.req rename to andorApp/Db/NDOverlayN_settings.req diff --git a/ADApp/Db/NDOverlay_settings.req b/andorApp/Db/NDOverlay_settings.req similarity index 100% rename from ADApp/Db/NDOverlay_settings.req rename to andorApp/Db/NDOverlay_settings.req diff --git a/ADApp/Db/NDPluginBase.template b/andorApp/Db/NDPluginBase.template similarity index 100% rename from ADApp/Db/NDPluginBase.template rename to andorApp/Db/NDPluginBase.template diff --git a/ADApp/Db/NDPluginBase_settings.req b/andorApp/Db/NDPluginBase_settings.req similarity index 100% rename from ADApp/Db/NDPluginBase_settings.req rename to andorApp/Db/NDPluginBase_settings.req diff --git a/ADApp/Db/NDProcess.template b/andorApp/Db/NDProcess.template similarity index 100% rename from ADApp/Db/NDProcess.template rename to andorApp/Db/NDProcess.template diff --git a/ADApp/Db/NDProcess_settings.req b/andorApp/Db/NDProcess_settings.req similarity index 100% rename from ADApp/Db/NDProcess_settings.req rename to andorApp/Db/NDProcess_settings.req diff --git a/ADApp/Db/NDROI.template b/andorApp/Db/NDROI.template similarity index 100% rename from ADApp/Db/NDROI.template rename to andorApp/Db/NDROI.template diff --git a/ADApp/Db/NDROI_settings.req b/andorApp/Db/NDROI_settings.req similarity index 100% rename from ADApp/Db/NDROI_settings.req rename to andorApp/Db/NDROI_settings.req diff --git a/ADApp/Db/NDROI_sync.template b/andorApp/Db/NDROI_sync.template similarity index 100% rename from ADApp/Db/NDROI_sync.template rename to andorApp/Db/NDROI_sync.template diff --git a/ADApp/Db/NDStats.template b/andorApp/Db/NDStats.template similarity index 100% rename from ADApp/Db/NDStats.template rename to andorApp/Db/NDStats.template diff --git a/ADApp/Db/NDStats_settings.req b/andorApp/Db/NDStats_settings.req similarity index 100% rename from ADApp/Db/NDStats_settings.req rename to andorApp/Db/NDStats_settings.req diff --git a/ADApp/Db/NDStdArrays.template b/andorApp/Db/NDStdArrays.template similarity index 100% rename from ADApp/Db/NDStdArrays.template rename to andorApp/Db/NDStdArrays.template diff --git a/ADApp/Db/NDStdArrays_settings.req b/andorApp/Db/NDStdArrays_settings.req similarity index 100% rename from ADApp/Db/NDStdArrays_settings.req rename to andorApp/Db/NDStdArrays_settings.req diff --git a/ADApp/Db/NDTransform.template b/andorApp/Db/NDTransform.template similarity index 100% rename from ADApp/Db/NDTransform.template rename to andorApp/Db/NDTransform.template diff --git a/ADApp/Db/NDTransform_settings.req b/andorApp/Db/NDTransform_settings.req similarity index 100% rename from ADApp/Db/NDTransform_settings.req rename to andorApp/Db/NDTransform_settings.req diff --git a/ADApp/Db/PSL.template b/andorApp/Db/PSL.template similarity index 100% rename from ADApp/Db/PSL.template rename to andorApp/Db/PSL.template diff --git a/ADApp/Db/PSL_settings.req b/andorApp/Db/PSL_settings.req similarity index 100% rename from ADApp/Db/PSL_settings.req rename to andorApp/Db/PSL_settings.req diff --git a/ADApp/Db/PerkinElmer.template b/andorApp/Db/PerkinElmer.template similarity index 100% rename from ADApp/Db/PerkinElmer.template rename to andorApp/Db/PerkinElmer.template diff --git a/ADApp/Db/PerkinElmer_settings.req b/andorApp/Db/PerkinElmer_settings.req similarity index 100% rename from ADApp/Db/PerkinElmer_settings.req rename to andorApp/Db/PerkinElmer_settings.req diff --git a/ADApp/Db/URLDriver.template b/andorApp/Db/URLDriver.template similarity index 100% rename from ADApp/Db/URLDriver.template rename to andorApp/Db/URLDriver.template diff --git a/ADApp/Db/URLDriver_settings.req b/andorApp/Db/URLDriver_settings.req similarity index 100% rename from ADApp/Db/URLDriver_settings.req rename to andorApp/Db/URLDriver_settings.req diff --git a/ADApp/Db/adsc.template b/andorApp/Db/adsc.template similarity index 100% rename from ADApp/Db/adsc.template rename to andorApp/Db/adsc.template diff --git a/ADApp/Db/adsc_settings.req b/andorApp/Db/adsc_settings.req similarity index 100% rename from ADApp/Db/adsc_settings.req rename to andorApp/Db/adsc_settings.req diff --git a/ADApp/Db/andor3.template b/andorApp/Db/andor3.template similarity index 100% rename from ADApp/Db/andor3.template rename to andorApp/Db/andor3.template diff --git a/ADApp/Db/andor3_settings.req b/andorApp/Db/andor3_settings.req similarity index 100% rename from ADApp/Db/andor3_settings.req rename to andorApp/Db/andor3_settings.req diff --git a/ADApp/Db/andorCCD.template b/andorApp/Db/andorCCD.template similarity index 100% rename from ADApp/Db/andorCCD.template rename to andorApp/Db/andorCCD.template diff --git a/ADApp/Db/andorCCD_settings.req b/andorApp/Db/andorCCD_settings.req similarity index 100% rename from ADApp/Db/andorCCD_settings.req rename to andorApp/Db/andorCCD_settings.req diff --git a/ADApp/Db/commonPlugin_settings.req b/andorApp/Db/commonPlugin_settings.req similarity index 100% rename from ADApp/Db/commonPlugin_settings.req rename to andorApp/Db/commonPlugin_settings.req diff --git a/ADApp/Db/firewireColorCodes.template b/andorApp/Db/firewireColorCodes.template similarity index 100% rename from ADApp/Db/firewireColorCodes.template rename to andorApp/Db/firewireColorCodes.template diff --git a/ADApp/Db/firewireDCAM.template b/andorApp/Db/firewireDCAM.template similarity index 100% rename from ADApp/Db/firewireDCAM.template rename to andorApp/Db/firewireDCAM.template diff --git a/ADApp/Db/firewireDCAM_settings.req b/andorApp/Db/firewireDCAM_settings.req similarity index 100% rename from ADApp/Db/firewireDCAM_settings.req rename to andorApp/Db/firewireDCAM_settings.req diff --git a/ADApp/Db/firewireFeature.template b/andorApp/Db/firewireFeature.template similarity index 100% rename from ADApp/Db/firewireFeature.template rename to andorApp/Db/firewireFeature.template diff --git a/ADApp/Db/firewireFeatureAbs_settings.req b/andorApp/Db/firewireFeatureAbs_settings.req similarity index 100% rename from ADApp/Db/firewireFeatureAbs_settings.req rename to andorApp/Db/firewireFeatureAbs_settings.req diff --git a/ADApp/Db/firewireFeature_settings.req b/andorApp/Db/firewireFeature_settings.req similarity index 100% rename from ADApp/Db/firewireFeature_settings.req rename to andorApp/Db/firewireFeature_settings.req diff --git a/ADApp/Db/firewireVideoModes.template b/andorApp/Db/firewireVideoModes.template similarity index 100% rename from ADApp/Db/firewireVideoModes.template rename to andorApp/Db/firewireVideoModes.template diff --git a/ADApp/Db/firewireWhiteBalance.template b/andorApp/Db/firewireWhiteBalance.template similarity index 100% rename from ADApp/Db/firewireWhiteBalance.template rename to andorApp/Db/firewireWhiteBalance.template diff --git a/ADApp/Db/mar345.template b/andorApp/Db/mar345.template similarity index 100% rename from ADApp/Db/mar345.template rename to andorApp/Db/mar345.template diff --git a/ADApp/Db/mar345_settings.req b/andorApp/Db/mar345_settings.req similarity index 100% rename from ADApp/Db/mar345_settings.req rename to andorApp/Db/mar345_settings.req diff --git a/ADApp/Db/marCCD.template b/andorApp/Db/marCCD.template similarity index 100% rename from ADApp/Db/marCCD.template rename to andorApp/Db/marCCD.template diff --git a/ADApp/Db/marCCD_settings.req b/andorApp/Db/marCCD_settings.req similarity index 100% rename from ADApp/Db/marCCD_settings.req rename to andorApp/Db/marCCD_settings.req diff --git a/ADApp/Db/pilatus.template b/andorApp/Db/pilatus.template similarity index 100% rename from ADApp/Db/pilatus.template rename to andorApp/Db/pilatus.template diff --git a/ADApp/Db/pilatus_settings.req b/andorApp/Db/pilatus_settings.req similarity index 100% rename from ADApp/Db/pilatus_settings.req rename to andorApp/Db/pilatus_settings.req diff --git a/ADApp/Db/prosilica.template b/andorApp/Db/prosilica.template similarity index 100% rename from ADApp/Db/prosilica.template rename to andorApp/Db/prosilica.template diff --git a/ADApp/Db/prosilica_settings.req b/andorApp/Db/prosilica_settings.req similarity index 100% rename from ADApp/Db/prosilica_settings.req rename to andorApp/Db/prosilica_settings.req diff --git a/ADApp/Db/pvCam.template b/andorApp/Db/pvCam.template similarity index 100% rename from ADApp/Db/pvCam.template rename to andorApp/Db/pvCam.template diff --git a/ADApp/Db/pvCam_settings.req b/andorApp/Db/pvCam_settings.req similarity index 100% rename from ADApp/Db/pvCam_settings.req rename to andorApp/Db/pvCam_settings.req diff --git a/ADApp/Db/roper.template b/andorApp/Db/roper.template similarity index 100% rename from ADApp/Db/roper.template rename to andorApp/Db/roper.template diff --git a/ADApp/Db/roper_settings.req b/andorApp/Db/roper_settings.req similarity index 100% rename from ADApp/Db/roper_settings.req rename to andorApp/Db/roper_settings.req diff --git a/ADApp/Db/simDetector.template b/andorApp/Db/simDetector.template similarity index 100% rename from ADApp/Db/simDetector.template rename to andorApp/Db/simDetector.template diff --git a/ADApp/Db/simDetector_settings.req b/andorApp/Db/simDetector_settings.req similarity index 100% rename from ADApp/Db/simDetector_settings.req rename to andorApp/Db/simDetector_settings.req diff --git a/ADApp/andorSrc/FKTest.c b/andorApp/andorSrc/FKTest.c similarity index 100% rename from ADApp/andorSrc/FKTest.c rename to andorApp/andorSrc/FKTest.c diff --git a/ADApp/andorSrc/GREY.PAL b/andorApp/andorSrc/GREY.PAL similarity index 100% rename from ADApp/andorSrc/GREY.PAL rename to andorApp/andorSrc/GREY.PAL diff --git a/ADApp/andorSrc/Makefile b/andorApp/andorSrc/Makefile similarity index 100% rename from ADApp/andorSrc/Makefile rename to andorApp/andorSrc/Makefile diff --git a/ADApp/andorSrc/accumTest.c b/andorApp/andorSrc/accumTest.c similarity index 100% rename from ADApp/andorSrc/accumTest.c rename to andorApp/andorSrc/accumTest.c diff --git a/ADApp/andorSrc/andorCCD.cpp b/andorApp/andorSrc/andorCCD.cpp similarity index 100% rename from ADApp/andorSrc/andorCCD.cpp rename to andorApp/andorSrc/andorCCD.cpp diff --git a/ADApp/andorSrc/andorCCD.h b/andorApp/andorSrc/andorCCD.h similarity index 100% rename from ADApp/andorSrc/andorCCD.h rename to andorApp/andorSrc/andorCCD.h diff --git a/ADApp/andorSrc/andorCCDAppMain.cpp b/andorApp/andorSrc/andorCCDAppMain.cpp similarity index 100% rename from ADApp/andorSrc/andorCCDAppMain.cpp rename to andorApp/andorSrc/andorCCDAppMain.cpp diff --git a/ADApp/andorSrc/andorCCDSupport.dbd b/andorApp/andorSrc/andorCCDSupport.dbd similarity index 100% rename from ADApp/andorSrc/andorCCDSupport.dbd rename to andorApp/andorSrc/andorCCDSupport.dbd diff --git a/ADApp/andorSrc/linuxTest.c b/andorApp/andorSrc/linuxTest.c similarity index 100% rename from ADApp/andorSrc/linuxTest.c rename to andorApp/andorSrc/linuxTest.c diff --git a/ADApp/andorSupport/ATMCD32D.h b/andorApp/andorSupport/ATMCD32D.h similarity index 100% rename from ADApp/andorSupport/ATMCD32D.h rename to andorApp/andorSupport/ATMCD32D.h diff --git a/ADApp/andorSupport/Makefile b/andorApp/andorSupport/Makefile similarity index 100% rename from ADApp/andorSupport/Makefile rename to andorApp/andorSupport/Makefile diff --git a/ADApp/andorSupport/atmcdLXd.h b/andorApp/andorSupport/atmcdLXd.h similarity index 100% rename from ADApp/andorSupport/atmcdLXd.h rename to andorApp/andorSupport/atmcdLXd.h diff --git a/ADApp/andorSupport/os/linux-x86/libandor-stdc++5-i386.so.2.84.30003.0 b/andorApp/andorSupport/os/linux-x86/libandor-stdc++5-i386.so.2.84.30003.0 similarity index 100% rename from ADApp/andorSupport/os/linux-x86/libandor-stdc++5-i386.so.2.84.30003.0 rename to andorApp/andorSupport/os/linux-x86/libandor-stdc++5-i386.so.2.84.30003.0 diff --git a/ADApp/andorSupport/os/linux-x86/libandor-stdc++6-i386.so.2.84.30003.0 b/andorApp/andorSupport/os/linux-x86/libandor-stdc++6-i386.so.2.84.30003.0 similarity index 100% rename from ADApp/andorSupport/os/linux-x86/libandor-stdc++6-i386.so.2.84.30003.0 rename to andorApp/andorSupport/os/linux-x86/libandor-stdc++6-i386.so.2.84.30003.0 diff --git a/ADApp/andorSupport/os/linux-x86/libandor.so b/andorApp/andorSupport/os/linux-x86/libandor.so similarity index 100% rename from ADApp/andorSupport/os/linux-x86/libandor.so rename to andorApp/andorSupport/os/linux-x86/libandor.so diff --git a/ADApp/andorSupport/os/linux-x86/libandor.so.2 b/andorApp/andorSupport/os/linux-x86/libandor.so.2 similarity index 100% rename from ADApp/andorSupport/os/linux-x86/libandor.so.2 rename to andorApp/andorSupport/os/linux-x86/libandor.so.2 diff --git a/ADApp/andorSupport/os/linux-x86_64/libandor-stdc++6-x86_64.so.2.84.30003.0 b/andorApp/andorSupport/os/linux-x86_64/libandor-stdc++6-x86_64.so.2.84.30003.0 similarity index 100% rename from ADApp/andorSupport/os/linux-x86_64/libandor-stdc++6-x86_64.so.2.84.30003.0 rename to andorApp/andorSupport/os/linux-x86_64/libandor-stdc++6-x86_64.so.2.84.30003.0 diff --git a/ADApp/andorSupport/os/linux-x86_64/libandor.so b/andorApp/andorSupport/os/linux-x86_64/libandor.so similarity index 100% rename from ADApp/andorSupport/os/linux-x86_64/libandor.so rename to andorApp/andorSupport/os/linux-x86_64/libandor.so diff --git a/ADApp/andorSupport/os/linux-x86_64/libandor.so.2 b/andorApp/andorSupport/os/linux-x86_64/libandor.so.2 similarity index 100% rename from ADApp/andorSupport/os/linux-x86_64/libandor.so.2 rename to andorApp/andorSupport/os/linux-x86_64/libandor.so.2 diff --git a/ADApp/andorSupport/os/win32-x86/ATMCD32M.LIB b/andorApp/andorSupport/os/win32-x86/ATMCD32M.LIB similarity index 100% rename from ADApp/andorSupport/os/win32-x86/ATMCD32M.LIB rename to andorApp/andorSupport/os/win32-x86/ATMCD32M.LIB diff --git a/ADApp/andorSupport/os/windows-x64/atmcd64m.lib b/andorApp/andorSupport/os/windows-x64/atmcd64m.lib similarity index 100% rename from ADApp/andorSupport/os/windows-x64/atmcd64m.lib rename to andorApp/andorSupport/os/windows-x64/atmcd64m.lib diff --git a/ADApp/op/adl/ADAttrFile.adl b/andorApp/op/adl/ADAttrFile.adl similarity index 100% rename from ADApp/op/adl/ADAttrFile.adl rename to andorApp/op/adl/ADAttrFile.adl diff --git a/ADApp/op/adl/ADBase.adl b/andorApp/op/adl/ADBase.adl similarity index 100% rename from ADApp/op/adl/ADBase.adl rename to andorApp/op/adl/ADBase.adl diff --git a/ADApp/op/adl/ADCollect.adl b/andorApp/op/adl/ADCollect.adl similarity index 100% rename from ADApp/op/adl/ADCollect.adl rename to andorApp/op/adl/ADCollect.adl diff --git a/ADApp/op/adl/ADDriverFile.adl b/andorApp/op/adl/ADDriverFile.adl similarity index 100% rename from ADApp/op/adl/ADDriverFile.adl rename to andorApp/op/adl/ADDriverFile.adl diff --git a/ADApp/op/adl/ADEpicsShutter.adl b/andorApp/op/adl/ADEpicsShutter.adl similarity index 100% rename from ADApp/op/adl/ADEpicsShutter.adl rename to andorApp/op/adl/ADEpicsShutter.adl diff --git a/ADApp/op/adl/ADPlugins.adl b/andorApp/op/adl/ADPlugins.adl similarity index 100% rename from ADApp/op/adl/ADPlugins.adl rename to andorApp/op/adl/ADPlugins.adl diff --git a/ADApp/op/adl/ADReadout.adl b/andorApp/op/adl/ADReadout.adl similarity index 100% rename from ADApp/op/adl/ADReadout.adl rename to andorApp/op/adl/ADReadout.adl diff --git a/ADApp/op/adl/ADSetup.adl b/andorApp/op/adl/ADSetup.adl similarity index 100% rename from ADApp/op/adl/ADSetup.adl rename to andorApp/op/adl/ADSetup.adl diff --git a/ADApp/op/adl/ADShutter.adl b/andorApp/op/adl/ADShutter.adl similarity index 100% rename from ADApp/op/adl/ADShutter.adl rename to andorApp/op/adl/ADShutter.adl diff --git a/ADApp/op/adl/ADTop.adl b/andorApp/op/adl/ADTop.adl similarity index 100% rename from ADApp/op/adl/ADTop.adl rename to andorApp/op/adl/ADTop.adl diff --git a/ADApp/op/adl/Andor.adl b/andorApp/op/adl/Andor.adl similarity index 100% rename from ADApp/op/adl/Andor.adl rename to andorApp/op/adl/Andor.adl diff --git a/ADApp/op/adl/Andor3.adl b/andorApp/op/adl/Andor3.adl similarity index 100% rename from ADApp/op/adl/Andor3.adl rename to andorApp/op/adl/Andor3.adl diff --git a/ADApp/op/adl/BIS.adl b/andorApp/op/adl/BIS.adl similarity index 100% rename from ADApp/op/adl/BIS.adl rename to andorApp/op/adl/BIS.adl diff --git a/ADApp/op/adl/LightField.adl b/andorApp/op/adl/LightField.adl similarity index 100% rename from ADApp/op/adl/LightField.adl rename to andorApp/op/adl/LightField.adl diff --git a/ADApp/op/adl/LightFieldFile.adl b/andorApp/op/adl/LightFieldFile.adl similarity index 100% rename from ADApp/op/adl/LightFieldFile.adl rename to andorApp/op/adl/LightFieldFile.adl diff --git a/ADApp/op/adl/NDColorConvert.adl b/andorApp/op/adl/NDColorConvert.adl similarity index 100% rename from ADApp/op/adl/NDColorConvert.adl rename to andorApp/op/adl/NDColorConvert.adl diff --git a/ADApp/op/adl/NDFile.adl b/andorApp/op/adl/NDFile.adl similarity index 100% rename from ADApp/op/adl/NDFile.adl rename to andorApp/op/adl/NDFile.adl diff --git a/ADApp/op/adl/NDFileHDF5.adl b/andorApp/op/adl/NDFileHDF5.adl similarity index 100% rename from ADApp/op/adl/NDFileHDF5.adl rename to andorApp/op/adl/NDFileHDF5.adl diff --git a/ADApp/op/adl/NDFileJPEG.adl b/andorApp/op/adl/NDFileJPEG.adl similarity index 100% rename from ADApp/op/adl/NDFileJPEG.adl rename to andorApp/op/adl/NDFileJPEG.adl diff --git a/ADApp/op/adl/NDFileMagick.adl b/andorApp/op/adl/NDFileMagick.adl similarity index 100% rename from ADApp/op/adl/NDFileMagick.adl rename to andorApp/op/adl/NDFileMagick.adl diff --git a/ADApp/op/adl/NDFileNetCDF.adl b/andorApp/op/adl/NDFileNetCDF.adl similarity index 100% rename from ADApp/op/adl/NDFileNetCDF.adl rename to andorApp/op/adl/NDFileNetCDF.adl diff --git a/ADApp/op/adl/NDFileNexus.adl b/andorApp/op/adl/NDFileNexus.adl similarity index 100% rename from ADApp/op/adl/NDFileNexus.adl rename to andorApp/op/adl/NDFileNexus.adl diff --git a/ADApp/op/adl/NDFileNull.adl b/andorApp/op/adl/NDFileNull.adl similarity index 100% rename from ADApp/op/adl/NDFileNull.adl rename to andorApp/op/adl/NDFileNull.adl diff --git a/ADApp/op/adl/NDFileTIFF.adl b/andorApp/op/adl/NDFileTIFF.adl similarity index 100% rename from ADApp/op/adl/NDFileTIFF.adl rename to andorApp/op/adl/NDFileTIFF.adl diff --git a/ADApp/op/adl/NDOverlay.adl b/andorApp/op/adl/NDOverlay.adl similarity index 100% rename from ADApp/op/adl/NDOverlay.adl rename to andorApp/op/adl/NDOverlay.adl diff --git a/ADApp/op/adl/NDOverlay8.adl b/andorApp/op/adl/NDOverlay8.adl similarity index 100% rename from ADApp/op/adl/NDOverlay8.adl rename to andorApp/op/adl/NDOverlay8.adl diff --git a/ADApp/op/adl/NDOverlayN.adl b/andorApp/op/adl/NDOverlayN.adl similarity index 100% rename from ADApp/op/adl/NDOverlayN.adl rename to andorApp/op/adl/NDOverlayN.adl diff --git a/ADApp/op/adl/NDPlot.adl b/andorApp/op/adl/NDPlot.adl similarity index 100% rename from ADApp/op/adl/NDPlot.adl rename to andorApp/op/adl/NDPlot.adl diff --git a/ADApp/op/adl/NDPluginBase.adl b/andorApp/op/adl/NDPluginBase.adl similarity index 100% rename from ADApp/op/adl/NDPluginBase.adl rename to andorApp/op/adl/NDPluginBase.adl diff --git a/ADApp/op/adl/NDProcess.adl b/andorApp/op/adl/NDProcess.adl similarity index 100% rename from ADApp/op/adl/NDProcess.adl rename to andorApp/op/adl/NDProcess.adl diff --git a/ADApp/op/adl/NDROI.adl b/andorApp/op/adl/NDROI.adl similarity index 100% rename from ADApp/op/adl/NDROI.adl rename to andorApp/op/adl/NDROI.adl diff --git a/ADApp/op/adl/NDROI4.adl b/andorApp/op/adl/NDROI4.adl similarity index 100% rename from ADApp/op/adl/NDROI4.adl rename to andorApp/op/adl/NDROI4.adl diff --git a/ADApp/op/adl/NDStats.adl b/andorApp/op/adl/NDStats.adl similarity index 100% rename from ADApp/op/adl/NDStats.adl rename to andorApp/op/adl/NDStats.adl diff --git a/ADApp/op/adl/NDStats5.adl b/andorApp/op/adl/NDStats5.adl similarity index 100% rename from ADApp/op/adl/NDStats5.adl rename to andorApp/op/adl/NDStats5.adl diff --git a/ADApp/op/adl/NDStdArrays.adl b/andorApp/op/adl/NDStdArrays.adl similarity index 100% rename from ADApp/op/adl/NDStdArrays.adl rename to andorApp/op/adl/NDStdArrays.adl diff --git a/ADApp/op/adl/NDTimeSeries.adl b/andorApp/op/adl/NDTimeSeries.adl similarity index 100% rename from ADApp/op/adl/NDTimeSeries.adl rename to andorApp/op/adl/NDTimeSeries.adl diff --git a/ADApp/op/adl/NDTimeSeriesAll.adl b/andorApp/op/adl/NDTimeSeriesAll.adl similarity index 100% rename from ADApp/op/adl/NDTimeSeriesAll.adl rename to andorApp/op/adl/NDTimeSeriesAll.adl diff --git a/ADApp/op/adl/NDTransform.adl b/andorApp/op/adl/NDTransform.adl similarity index 100% rename from ADApp/op/adl/NDTransform.adl rename to andorApp/op/adl/NDTransform.adl diff --git a/ADApp/op/adl/PSL.adl b/andorApp/op/adl/PSL.adl similarity index 100% rename from ADApp/op/adl/PSL.adl rename to andorApp/op/adl/PSL.adl diff --git a/ADApp/op/adl/PerkinElmer.adl b/andorApp/op/adl/PerkinElmer.adl similarity index 100% rename from ADApp/op/adl/PerkinElmer.adl rename to andorApp/op/adl/PerkinElmer.adl diff --git a/ADApp/op/adl/PerkinElmerCollect.adl b/andorApp/op/adl/PerkinElmerCollect.adl similarity index 100% rename from ADApp/op/adl/PerkinElmerCollect.adl rename to andorApp/op/adl/PerkinElmerCollect.adl diff --git a/ADApp/op/adl/PerkinElmerCorrections.adl b/andorApp/op/adl/PerkinElmerCorrections.adl similarity index 100% rename from ADApp/op/adl/PerkinElmerCorrections.adl rename to andorApp/op/adl/PerkinElmerCorrections.adl diff --git a/ADApp/op/adl/PerkinElmerInit.adl b/andorApp/op/adl/PerkinElmerInit.adl similarity index 100% rename from ADApp/op/adl/PerkinElmerInit.adl rename to andorApp/op/adl/PerkinElmerInit.adl diff --git a/ADApp/op/adl/Roper.adl b/andorApp/op/adl/Roper.adl similarity index 100% rename from ADApp/op/adl/Roper.adl rename to andorApp/op/adl/Roper.adl diff --git a/ADApp/op/adl/RoperFile.adl b/andorApp/op/adl/RoperFile.adl similarity index 100% rename from ADApp/op/adl/RoperFile.adl rename to andorApp/op/adl/RoperFile.adl diff --git a/ADApp/op/adl/URLDriver.adl b/andorApp/op/adl/URLDriver.adl similarity index 100% rename from ADApp/op/adl/URLDriver.adl rename to andorApp/op/adl/URLDriver.adl diff --git a/ADApp/op/adl/URLDriverSetup.adl b/andorApp/op/adl/URLDriverSetup.adl similarity index 100% rename from ADApp/op/adl/URLDriverSetup.adl rename to andorApp/op/adl/URLDriverSetup.adl diff --git a/ADApp/op/adl/adsc.adl b/andorApp/op/adl/adsc.adl similarity index 100% rename from ADApp/op/adl/adsc.adl rename to andorApp/op/adl/adsc.adl diff --git a/ADApp/op/adl/commonPlugins.adl b/andorApp/op/adl/commonPlugins.adl similarity index 100% rename from ADApp/op/adl/commonPlugins.adl rename to andorApp/op/adl/commonPlugins.adl diff --git a/ADApp/op/adl/firewire.adl b/andorApp/op/adl/firewire.adl similarity index 100% rename from ADApp/op/adl/firewire.adl rename to andorApp/op/adl/firewire.adl diff --git a/ADApp/op/adl/firewireFeatures.adl b/andorApp/op/adl/firewireFeatures.adl similarity index 100% rename from ADApp/op/adl/firewireFeatures.adl rename to andorApp/op/adl/firewireFeatures.adl diff --git a/ADApp/op/adl/firewireVideoFormats.adl b/andorApp/op/adl/firewireVideoFormats.adl similarity index 100% rename from ADApp/op/adl/firewireVideoFormats.adl rename to andorApp/op/adl/firewireVideoFormats.adl diff --git a/ADApp/op/adl/mar345.adl b/andorApp/op/adl/mar345.adl similarity index 100% rename from ADApp/op/adl/mar345.adl rename to andorApp/op/adl/mar345.adl diff --git a/ADApp/op/adl/marCCD.adl b/andorApp/op/adl/marCCD.adl similarity index 100% rename from ADApp/op/adl/marCCD.adl rename to andorApp/op/adl/marCCD.adl diff --git a/ADApp/op/adl/marCCDAncillary.adl b/andorApp/op/adl/marCCDAncillary.adl similarity index 100% rename from ADApp/op/adl/marCCDAncillary.adl rename to andorApp/op/adl/marCCDAncillary.adl diff --git a/ADApp/op/adl/pilatusAncillary.adl b/andorApp/op/adl/pilatusAncillary.adl similarity index 100% rename from ADApp/op/adl/pilatusAncillary.adl rename to andorApp/op/adl/pilatusAncillary.adl diff --git a/ADApp/op/adl/pilatusDetector.adl b/andorApp/op/adl/pilatusDetector.adl similarity index 100% rename from ADApp/op/adl/pilatusDetector.adl rename to andorApp/op/adl/pilatusDetector.adl diff --git a/ADApp/op/adl/prosilica.adl b/andorApp/op/adl/prosilica.adl similarity index 100% rename from ADApp/op/adl/prosilica.adl rename to andorApp/op/adl/prosilica.adl diff --git a/ADApp/op/adl/prosilicaMore.adl b/andorApp/op/adl/prosilicaMore.adl similarity index 100% rename from ADApp/op/adl/prosilicaMore.adl rename to andorApp/op/adl/prosilicaMore.adl diff --git a/ADApp/op/adl/pvCam.adl b/andorApp/op/adl/pvCam.adl similarity index 100% rename from ADApp/op/adl/pvCam.adl rename to andorApp/op/adl/pvCam.adl diff --git a/ADApp/op/adl/simDetector.adl b/andorApp/op/adl/simDetector.adl similarity index 100% rename from ADApp/op/adl/simDetector.adl rename to andorApp/op/adl/simDetector.adl diff --git a/ADApp/op/adl/simDetectorSetup.adl b/andorApp/op/adl/simDetectorSetup.adl similarity index 100% rename from ADApp/op/adl/simDetectorSetup.adl rename to andorApp/op/adl/simDetectorSetup.adl diff --git a/ADApp/op/edl/ADBase.edl b/andorApp/op/edl/ADBase.edl similarity index 100% rename from ADApp/op/edl/ADBase.edl rename to andorApp/op/edl/ADBase.edl diff --git a/ADApp/op/edl/ADBaseAdvanced.edl b/andorApp/op/edl/ADBaseAdvanced.edl similarity index 100% rename from ADApp/op/edl/ADBaseAdvanced.edl rename to andorApp/op/edl/ADBaseAdvanced.edl diff --git a/ADApp/op/edl/Makefile b/andorApp/op/edl/Makefile similarity index 100% rename from ADApp/op/edl/Makefile rename to andorApp/op/edl/Makefile diff --git a/ADApp/op/edl/NDColorConvert.edl b/andorApp/op/edl/NDColorConvert.edl similarity index 100% rename from ADApp/op/edl/NDColorConvert.edl rename to andorApp/op/edl/NDColorConvert.edl diff --git a/ADApp/op/edl/NDFile.edl b/andorApp/op/edl/NDFile.edl similarity index 100% rename from ADApp/op/edl/NDFile.edl rename to andorApp/op/edl/NDFile.edl diff --git a/ADApp/op/edl/NDFileCBF.edl b/andorApp/op/edl/NDFileCBF.edl similarity index 100% rename from ADApp/op/edl/NDFileCBF.edl rename to andorApp/op/edl/NDFileCBF.edl diff --git a/ADApp/op/edl/NDFileHDF5.edl b/andorApp/op/edl/NDFileHDF5.edl similarity index 100% rename from ADApp/op/edl/NDFileHDF5.edl rename to andorApp/op/edl/NDFileHDF5.edl diff --git a/ADApp/op/edl/NDFileHDF5Details.edl b/andorApp/op/edl/NDFileHDF5Details.edl similarity index 100% rename from ADApp/op/edl/NDFileHDF5Details.edl rename to andorApp/op/edl/NDFileHDF5Details.edl diff --git a/ADApp/op/edl/NDFileJPEG.edl b/andorApp/op/edl/NDFileJPEG.edl similarity index 100% rename from ADApp/op/edl/NDFileJPEG.edl rename to andorApp/op/edl/NDFileJPEG.edl diff --git a/ADApp/op/edl/NDFileMagick.edl b/andorApp/op/edl/NDFileMagick.edl similarity index 100% rename from ADApp/op/edl/NDFileMagick.edl rename to andorApp/op/edl/NDFileMagick.edl diff --git a/ADApp/op/edl/NDFileNetCDF.edl b/andorApp/op/edl/NDFileNetCDF.edl similarity index 100% rename from ADApp/op/edl/NDFileNetCDF.edl rename to andorApp/op/edl/NDFileNetCDF.edl diff --git a/ADApp/op/edl/NDFileNexus.edl b/andorApp/op/edl/NDFileNexus.edl similarity index 100% rename from ADApp/op/edl/NDFileNexus.edl rename to andorApp/op/edl/NDFileNexus.edl diff --git a/ADApp/op/edl/NDFileReduced.edl b/andorApp/op/edl/NDFileReduced.edl similarity index 100% rename from ADApp/op/edl/NDFileReduced.edl rename to andorApp/op/edl/NDFileReduced.edl diff --git a/ADApp/op/edl/NDFileTIFF.edl b/andorApp/op/edl/NDFileTIFF.edl similarity index 100% rename from ADApp/op/edl/NDFileTIFF.edl rename to andorApp/op/edl/NDFileTIFF.edl diff --git a/ADApp/op/edl/NDOverlay.edl b/andorApp/op/edl/NDOverlay.edl similarity index 100% rename from ADApp/op/edl/NDOverlay.edl rename to andorApp/op/edl/NDOverlay.edl diff --git a/ADApp/op/edl/NDOverlayN.edl b/andorApp/op/edl/NDOverlayN.edl similarity index 100% rename from ADApp/op/edl/NDOverlayN.edl rename to andorApp/op/edl/NDOverlayN.edl diff --git a/ADApp/op/edl/NDPlot.edl b/andorApp/op/edl/NDPlot.edl similarity index 100% rename from ADApp/op/edl/NDPlot.edl rename to andorApp/op/edl/NDPlot.edl diff --git a/ADApp/op/edl/NDPluginBase.edl b/andorApp/op/edl/NDPluginBase.edl similarity index 100% rename from ADApp/op/edl/NDPluginBase.edl rename to andorApp/op/edl/NDPluginBase.edl diff --git a/ADApp/op/edl/NDPluginDriverAdvanced.edl b/andorApp/op/edl/NDPluginDriverAdvanced.edl similarity index 100% rename from ADApp/op/edl/NDPluginDriverAdvanced.edl rename to andorApp/op/edl/NDPluginDriverAdvanced.edl diff --git a/ADApp/op/edl/NDProcess.edl b/andorApp/op/edl/NDProcess.edl similarity index 100% rename from ADApp/op/edl/NDProcess.edl rename to andorApp/op/edl/NDProcess.edl diff --git a/ADApp/op/edl/NDROI.edl b/andorApp/op/edl/NDROI.edl similarity index 100% rename from ADApp/op/edl/NDROI.edl rename to andorApp/op/edl/NDROI.edl diff --git a/ADApp/op/edl/NDStats.edl b/andorApp/op/edl/NDStats.edl similarity index 100% rename from ADApp/op/edl/NDStats.edl rename to andorApp/op/edl/NDStats.edl diff --git a/ADApp/op/edl/NDStdArrays.edl b/andorApp/op/edl/NDStdArrays.edl similarity index 100% rename from ADApp/op/edl/NDStdArrays.edl rename to andorApp/op/edl/NDStdArrays.edl diff --git a/ADApp/op/edl/NDStdArraysBig.edl b/andorApp/op/edl/NDStdArraysBig.edl similarity index 100% rename from ADApp/op/edl/NDStdArraysBig.edl rename to andorApp/op/edl/NDStdArraysBig.edl diff --git a/ADApp/op/edl/NDTransform.edl b/andorApp/op/edl/NDTransform.edl similarity index 100% rename from ADApp/op/edl/NDTransform.edl rename to andorApp/op/edl/NDTransform.edl diff --git a/ADApp/op/edl/URLDriver.edl b/andorApp/op/edl/URLDriver.edl similarity index 100% rename from ADApp/op/edl/URLDriver.edl rename to andorApp/op/edl/URLDriver.edl diff --git a/ADApp/op/edl/mar345.edl b/andorApp/op/edl/mar345.edl similarity index 100% rename from ADApp/op/edl/mar345.edl rename to andorApp/op/edl/mar345.edl diff --git a/ADApp/op/edl/marCCD.edl b/andorApp/op/edl/marCCD.edl similarity index 100% rename from ADApp/op/edl/marCCD.edl rename to andorApp/op/edl/marCCD.edl diff --git a/ADApp/op/edl/marCCDAncillary.edl b/andorApp/op/edl/marCCDAncillary.edl similarity index 100% rename from ADApp/op/edl/marCCDAncillary.edl rename to andorApp/op/edl/marCCDAncillary.edl diff --git a/ADApp/op/edl/marCCDStatus.edl b/andorApp/op/edl/marCCDStatus.edl similarity index 100% rename from ADApp/op/edl/marCCDStatus.edl rename to andorApp/op/edl/marCCDStatus.edl diff --git a/ADApp/op/edl/pilatusAncillary.edl b/andorApp/op/edl/pilatusAncillary.edl similarity index 100% rename from ADApp/op/edl/pilatusAncillary.edl rename to andorApp/op/edl/pilatusAncillary.edl diff --git a/ADApp/op/edl/pilatusDetector.edl b/andorApp/op/edl/pilatusDetector.edl similarity index 100% rename from ADApp/op/edl/pilatusDetector.edl rename to andorApp/op/edl/pilatusDetector.edl diff --git a/ADApp/op/edl/prosilica.edl b/andorApp/op/edl/prosilica.edl similarity index 100% rename from ADApp/op/edl/prosilica.edl rename to andorApp/op/edl/prosilica.edl diff --git a/ADApp/op/edl/pvCam.edl b/andorApp/op/edl/pvCam.edl similarity index 100% rename from ADApp/op/edl/pvCam.edl rename to andorApp/op/edl/pvCam.edl diff --git a/ADApp/op/edl/simDetector.edl b/andorApp/op/edl/simDetector.edl similarity index 100% rename from ADApp/op/edl/simDetector.edl rename to andorApp/op/edl/simDetector.edl diff --git a/ADApp/op/edl/simTop.edl b/andorApp/op/edl/simTop.edl similarity index 100% rename from ADApp/op/edl/simTop.edl rename to andorApp/op/edl/simTop.edl diff --git a/ADApp/op/opi/ADAttrFile.opi b/andorApp/op/opi/ADAttrFile.opi similarity index 100% rename from ADApp/op/opi/ADAttrFile.opi rename to andorApp/op/opi/ADAttrFile.opi diff --git a/ADApp/op/opi/ADBase.opi b/andorApp/op/opi/ADBase.opi similarity index 100% rename from ADApp/op/opi/ADBase.opi rename to andorApp/op/opi/ADBase.opi diff --git a/ADApp/op/opi/ADCollect.opi b/andorApp/op/opi/ADCollect.opi similarity index 100% rename from ADApp/op/opi/ADCollect.opi rename to andorApp/op/opi/ADCollect.opi diff --git a/ADApp/op/opi/ADDriverFile.opi b/andorApp/op/opi/ADDriverFile.opi similarity index 100% rename from ADApp/op/opi/ADDriverFile.opi rename to andorApp/op/opi/ADDriverFile.opi diff --git a/ADApp/op/opi/ADEpicsShutter.opi b/andorApp/op/opi/ADEpicsShutter.opi similarity index 100% rename from ADApp/op/opi/ADEpicsShutter.opi rename to andorApp/op/opi/ADEpicsShutter.opi diff --git a/ADApp/op/opi/ADPlugins.opi b/andorApp/op/opi/ADPlugins.opi similarity index 100% rename from ADApp/op/opi/ADPlugins.opi rename to andorApp/op/opi/ADPlugins.opi diff --git a/ADApp/op/opi/ADReadout.opi b/andorApp/op/opi/ADReadout.opi similarity index 100% rename from ADApp/op/opi/ADReadout.opi rename to andorApp/op/opi/ADReadout.opi diff --git a/ADApp/op/opi/ADSetup.opi b/andorApp/op/opi/ADSetup.opi similarity index 100% rename from ADApp/op/opi/ADSetup.opi rename to andorApp/op/opi/ADSetup.opi diff --git a/ADApp/op/opi/ADShutter.opi b/andorApp/op/opi/ADShutter.opi similarity index 100% rename from ADApp/op/opi/ADShutter.opi rename to andorApp/op/opi/ADShutter.opi diff --git a/ADApp/op/opi/ADTop.opi b/andorApp/op/opi/ADTop.opi similarity index 100% rename from ADApp/op/opi/ADTop.opi rename to andorApp/op/opi/ADTop.opi diff --git a/ADApp/op/opi/Andor.opi b/andorApp/op/opi/Andor.opi similarity index 100% rename from ADApp/op/opi/Andor.opi rename to andorApp/op/opi/Andor.opi diff --git a/ADApp/op/opi/Andor3.opi b/andorApp/op/opi/Andor3.opi similarity index 100% rename from ADApp/op/opi/Andor3.opi rename to andorApp/op/opi/Andor3.opi diff --git a/ADApp/op/opi/BIS.opi b/andorApp/op/opi/BIS.opi similarity index 100% rename from ADApp/op/opi/BIS.opi rename to andorApp/op/opi/BIS.opi diff --git a/ADApp/op/opi/NDColorConvert.opi b/andorApp/op/opi/NDColorConvert.opi similarity index 100% rename from ADApp/op/opi/NDColorConvert.opi rename to andorApp/op/opi/NDColorConvert.opi diff --git a/ADApp/op/opi/NDFile.opi b/andorApp/op/opi/NDFile.opi similarity index 100% rename from ADApp/op/opi/NDFile.opi rename to andorApp/op/opi/NDFile.opi diff --git a/ADApp/op/opi/NDFileHDF5.opi b/andorApp/op/opi/NDFileHDF5.opi similarity index 100% rename from ADApp/op/opi/NDFileHDF5.opi rename to andorApp/op/opi/NDFileHDF5.opi diff --git a/ADApp/op/opi/NDFileJPEG.opi b/andorApp/op/opi/NDFileJPEG.opi similarity index 100% rename from ADApp/op/opi/NDFileJPEG.opi rename to andorApp/op/opi/NDFileJPEG.opi diff --git a/ADApp/op/opi/NDFileMagick.opi b/andorApp/op/opi/NDFileMagick.opi similarity index 100% rename from ADApp/op/opi/NDFileMagick.opi rename to andorApp/op/opi/NDFileMagick.opi diff --git a/ADApp/op/opi/NDFileNetCDF.opi b/andorApp/op/opi/NDFileNetCDF.opi similarity index 100% rename from ADApp/op/opi/NDFileNetCDF.opi rename to andorApp/op/opi/NDFileNetCDF.opi diff --git a/ADApp/op/opi/NDFileNexus.opi b/andorApp/op/opi/NDFileNexus.opi similarity index 100% rename from ADApp/op/opi/NDFileNexus.opi rename to andorApp/op/opi/NDFileNexus.opi diff --git a/ADApp/op/opi/NDFileNull.opi b/andorApp/op/opi/NDFileNull.opi similarity index 100% rename from ADApp/op/opi/NDFileNull.opi rename to andorApp/op/opi/NDFileNull.opi diff --git a/ADApp/op/opi/NDFileTIFF.opi b/andorApp/op/opi/NDFileTIFF.opi similarity index 100% rename from ADApp/op/opi/NDFileTIFF.opi rename to andorApp/op/opi/NDFileTIFF.opi diff --git a/ADApp/op/opi/NDOverlay.opi b/andorApp/op/opi/NDOverlay.opi similarity index 100% rename from ADApp/op/opi/NDOverlay.opi rename to andorApp/op/opi/NDOverlay.opi diff --git a/ADApp/op/opi/NDOverlay8.opi b/andorApp/op/opi/NDOverlay8.opi similarity index 100% rename from ADApp/op/opi/NDOverlay8.opi rename to andorApp/op/opi/NDOverlay8.opi diff --git a/ADApp/op/opi/NDOverlayN.opi b/andorApp/op/opi/NDOverlayN.opi similarity index 100% rename from ADApp/op/opi/NDOverlayN.opi rename to andorApp/op/opi/NDOverlayN.opi diff --git a/ADApp/op/opi/NDPlot.opi b/andorApp/op/opi/NDPlot.opi similarity index 100% rename from ADApp/op/opi/NDPlot.opi rename to andorApp/op/opi/NDPlot.opi diff --git a/ADApp/op/opi/NDPluginBase.opi b/andorApp/op/opi/NDPluginBase.opi similarity index 100% rename from ADApp/op/opi/NDPluginBase.opi rename to andorApp/op/opi/NDPluginBase.opi diff --git a/ADApp/op/opi/NDProcess.opi b/andorApp/op/opi/NDProcess.opi similarity index 100% rename from ADApp/op/opi/NDProcess.opi rename to andorApp/op/opi/NDProcess.opi diff --git a/ADApp/op/opi/NDROI.opi b/andorApp/op/opi/NDROI.opi similarity index 100% rename from ADApp/op/opi/NDROI.opi rename to andorApp/op/opi/NDROI.opi diff --git a/ADApp/op/opi/NDROI4.opi b/andorApp/op/opi/NDROI4.opi similarity index 100% rename from ADApp/op/opi/NDROI4.opi rename to andorApp/op/opi/NDROI4.opi diff --git a/ADApp/op/opi/NDStats.opi b/andorApp/op/opi/NDStats.opi similarity index 100% rename from ADApp/op/opi/NDStats.opi rename to andorApp/op/opi/NDStats.opi diff --git a/ADApp/op/opi/NDStats5.opi b/andorApp/op/opi/NDStats5.opi similarity index 100% rename from ADApp/op/opi/NDStats5.opi rename to andorApp/op/opi/NDStats5.opi diff --git a/ADApp/op/opi/NDStdArrays.opi b/andorApp/op/opi/NDStdArrays.opi similarity index 100% rename from ADApp/op/opi/NDStdArrays.opi rename to andorApp/op/opi/NDStdArrays.opi diff --git a/ADApp/op/opi/NDTimeSeries.opi b/andorApp/op/opi/NDTimeSeries.opi similarity index 100% rename from ADApp/op/opi/NDTimeSeries.opi rename to andorApp/op/opi/NDTimeSeries.opi diff --git a/ADApp/op/opi/NDTimeSeriesAll.opi b/andorApp/op/opi/NDTimeSeriesAll.opi similarity index 100% rename from ADApp/op/opi/NDTimeSeriesAll.opi rename to andorApp/op/opi/NDTimeSeriesAll.opi diff --git a/ADApp/op/opi/NDTransform.opi b/andorApp/op/opi/NDTransform.opi similarity index 100% rename from ADApp/op/opi/NDTransform.opi rename to andorApp/op/opi/NDTransform.opi diff --git a/ADApp/op/opi/PSL.opi b/andorApp/op/opi/PSL.opi similarity index 100% rename from ADApp/op/opi/PSL.opi rename to andorApp/op/opi/PSL.opi diff --git a/ADApp/op/opi/PerkinElmer.opi b/andorApp/op/opi/PerkinElmer.opi similarity index 100% rename from ADApp/op/opi/PerkinElmer.opi rename to andorApp/op/opi/PerkinElmer.opi diff --git a/ADApp/op/opi/PerkinElmerCollect.opi b/andorApp/op/opi/PerkinElmerCollect.opi similarity index 100% rename from ADApp/op/opi/PerkinElmerCollect.opi rename to andorApp/op/opi/PerkinElmerCollect.opi diff --git a/ADApp/op/opi/PerkinElmerCorrections.opi b/andorApp/op/opi/PerkinElmerCorrections.opi similarity index 100% rename from ADApp/op/opi/PerkinElmerCorrections.opi rename to andorApp/op/opi/PerkinElmerCorrections.opi diff --git a/ADApp/op/opi/PerkinElmerInit.opi b/andorApp/op/opi/PerkinElmerInit.opi similarity index 100% rename from ADApp/op/opi/PerkinElmerInit.opi rename to andorApp/op/opi/PerkinElmerInit.opi diff --git a/ADApp/op/opi/Roper.opi b/andorApp/op/opi/Roper.opi similarity index 100% rename from ADApp/op/opi/Roper.opi rename to andorApp/op/opi/Roper.opi diff --git a/ADApp/op/opi/RoperFile.opi b/andorApp/op/opi/RoperFile.opi similarity index 100% rename from ADApp/op/opi/RoperFile.opi rename to andorApp/op/opi/RoperFile.opi diff --git a/ADApp/op/opi/URLDriver.opi b/andorApp/op/opi/URLDriver.opi similarity index 100% rename from ADApp/op/opi/URLDriver.opi rename to andorApp/op/opi/URLDriver.opi diff --git a/ADApp/op/opi/URLDriverSetup.opi b/andorApp/op/opi/URLDriverSetup.opi similarity index 100% rename from ADApp/op/opi/URLDriverSetup.opi rename to andorApp/op/opi/URLDriverSetup.opi diff --git a/ADApp/op/opi/adsc.opi b/andorApp/op/opi/adsc.opi similarity index 100% rename from ADApp/op/opi/adsc.opi rename to andorApp/op/opi/adsc.opi diff --git a/ADApp/op/opi/commonPlugins.opi b/andorApp/op/opi/commonPlugins.opi similarity index 100% rename from ADApp/op/opi/commonPlugins.opi rename to andorApp/op/opi/commonPlugins.opi diff --git a/ADApp/op/opi/firewire.opi b/andorApp/op/opi/firewire.opi similarity index 100% rename from ADApp/op/opi/firewire.opi rename to andorApp/op/opi/firewire.opi diff --git a/ADApp/op/opi/firewireFeatures.opi b/andorApp/op/opi/firewireFeatures.opi similarity index 100% rename from ADApp/op/opi/firewireFeatures.opi rename to andorApp/op/opi/firewireFeatures.opi diff --git a/ADApp/op/opi/firewireVideoFormats.opi b/andorApp/op/opi/firewireVideoFormats.opi similarity index 100% rename from ADApp/op/opi/firewireVideoFormats.opi rename to andorApp/op/opi/firewireVideoFormats.opi diff --git a/ADApp/op/opi/mar345.opi b/andorApp/op/opi/mar345.opi similarity index 100% rename from ADApp/op/opi/mar345.opi rename to andorApp/op/opi/mar345.opi diff --git a/ADApp/op/opi/marCCD.opi b/andorApp/op/opi/marCCD.opi similarity index 100% rename from ADApp/op/opi/marCCD.opi rename to andorApp/op/opi/marCCD.opi diff --git a/ADApp/op/opi/marCCDAncillary.opi b/andorApp/op/opi/marCCDAncillary.opi similarity index 100% rename from ADApp/op/opi/marCCDAncillary.opi rename to andorApp/op/opi/marCCDAncillary.opi diff --git a/ADApp/op/opi/pilatusAncillary.opi b/andorApp/op/opi/pilatusAncillary.opi similarity index 100% rename from ADApp/op/opi/pilatusAncillary.opi rename to andorApp/op/opi/pilatusAncillary.opi diff --git a/ADApp/op/opi/pilatusDetector.opi b/andorApp/op/opi/pilatusDetector.opi similarity index 100% rename from ADApp/op/opi/pilatusDetector.opi rename to andorApp/op/opi/pilatusDetector.opi diff --git a/ADApp/op/opi/prosilica.opi b/andorApp/op/opi/prosilica.opi similarity index 100% rename from ADApp/op/opi/prosilica.opi rename to andorApp/op/opi/prosilica.opi diff --git a/ADApp/op/opi/prosilicaMore.opi b/andorApp/op/opi/prosilicaMore.opi similarity index 100% rename from ADApp/op/opi/prosilicaMore.opi rename to andorApp/op/opi/prosilicaMore.opi diff --git a/ADApp/op/opi/pvCam.opi b/andorApp/op/opi/pvCam.opi similarity index 100% rename from ADApp/op/opi/pvCam.opi rename to andorApp/op/opi/pvCam.opi diff --git a/ADApp/op/opi/simDetector.opi b/andorApp/op/opi/simDetector.opi similarity index 100% rename from ADApp/op/opi/simDetector.opi rename to andorApp/op/opi/simDetector.opi diff --git a/ADApp/op/opi/simDetectorSetup.opi b/andorApp/op/opi/simDetectorSetup.opi similarity index 100% rename from ADApp/op/opi/simDetectorSetup.opi rename to andorApp/op/opi/simDetectorSetup.opi diff --git a/ADApp/op/ui/ADAttrFile.ui b/andorApp/op/ui/ADAttrFile.ui similarity index 100% rename from ADApp/op/ui/ADAttrFile.ui rename to andorApp/op/ui/ADAttrFile.ui diff --git a/ADApp/op/ui/ADBase.ui b/andorApp/op/ui/ADBase.ui similarity index 100% rename from ADApp/op/ui/ADBase.ui rename to andorApp/op/ui/ADBase.ui diff --git a/ADApp/op/ui/ADCollect.ui b/andorApp/op/ui/ADCollect.ui similarity index 100% rename from ADApp/op/ui/ADCollect.ui rename to andorApp/op/ui/ADCollect.ui diff --git a/ADApp/op/ui/ADDriverFile.ui b/andorApp/op/ui/ADDriverFile.ui similarity index 100% rename from ADApp/op/ui/ADDriverFile.ui rename to andorApp/op/ui/ADDriverFile.ui diff --git a/ADApp/op/ui/ADEpicsShutter.ui b/andorApp/op/ui/ADEpicsShutter.ui similarity index 100% rename from ADApp/op/ui/ADEpicsShutter.ui rename to andorApp/op/ui/ADEpicsShutter.ui diff --git a/ADApp/op/ui/ADPlugins.ui b/andorApp/op/ui/ADPlugins.ui similarity index 100% rename from ADApp/op/ui/ADPlugins.ui rename to andorApp/op/ui/ADPlugins.ui diff --git a/ADApp/op/ui/ADReadout.ui b/andorApp/op/ui/ADReadout.ui similarity index 100% rename from ADApp/op/ui/ADReadout.ui rename to andorApp/op/ui/ADReadout.ui diff --git a/ADApp/op/ui/ADSetup.ui b/andorApp/op/ui/ADSetup.ui similarity index 100% rename from ADApp/op/ui/ADSetup.ui rename to andorApp/op/ui/ADSetup.ui diff --git a/ADApp/op/ui/ADShutter.ui b/andorApp/op/ui/ADShutter.ui similarity index 100% rename from ADApp/op/ui/ADShutter.ui rename to andorApp/op/ui/ADShutter.ui diff --git a/ADApp/op/ui/ADTop.ui b/andorApp/op/ui/ADTop.ui similarity index 100% rename from ADApp/op/ui/ADTop.ui rename to andorApp/op/ui/ADTop.ui diff --git a/ADApp/op/ui/Andor.ui b/andorApp/op/ui/Andor.ui similarity index 100% rename from ADApp/op/ui/Andor.ui rename to andorApp/op/ui/Andor.ui diff --git a/ADApp/op/ui/Andor3.ui b/andorApp/op/ui/Andor3.ui similarity index 100% rename from ADApp/op/ui/Andor3.ui rename to andorApp/op/ui/Andor3.ui diff --git a/ADApp/op/ui/BIS.ui b/andorApp/op/ui/BIS.ui similarity index 100% rename from ADApp/op/ui/BIS.ui rename to andorApp/op/ui/BIS.ui diff --git a/ADApp/op/ui/NDColorConvert.ui b/andorApp/op/ui/NDColorConvert.ui similarity index 100% rename from ADApp/op/ui/NDColorConvert.ui rename to andorApp/op/ui/NDColorConvert.ui diff --git a/ADApp/op/ui/NDFile.ui b/andorApp/op/ui/NDFile.ui similarity index 100% rename from ADApp/op/ui/NDFile.ui rename to andorApp/op/ui/NDFile.ui diff --git a/ADApp/op/ui/NDFileHDF5.ui b/andorApp/op/ui/NDFileHDF5.ui similarity index 100% rename from ADApp/op/ui/NDFileHDF5.ui rename to andorApp/op/ui/NDFileHDF5.ui diff --git a/ADApp/op/ui/NDFileJPEG.ui b/andorApp/op/ui/NDFileJPEG.ui similarity index 100% rename from ADApp/op/ui/NDFileJPEG.ui rename to andorApp/op/ui/NDFileJPEG.ui diff --git a/ADApp/op/ui/NDFileMagick.ui b/andorApp/op/ui/NDFileMagick.ui similarity index 100% rename from ADApp/op/ui/NDFileMagick.ui rename to andorApp/op/ui/NDFileMagick.ui diff --git a/ADApp/op/ui/NDFileNetCDF.ui b/andorApp/op/ui/NDFileNetCDF.ui similarity index 100% rename from ADApp/op/ui/NDFileNetCDF.ui rename to andorApp/op/ui/NDFileNetCDF.ui diff --git a/ADApp/op/ui/NDFileNexus.ui b/andorApp/op/ui/NDFileNexus.ui similarity index 100% rename from ADApp/op/ui/NDFileNexus.ui rename to andorApp/op/ui/NDFileNexus.ui diff --git a/ADApp/op/ui/NDFileNull.ui b/andorApp/op/ui/NDFileNull.ui similarity index 100% rename from ADApp/op/ui/NDFileNull.ui rename to andorApp/op/ui/NDFileNull.ui diff --git a/ADApp/op/ui/NDFileTIFF.ui b/andorApp/op/ui/NDFileTIFF.ui similarity index 100% rename from ADApp/op/ui/NDFileTIFF.ui rename to andorApp/op/ui/NDFileTIFF.ui diff --git a/ADApp/op/ui/NDOverlay.ui b/andorApp/op/ui/NDOverlay.ui similarity index 100% rename from ADApp/op/ui/NDOverlay.ui rename to andorApp/op/ui/NDOverlay.ui diff --git a/ADApp/op/ui/NDOverlay8.ui b/andorApp/op/ui/NDOverlay8.ui similarity index 100% rename from ADApp/op/ui/NDOverlay8.ui rename to andorApp/op/ui/NDOverlay8.ui diff --git a/ADApp/op/ui/NDOverlayN.ui b/andorApp/op/ui/NDOverlayN.ui similarity index 100% rename from ADApp/op/ui/NDOverlayN.ui rename to andorApp/op/ui/NDOverlayN.ui diff --git a/ADApp/op/ui/NDPlot.ui b/andorApp/op/ui/NDPlot.ui similarity index 100% rename from ADApp/op/ui/NDPlot.ui rename to andorApp/op/ui/NDPlot.ui diff --git a/ADApp/op/ui/NDPluginBase.ui b/andorApp/op/ui/NDPluginBase.ui similarity index 100% rename from ADApp/op/ui/NDPluginBase.ui rename to andorApp/op/ui/NDPluginBase.ui diff --git a/ADApp/op/ui/NDProcess.ui b/andorApp/op/ui/NDProcess.ui similarity index 100% rename from ADApp/op/ui/NDProcess.ui rename to andorApp/op/ui/NDProcess.ui diff --git a/ADApp/op/ui/NDROI.ui b/andorApp/op/ui/NDROI.ui similarity index 100% rename from ADApp/op/ui/NDROI.ui rename to andorApp/op/ui/NDROI.ui diff --git a/ADApp/op/ui/NDROI4.ui b/andorApp/op/ui/NDROI4.ui similarity index 100% rename from ADApp/op/ui/NDROI4.ui rename to andorApp/op/ui/NDROI4.ui diff --git a/ADApp/op/ui/NDStats.ui b/andorApp/op/ui/NDStats.ui similarity index 100% rename from ADApp/op/ui/NDStats.ui rename to andorApp/op/ui/NDStats.ui diff --git a/ADApp/op/ui/NDStats5.ui b/andorApp/op/ui/NDStats5.ui similarity index 100% rename from ADApp/op/ui/NDStats5.ui rename to andorApp/op/ui/NDStats5.ui diff --git a/ADApp/op/ui/NDStdArrays.ui b/andorApp/op/ui/NDStdArrays.ui similarity index 100% rename from ADApp/op/ui/NDStdArrays.ui rename to andorApp/op/ui/NDStdArrays.ui diff --git a/ADApp/op/ui/NDTimeSeries.ui b/andorApp/op/ui/NDTimeSeries.ui similarity index 100% rename from ADApp/op/ui/NDTimeSeries.ui rename to andorApp/op/ui/NDTimeSeries.ui diff --git a/ADApp/op/ui/NDTimeSeriesAll.ui b/andorApp/op/ui/NDTimeSeriesAll.ui similarity index 100% rename from ADApp/op/ui/NDTimeSeriesAll.ui rename to andorApp/op/ui/NDTimeSeriesAll.ui diff --git a/ADApp/op/ui/NDTransform.ui b/andorApp/op/ui/NDTransform.ui similarity index 100% rename from ADApp/op/ui/NDTransform.ui rename to andorApp/op/ui/NDTransform.ui diff --git a/ADApp/op/ui/PSL.ui b/andorApp/op/ui/PSL.ui similarity index 100% rename from ADApp/op/ui/PSL.ui rename to andorApp/op/ui/PSL.ui diff --git a/ADApp/op/ui/PerkinElmer.ui b/andorApp/op/ui/PerkinElmer.ui similarity index 100% rename from ADApp/op/ui/PerkinElmer.ui rename to andorApp/op/ui/PerkinElmer.ui diff --git a/ADApp/op/ui/PerkinElmerCollect.ui b/andorApp/op/ui/PerkinElmerCollect.ui similarity index 100% rename from ADApp/op/ui/PerkinElmerCollect.ui rename to andorApp/op/ui/PerkinElmerCollect.ui diff --git a/ADApp/op/ui/PerkinElmerCorrections.ui b/andorApp/op/ui/PerkinElmerCorrections.ui similarity index 100% rename from ADApp/op/ui/PerkinElmerCorrections.ui rename to andorApp/op/ui/PerkinElmerCorrections.ui diff --git a/ADApp/op/ui/PerkinElmerInit.ui b/andorApp/op/ui/PerkinElmerInit.ui similarity index 100% rename from ADApp/op/ui/PerkinElmerInit.ui rename to andorApp/op/ui/PerkinElmerInit.ui diff --git a/ADApp/op/ui/Roper.ui b/andorApp/op/ui/Roper.ui similarity index 100% rename from ADApp/op/ui/Roper.ui rename to andorApp/op/ui/Roper.ui diff --git a/ADApp/op/ui/RoperFile.ui b/andorApp/op/ui/RoperFile.ui similarity index 100% rename from ADApp/op/ui/RoperFile.ui rename to andorApp/op/ui/RoperFile.ui diff --git a/ADApp/op/ui/URLDriver.ui b/andorApp/op/ui/URLDriver.ui similarity index 100% rename from ADApp/op/ui/URLDriver.ui rename to andorApp/op/ui/URLDriver.ui diff --git a/ADApp/op/ui/URLDriverSetup.ui b/andorApp/op/ui/URLDriverSetup.ui similarity index 100% rename from ADApp/op/ui/URLDriverSetup.ui rename to andorApp/op/ui/URLDriverSetup.ui diff --git a/ADApp/op/ui/adsc.ui b/andorApp/op/ui/adsc.ui similarity index 100% rename from ADApp/op/ui/adsc.ui rename to andorApp/op/ui/adsc.ui diff --git a/ADApp/op/ui/commonPlugins.ui b/andorApp/op/ui/commonPlugins.ui similarity index 100% rename from ADApp/op/ui/commonPlugins.ui rename to andorApp/op/ui/commonPlugins.ui diff --git a/ADApp/op/ui/firewire.ui b/andorApp/op/ui/firewire.ui similarity index 100% rename from ADApp/op/ui/firewire.ui rename to andorApp/op/ui/firewire.ui diff --git a/ADApp/op/ui/firewireFeatures.ui b/andorApp/op/ui/firewireFeatures.ui similarity index 100% rename from ADApp/op/ui/firewireFeatures.ui rename to andorApp/op/ui/firewireFeatures.ui diff --git a/ADApp/op/ui/firewireVideoFormats.ui b/andorApp/op/ui/firewireVideoFormats.ui similarity index 100% rename from ADApp/op/ui/firewireVideoFormats.ui rename to andorApp/op/ui/firewireVideoFormats.ui diff --git a/ADApp/op/ui/mar345.ui b/andorApp/op/ui/mar345.ui similarity index 100% rename from ADApp/op/ui/mar345.ui rename to andorApp/op/ui/mar345.ui diff --git a/ADApp/op/ui/marCCD.ui b/andorApp/op/ui/marCCD.ui similarity index 100% rename from ADApp/op/ui/marCCD.ui rename to andorApp/op/ui/marCCD.ui diff --git a/ADApp/op/ui/marCCDAncillary.ui b/andorApp/op/ui/marCCDAncillary.ui similarity index 100% rename from ADApp/op/ui/marCCDAncillary.ui rename to andorApp/op/ui/marCCDAncillary.ui diff --git a/ADApp/op/ui/pilatusAncillary.ui b/andorApp/op/ui/pilatusAncillary.ui similarity index 100% rename from ADApp/op/ui/pilatusAncillary.ui rename to andorApp/op/ui/pilatusAncillary.ui diff --git a/ADApp/op/ui/pilatusDetector.ui b/andorApp/op/ui/pilatusDetector.ui similarity index 100% rename from ADApp/op/ui/pilatusDetector.ui rename to andorApp/op/ui/pilatusDetector.ui diff --git a/ADApp/op/ui/prosilica.ui b/andorApp/op/ui/prosilica.ui similarity index 100% rename from ADApp/op/ui/prosilica.ui rename to andorApp/op/ui/prosilica.ui diff --git a/ADApp/op/ui/prosilicaMore.ui b/andorApp/op/ui/prosilicaMore.ui similarity index 100% rename from ADApp/op/ui/prosilicaMore.ui rename to andorApp/op/ui/prosilicaMore.ui diff --git a/ADApp/op/ui/pvCam.ui b/andorApp/op/ui/pvCam.ui similarity index 100% rename from ADApp/op/ui/pvCam.ui rename to andorApp/op/ui/pvCam.ui diff --git a/ADApp/op/ui/simDetector.ui b/andorApp/op/ui/simDetector.ui similarity index 100% rename from ADApp/op/ui/simDetector.ui rename to andorApp/op/ui/simDetector.ui diff --git a/ADApp/op/ui/simDetectorSetup.ui b/andorApp/op/ui/simDetectorSetup.ui similarity index 100% rename from ADApp/op/ui/simDetectorSetup.ui rename to andorApp/op/ui/simDetectorSetup.ui