diff --git a/iocBoot/iocvxWorks/asynRecord.substitutions b/iocBoot/iocxxx/common/asynRecord.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/asynRecord.substitutions
rename to iocBoot/iocxxx/common/asynRecord.substitutions
diff --git a/iocBoot/iocvxWorks/asynRecord_settings.req b/iocBoot/iocxxx/common/asynRecord_settings.req
similarity index 100%
rename from iocBoot/iocvxWorks/asynRecord_settings.req
rename to iocBoot/iocxxx/common/asynRecord_settings.req
diff --git a/iocBoot/iocvxWorks/calc.cmd b/iocBoot/iocxxx/common/calc.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/calc.cmd
rename to iocBoot/iocxxx/common/calc.cmd
diff --git a/iocBoot/iocvxWorks/canberra_13.substitutions b/iocBoot/iocxxx/common/canberra_13.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/canberra_13.substitutions
rename to iocBoot/iocxxx/common/canberra_13.substitutions
diff --git a/iocBoot/iocvxWorks/canberra_3.substitutions b/iocBoot/iocxxx/common/canberra_3.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/canberra_3.substitutions
rename to iocBoot/iocxxx/common/canberra_3.substitutions
diff --git a/iocBoot/iocvxWorks/fb_epid.substitutions b/iocBoot/iocxxx/common/fb_epid.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/fb_epid.substitutions
rename to iocBoot/iocxxx/common/fb_epid.substitutions
diff --git a/iocBoot/iocvxWorks/filter.substitutions b/iocBoot/iocxxx/common/filter.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/filter.substitutions
rename to iocBoot/iocxxx/common/filter.substitutions
diff --git a/iocBoot/iocLinux/motorSim.cmd b/iocBoot/iocxxx/common/motorSim.cmd
similarity index 100%
rename from iocBoot/iocLinux/motorSim.cmd
rename to iocBoot/iocxxx/common/motorSim.cmd
diff --git a/iocBoot/iocLinux/motorSim.substitutions b/iocBoot/iocxxx/common/motorSim.substitutions
similarity index 100%
rename from iocBoot/iocLinux/motorSim.substitutions
rename to iocBoot/iocxxx/common/motorSim.substitutions
diff --git a/iocBoot/iocvxWorks/omega.cmd b/iocBoot/iocxxx/common/omega.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/omega.cmd
rename to iocBoot/iocxxx/common/omega.cmd
diff --git a/iocBoot/iocvxWorks/orient_xtals.substitutions b/iocBoot/iocxxx/common/orient_xtals.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/orient_xtals.substitutions
rename to iocBoot/iocxxx/common/orient_xtals.substitutions
diff --git a/iocBoot/iocvxWorks/pid_slow.substitutions b/iocBoot/iocxxx/common/pid_slow.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/pid_slow.substitutions
rename to iocBoot/iocxxx/common/pid_slow.substitutions
diff --git a/iocBoot/iocvxWorks/pseudoMotor.substitutions b/iocBoot/iocxxx/common/pseudoMotor.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/pseudoMotor.substitutions
rename to iocBoot/iocxxx/common/pseudoMotor.substitutions
diff --git a/iocBoot/iocvxWorks/saveData.req b/iocBoot/iocxxx/common/saveData.req
similarity index 100%
rename from iocBoot/iocvxWorks/saveData.req
rename to iocBoot/iocxxx/common/saveData.req
diff --git a/iocBoot/iocvxWorks/save_restore.cmd b/iocBoot/iocxxx/common/save_restore.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/save_restore.cmd
rename to iocBoot/iocxxx/common/save_restore.cmd
diff --git a/iocBoot/iocvxWorks/scan1Menu.req b/iocBoot/iocxxx/common/scan1Menu.req
similarity index 100%
rename from iocBoot/iocvxWorks/scan1Menu.req
rename to iocBoot/iocxxx/common/scan1Menu.req
diff --git a/iocBoot/iocvxWorks/softGlue.iocsh b/iocBoot/iocxxx/common/softGlue.iocsh
similarity index 100%
rename from iocBoot/iocvxWorks/softGlue.iocsh
rename to iocBoot/iocxxx/common/softGlue.iocsh
diff --git a/iocBoot/iocvxWorks/softMotor.substitutions b/iocBoot/iocxxx/common/softMotor.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/softMotor.substitutions
rename to iocBoot/iocxxx/common/softMotor.substitutions
diff --git a/iocBoot/iocLinux/softScaler.cmd b/iocBoot/iocxxx/common/softScaler.cmd
similarity index 100%
rename from iocBoot/iocLinux/softScaler.cmd
rename to iocBoot/iocxxx/common/softScaler.cmd
diff --git a/iocBoot/iocLinux/areaDetector.cmd b/iocBoot/iocxxx/softioc/areaDetector.cmd
similarity index 100%
rename from iocBoot/iocLinux/areaDetector.cmd
rename to iocBoot/iocxxx/softioc/areaDetector.cmd
diff --git a/iocBoot/iocLinux/async_pid_slow.substitutions b/iocBoot/iocxxx/softioc/async_pid_slow.substitutions
similarity index 100%
rename from iocBoot/iocLinux/async_pid_slow.substitutions
rename to iocBoot/iocxxx/softioc/async_pid_slow.substitutions
diff --git a/iocBoot/iocLinux/canberra_1.cmd b/iocBoot/iocxxx/softioc/canberra_1.cmd
similarity index 100%
rename from iocBoot/iocLinux/canberra_1.cmd
rename to iocBoot/iocxxx/softioc/canberra_1.cmd
diff --git a/iocBoot/iocLinux/in-screen.sh b/iocBoot/iocxxx/softioc/in-screen.sh
similarity index 100%
rename from iocBoot/iocLinux/in-screen.sh
rename to iocBoot/iocxxx/softioc/in-screen.sh
diff --git a/iocBoot/iocLinux/motor.substitutions b/iocBoot/iocxxx/softioc/motor.substitutions
similarity index 100%
rename from iocBoot/iocLinux/motor.substitutions
rename to iocBoot/iocxxx/softioc/motor.substitutions
diff --git a/iocBoot/iocLinux/run b/iocBoot/iocxxx/softioc/run
similarity index 100%
rename from iocBoot/iocLinux/run
rename to iocBoot/iocxxx/softioc/run
diff --git a/iocBoot/iocLinux/scanParms.substitutions b/iocBoot/iocxxx/softioc/scanParms.substitutions
similarity index 100%
rename from iocBoot/iocLinux/scanParms.substitutions
rename to iocBoot/iocxxx/softioc/scanParms.substitutions
diff --git a/iocBoot/iocLinux/serial.cmd b/iocBoot/iocxxx/softioc/serial.cmd
similarity index 100%
rename from iocBoot/iocLinux/serial.cmd
rename to iocBoot/iocxxx/softioc/serial.cmd
diff --git a/iocBoot/iocLinux/xxx.sh b/iocBoot/iocxxx/softioc/xxx.sh
similarity index 100%
rename from iocBoot/iocLinux/xxx.sh
rename to iocBoot/iocxxx/softioc/xxx.sh
diff --git a/iocBoot/iocvxWorks/SGMenu.req b/iocBoot/iocxxx/vxWorks/SGMenu.req
similarity index 100%
rename from iocBoot/iocvxWorks/SGMenu.req
rename to iocBoot/iocxxx/vxWorks/SGMenu.req
diff --git a/iocBoot/iocvxWorks/areaDetector.cmd b/iocBoot/iocxxx/vxWorks/areaDetector.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/areaDetector.cmd
rename to iocBoot/iocxxx/vxWorks/areaDetector.cmd
diff --git a/iocBoot/iocvxWorks/async_pid_slow.substitutions b/iocBoot/iocxxx/vxWorks/async_pid_slow.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/async_pid_slow.substitutions
rename to iocBoot/iocxxx/vxWorks/async_pid_slow.substitutions
diff --git a/iocBoot/iocvxWorks/autoShutter.substitutions b/iocBoot/iocxxx/vxWorks/autoShutter.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/autoShutter.substitutions
rename to iocBoot/iocxxx/vxWorks/autoShutter.substitutions
diff --git a/iocBoot/iocvxWorks/auto_13mca_settings.req b/iocBoot/iocxxx/vxWorks/auto_13mca_settings.req
similarity index 100%
rename from iocBoot/iocvxWorks/auto_13mca_settings.req
rename to iocBoot/iocxxx/vxWorks/auto_13mca_settings.req
diff --git a/iocBoot/iocvxWorks/auto_3mca_settings.req b/iocBoot/iocxxx/vxWorks/auto_3mca_settings.req
similarity index 100%
rename from iocBoot/iocvxWorks/auto_3mca_settings.req
rename to iocBoot/iocxxx/vxWorks/auto_3mca_settings.req
diff --git a/iocBoot/iocvxWorks/bootParms b/iocBoot/iocxxx/vxWorks/bootParms
similarity index 100%
rename from iocBoot/iocvxWorks/bootParms
rename to iocBoot/iocxxx/vxWorks/bootParms
diff --git a/iocBoot/iocvxWorks/camac.cmd b/iocBoot/iocxxx/vxWorks/camac.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/camac.cmd
rename to iocBoot/iocxxx/vxWorks/camac.cmd
diff --git a/iocBoot/iocvxWorks/canberra_1.cmd b/iocBoot/iocxxx/vxWorks/canberra_1.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/canberra_1.cmd
rename to iocBoot/iocxxx/vxWorks/canberra_1.cmd
diff --git a/iocBoot/iocvxWorks/canberra_13.cmd b/iocBoot/iocxxx/vxWorks/canberra_13.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/canberra_13.cmd
rename to iocBoot/iocxxx/vxWorks/canberra_13.cmd
diff --git a/iocBoot/iocvxWorks/canberra_3.cmd b/iocBoot/iocxxx/vxWorks/canberra_3.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/canberra_3.cmd
rename to iocBoot/iocxxx/vxWorks/canberra_3.cmd
diff --git a/iocBoot/iocvxWorks/dac128V.cmd b/iocBoot/iocxxx/vxWorks/dac128V.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/dac128V.cmd
rename to iocBoot/iocxxx/vxWorks/dac128V.cmd
diff --git a/iocBoot/iocvxWorks/dac128V.substitutions b/iocBoot/iocxxx/vxWorks/dac128V.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/dac128V.substitutions
rename to iocBoot/iocxxx/vxWorks/dac128V.substitutions
diff --git a/iocBoot/iocvxWorks/femto_DxPCA_x00.substitutions b/iocBoot/iocxxx/vxWorks/femto_DxPCA_x00.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/femto_DxPCA_x00.substitutions
rename to iocBoot/iocxxx/vxWorks/femto_DxPCA_x00.substitutions
diff --git a/iocBoot/iocvxWorks/gpib.cmd b/iocBoot/iocxxx/vxWorks/gpib.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/gpib.cmd
rename to iocBoot/iocxxx/vxWorks/gpib.cmd
diff --git a/iocBoot/iocvxWorks/industryPack.cmd b/iocBoot/iocxxx/vxWorks/industryPack.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/industryPack.cmd
rename to iocBoot/iocxxx/vxWorks/industryPack.cmd
diff --git a/iocBoot/iocvxWorks/ip330.cmd b/iocBoot/iocxxx/vxWorks/ip330.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/ip330.cmd
rename to iocBoot/iocxxx/vxWorks/ip330.cmd
diff --git a/iocBoot/iocvxWorks/ip330PIDFast.substitutions b/iocBoot/iocxxx/vxWorks/ip330PIDFast.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/ip330PIDFast.substitutions
rename to iocBoot/iocxxx/vxWorks/ip330PIDFast.substitutions
diff --git a/iocBoot/iocvxWorks/ip330Scan.substitutions b/iocBoot/iocxxx/vxWorks/ip330Scan.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/ip330Scan.substitutions
rename to iocBoot/iocxxx/vxWorks/ip330Scan.substitutions
diff --git a/iocBoot/iocvxWorks/ipUnidig.cmd b/iocBoot/iocxxx/vxWorks/ipUnidig.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/ipUnidig.cmd
rename to iocBoot/iocxxx/vxWorks/ipUnidig.cmd
diff --git a/iocBoot/iocvxWorks/ipUnidig.substitutions b/iocBoot/iocxxx/vxWorks/ipUnidig.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/ipUnidig.substitutions
rename to iocBoot/iocxxx/vxWorks/ipUnidig.substitutions
diff --git a/iocBoot/iocvxWorks/motor.substitutions b/iocBoot/iocxxx/vxWorks/motor.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/motor.substitutions
rename to iocBoot/iocxxx/vxWorks/motor.substitutions
diff --git a/iocBoot/iocvxWorks/pf4bank.req b/iocBoot/iocxxx/vxWorks/pf4bank.req
similarity index 100%
rename from iocBoot/iocvxWorks/pf4bank.req
rename to iocBoot/iocxxx/vxWorks/pf4bank.req
diff --git a/iocBoot/iocvxWorks/pf4common.req b/iocBoot/iocxxx/vxWorks/pf4common.req
similarity index 100%
rename from iocBoot/iocvxWorks/pf4common.req
rename to iocBoot/iocxxx/vxWorks/pf4common.req
diff --git a/iocBoot/iocvxWorks/quadEM.cmd b/iocBoot/iocxxx/vxWorks/quadEM.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/quadEM.cmd
rename to iocBoot/iocxxx/vxWorks/quadEM.cmd
diff --git a/iocBoot/iocvxWorks/quadEM_pid.substitutions b/iocBoot/iocxxx/vxWorks/quadEM_pid.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/quadEM_pid.substitutions
rename to iocBoot/iocxxx/vxWorks/quadEM_pid.substitutions
diff --git a/iocBoot/iocvxWorks/scanParms.substitutions b/iocBoot/iocxxx/vxWorks/scanParms.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/scanParms.substitutions
rename to iocBoot/iocxxx/vxWorks/scanParms.substitutions
diff --git a/iocBoot/iocvxWorks/selector.substitutions b/iocBoot/iocxxx/vxWorks/selector.substitutions
similarity index 100%
rename from iocBoot/iocvxWorks/selector.substitutions
rename to iocBoot/iocxxx/vxWorks/selector.substitutions
diff --git a/iocBoot/iocvxWorks/serial.cmd b/iocBoot/iocxxx/vxWorks/serial.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/serial.cmd
rename to iocBoot/iocxxx/vxWorks/serial.cmd
diff --git a/iocBoot/iocvxWorks/st_SIS3801.iocsh b/iocBoot/iocxxx/vxWorks/st_SIS3801.iocsh
similarity index 100%
rename from iocBoot/iocvxWorks/st_SIS3801.iocsh
rename to iocBoot/iocxxx/vxWorks/st_SIS3801.iocsh
diff --git a/iocBoot/iocvxWorks/st_SIS3820.iocsh b/iocBoot/iocxxx/vxWorks/st_SIS3820.iocsh
similarity index 100%
rename from iocBoot/iocvxWorks/st_SIS3820.iocsh
rename to iocBoot/iocxxx/vxWorks/st_SIS3820.iocsh
diff --git a/iocBoot/iocvxWorks/vme.cmd b/iocBoot/iocxxx/vxWorks/vme.cmd
similarity index 100%
rename from iocBoot/iocvxWorks/vme.cmd
rename to iocBoot/iocxxx/vxWorks/vme.cmd