diff --git a/src/ca/CASG.cpp b/src/ca/client/CASG.cpp
similarity index 100%
rename from src/ca/CASG.cpp
rename to src/ca/client/CASG.cpp
diff --git a/src/ca/CAref.html b/src/ca/client/CAref.html
similarity index 100%
rename from src/ca/CAref.html
rename to src/ca/client/CAref.html
diff --git a/src/ca/Makefile b/src/ca/client/Makefile
similarity index 100%
rename from src/ca/Makefile
rename to src/ca/client/Makefile
diff --git a/src/ca/SearchDest.h b/src/ca/client/SearchDest.h
similarity index 100%
rename from src/ca/SearchDest.h
rename to src/ca/client/SearchDest.h
diff --git a/src/ca/access.cpp b/src/ca/client/access.cpp
similarity index 100%
rename from src/ca/access.cpp
rename to src/ca/client/access.cpp
diff --git a/src/ca/acctst.c b/src/ca/client/acctst.c
similarity index 100%
rename from src/ca/acctst.c
rename to src/ca/client/acctst.c
diff --git a/src/ca/acctstMain.c b/src/ca/client/acctstMain.c
similarity index 100%
rename from src/ca/acctstMain.c
rename to src/ca/client/acctstMain.c
diff --git a/src/ca/addrList.h b/src/ca/client/addrList.h
similarity index 100%
rename from src/ca/addrList.h
rename to src/ca/client/addrList.h
diff --git a/src/ca/autoPtrDestroy.h b/src/ca/client/autoPtrDestroy.h
similarity index 100%
rename from src/ca/autoPtrDestroy.h
rename to src/ca/client/autoPtrDestroy.h
diff --git a/src/ca/autoPtrFreeList.h b/src/ca/client/autoPtrFreeList.h
similarity index 100%
rename from src/ca/autoPtrFreeList.h
rename to src/ca/client/autoPtrFreeList.h
diff --git a/src/ca/autoPtrRecycle.h b/src/ca/client/autoPtrRecycle.h
similarity index 100%
rename from src/ca/autoPtrRecycle.h
rename to src/ca/client/autoPtrRecycle.h
diff --git a/src/ca/baseNMIU.cpp b/src/ca/client/baseNMIU.cpp
similarity index 100%
rename from src/ca/baseNMIU.cpp
rename to src/ca/client/baseNMIU.cpp
diff --git a/src/ca/bhe.cpp b/src/ca/client/bhe.cpp
similarity index 100%
rename from src/ca/bhe.cpp
rename to src/ca/client/bhe.cpp
diff --git a/src/ca/bhe.h b/src/ca/client/bhe.h
similarity index 100%
rename from src/ca/bhe.h
rename to src/ca/client/bhe.h
diff --git a/src/ca/ca.rc b/src/ca/client/ca.rc
similarity index 100%
rename from src/ca/ca.rc
rename to src/ca/client/ca.rc
diff --git a/src/ca/caConnTest.cpp b/src/ca/client/caConnTest.cpp
similarity index 100%
rename from src/ca/caConnTest.cpp
rename to src/ca/client/caConnTest.cpp
diff --git a/src/ca/caConnTestMain.cpp b/src/ca/client/caConnTestMain.cpp
similarity index 100%
rename from src/ca/caConnTestMain.cpp
rename to src/ca/client/caConnTestMain.cpp
diff --git a/src/ca/caDiagnostics.h b/src/ca/client/caDiagnostics.h
similarity index 100%
rename from src/ca/caDiagnostics.h
rename to src/ca/client/caDiagnostics.h
diff --git a/src/ca/caEventRate.cpp b/src/ca/client/caEventRate.cpp
similarity index 100%
rename from src/ca/caEventRate.cpp
rename to src/ca/client/caEventRate.cpp
diff --git a/src/ca/caEventRateMain.cpp b/src/ca/client/caEventRateMain.cpp
similarity index 100%
rename from src/ca/caEventRateMain.cpp
rename to src/ca/client/caEventRateMain.cpp
diff --git a/src/ca/caProto.h b/src/ca/client/caProto.h
similarity index 100%
rename from src/ca/caProto.h
rename to src/ca/client/caProto.h
diff --git a/src/ca/caRepeater.cpp b/src/ca/client/caRepeater.cpp
similarity index 100%
rename from src/ca/caRepeater.cpp
rename to src/ca/client/caRepeater.cpp
diff --git a/src/ca/caServerID.h b/src/ca/client/caServerID.h
similarity index 100%
rename from src/ca/caServerID.h
rename to src/ca/client/caServerID.h
diff --git a/src/ca/ca_client_context.cpp b/src/ca/client/ca_client_context.cpp
similarity index 100%
rename from src/ca/ca_client_context.cpp
rename to src/ca/client/ca_client_context.cpp
diff --git a/src/ca/cac.cpp b/src/ca/client/cac.cpp
similarity index 100%
rename from src/ca/cac.cpp
rename to src/ca/client/cac.cpp
diff --git a/src/ca/cac.h b/src/ca/client/cac.h
similarity index 100%
rename from src/ca/cac.h
rename to src/ca/client/cac.h
diff --git a/src/ca/cacChannel.cpp b/src/ca/client/cacChannel.cpp
similarity index 100%
rename from src/ca/cacChannel.cpp
rename to src/ca/client/cacChannel.cpp
diff --git a/src/ca/cacChannelNotify.cpp b/src/ca/client/cacChannelNotify.cpp
similarity index 100%
rename from src/ca/cacChannelNotify.cpp
rename to src/ca/client/cacChannelNotify.cpp
diff --git a/src/ca/cacContextNotify.cpp b/src/ca/client/cacContextNotify.cpp
similarity index 100%
rename from src/ca/cacContextNotify.cpp
rename to src/ca/client/cacContextNotify.cpp
diff --git a/src/ca/cacIO.h b/src/ca/client/cacIO.h
similarity index 100%
rename from src/ca/cacIO.h
rename to src/ca/client/cacIO.h
diff --git a/src/ca/cacReadNotify.cpp b/src/ca/client/cacReadNotify.cpp
similarity index 100%
rename from src/ca/cacReadNotify.cpp
rename to src/ca/client/cacReadNotify.cpp
diff --git a/src/ca/cacStateNotify.cpp b/src/ca/client/cacStateNotify.cpp
similarity index 100%
rename from src/ca/cacStateNotify.cpp
rename to src/ca/client/cacStateNotify.cpp
diff --git a/src/ca/cacWriteNotify.cpp b/src/ca/client/cacWriteNotify.cpp
similarity index 100%
rename from src/ca/cacWriteNotify.cpp
rename to src/ca/client/cacWriteNotify.cpp
diff --git a/src/ca/cadef.h b/src/ca/client/cadef.h
similarity index 100%
rename from src/ca/cadef.h
rename to src/ca/client/cadef.h
diff --git a/src/ca/caerr.h b/src/ca/client/caerr.h
similarity index 100%
rename from src/ca/caerr.h
rename to src/ca/client/caerr.h
diff --git a/src/ca/caeventmask.h b/src/ca/client/caeventmask.h
similarity index 100%
rename from src/ca/caeventmask.h
rename to src/ca/client/caeventmask.h
diff --git a/src/ca/casw.cpp b/src/ca/client/casw.cpp
similarity index 100%
rename from src/ca/casw.cpp
rename to src/ca/client/casw.cpp
diff --git a/src/ca/catime.c b/src/ca/client/catime.c
similarity index 100%
rename from src/ca/catime.c
rename to src/ca/client/catime.c
diff --git a/src/ca/catimeMain.c b/src/ca/client/catimeMain.c
similarity index 100%
rename from src/ca/catimeMain.c
rename to src/ca/client/catimeMain.c
diff --git a/src/ca/comBuf.cpp b/src/ca/client/comBuf.cpp
similarity index 100%
rename from src/ca/comBuf.cpp
rename to src/ca/client/comBuf.cpp
diff --git a/src/ca/comBuf.h b/src/ca/client/comBuf.h
similarity index 100%
rename from src/ca/comBuf.h
rename to src/ca/client/comBuf.h
diff --git a/src/ca/comQueRecv.cpp b/src/ca/client/comQueRecv.cpp
similarity index 100%
rename from src/ca/comQueRecv.cpp
rename to src/ca/client/comQueRecv.cpp
diff --git a/src/ca/comQueRecv.h b/src/ca/client/comQueRecv.h
similarity index 100%
rename from src/ca/comQueRecv.h
rename to src/ca/client/comQueRecv.h
diff --git a/src/ca/comQueSend.cpp b/src/ca/client/comQueSend.cpp
similarity index 100%
rename from src/ca/comQueSend.cpp
rename to src/ca/client/comQueSend.cpp
diff --git a/src/ca/comQueSend.h b/src/ca/client/comQueSend.h
similarity index 100%
rename from src/ca/comQueSend.h
rename to src/ca/client/comQueSend.h
diff --git a/src/ca/convert.cpp b/src/ca/client/convert.cpp
similarity index 100%
rename from src/ca/convert.cpp
rename to src/ca/client/convert.cpp
diff --git a/src/ca/db_access.h b/src/ca/client/db_access.h
similarity index 100%
rename from src/ca/db_access.h
rename to src/ca/client/db_access.h
diff --git a/src/ca/disconnectGovernorTimer.cpp b/src/ca/client/disconnectGovernorTimer.cpp
similarity index 100%
rename from src/ca/disconnectGovernorTimer.cpp
rename to src/ca/client/disconnectGovernorTimer.cpp
diff --git a/src/ca/disconnectGovernorTimer.h b/src/ca/client/disconnectGovernorTimer.h
similarity index 100%
rename from src/ca/disconnectGovernorTimer.h
rename to src/ca/client/disconnectGovernorTimer.h
diff --git a/src/ca/evtime.c b/src/ca/client/evtime.c
similarity index 100%
rename from src/ca/evtime.c
rename to src/ca/client/evtime.c
diff --git a/src/ca/future_work.txt b/src/ca/client/future_work.txt
similarity index 100%
rename from src/ca/future_work.txt
rename to src/ca/client/future_work.txt
diff --git a/src/ca/getCallback.cpp b/src/ca/client/getCallback.cpp
similarity index 100%
rename from src/ca/getCallback.cpp
rename to src/ca/client/getCallback.cpp
diff --git a/src/ca/getCopy.cpp b/src/ca/client/getCopy.cpp
similarity index 100%
rename from src/ca/getCopy.cpp
rename to src/ca/client/getCopy.cpp
diff --git a/src/ca/hostNameCache.cpp b/src/ca/client/hostNameCache.cpp
similarity index 100%
rename from src/ca/hostNameCache.cpp
rename to src/ca/client/hostNameCache.cpp
diff --git a/src/ca/hostNameCache.h b/src/ca/client/hostNameCache.h
similarity index 100%
rename from src/ca/hostNameCache.h
rename to src/ca/client/hostNameCache.h
diff --git a/src/ca/inetAddrID.h b/src/ca/client/inetAddrID.h
similarity index 100%
rename from src/ca/inetAddrID.h
rename to src/ca/client/inetAddrID.h
diff --git a/src/ca/iocinf.cpp b/src/ca/client/iocinf.cpp
similarity index 100%
rename from src/ca/iocinf.cpp
rename to src/ca/client/iocinf.cpp
diff --git a/src/ca/iocinf.h b/src/ca/client/iocinf.h
similarity index 100%
rename from src/ca/iocinf.h
rename to src/ca/client/iocinf.h
diff --git a/src/ca/localHostName.cpp b/src/ca/client/localHostName.cpp
similarity index 100%
rename from src/ca/localHostName.cpp
rename to src/ca/client/localHostName.cpp
diff --git a/src/ca/localHostName.h b/src/ca/client/localHostName.h
similarity index 100%
rename from src/ca/localHostName.h
rename to src/ca/client/localHostName.h
diff --git a/src/ca/msgForMultiplyDefinedPV.cpp b/src/ca/client/msgForMultiplyDefinedPV.cpp
similarity index 100%
rename from src/ca/msgForMultiplyDefinedPV.cpp
rename to src/ca/client/msgForMultiplyDefinedPV.cpp
diff --git a/src/ca/msgForMultiplyDefinedPV.h b/src/ca/client/msgForMultiplyDefinedPV.h
similarity index 100%
rename from src/ca/msgForMultiplyDefinedPV.h
rename to src/ca/client/msgForMultiplyDefinedPV.h
diff --git a/src/ca/nciu.cpp b/src/ca/client/nciu.cpp
similarity index 100%
rename from src/ca/nciu.cpp
rename to src/ca/client/nciu.cpp
diff --git a/src/ca/nciu.h b/src/ca/client/nciu.h
similarity index 100%
rename from src/ca/nciu.h
rename to src/ca/client/nciu.h
diff --git a/src/ca/netIO.h b/src/ca/client/netIO.h
similarity index 100%
rename from src/ca/netIO.h
rename to src/ca/client/netIO.h
diff --git a/src/ca/netReadNotifyIO.cpp b/src/ca/client/netReadNotifyIO.cpp
similarity index 100%
rename from src/ca/netReadNotifyIO.cpp
rename to src/ca/client/netReadNotifyIO.cpp
diff --git a/src/ca/netSubscription.cpp b/src/ca/client/netSubscription.cpp
similarity index 100%
rename from src/ca/netSubscription.cpp
rename to src/ca/client/netSubscription.cpp
diff --git a/src/ca/netWriteNotifyIO.cpp b/src/ca/client/netWriteNotifyIO.cpp
similarity index 100%
rename from src/ca/netWriteNotifyIO.cpp
rename to src/ca/client/netWriteNotifyIO.cpp
diff --git a/src/ca/net_convert.h b/src/ca/client/net_convert.h
similarity index 100%
rename from src/ca/net_convert.h
rename to src/ca/client/net_convert.h
diff --git a/src/ca/netiiu.cpp b/src/ca/client/netiiu.cpp
similarity index 100%
rename from src/ca/netiiu.cpp
rename to src/ca/client/netiiu.cpp
diff --git a/src/ca/netiiu.h b/src/ca/client/netiiu.h
similarity index 100%
rename from src/ca/netiiu.h
rename to src/ca/client/netiiu.h
diff --git a/src/ca/noopiiu.cpp b/src/ca/client/noopiiu.cpp
similarity index 100%
rename from src/ca/noopiiu.cpp
rename to src/ca/client/noopiiu.cpp
diff --git a/src/ca/noopiiu.h b/src/ca/client/noopiiu.h
similarity index 100%
rename from src/ca/noopiiu.h
rename to src/ca/client/noopiiu.h
diff --git a/src/ca/oldAccess.h b/src/ca/client/oldAccess.h
similarity index 100%
rename from src/ca/oldAccess.h
rename to src/ca/client/oldAccess.h
diff --git a/src/ca/oldChannelNotify.cpp b/src/ca/client/oldChannelNotify.cpp
similarity index 100%
rename from src/ca/oldChannelNotify.cpp
rename to src/ca/client/oldChannelNotify.cpp
diff --git a/src/ca/oldSubscription.cpp b/src/ca/client/oldSubscription.cpp
similarity index 100%
rename from src/ca/oldSubscription.cpp
rename to src/ca/client/oldSubscription.cpp
diff --git a/src/cap5/CA.pm b/src/ca/client/perl/CA.pm
similarity index 100%
rename from src/cap5/CA.pm
rename to src/ca/client/perl/CA.pm
diff --git a/src/cap5/Cap5.xs b/src/ca/client/perl/Cap5.xs
similarity index 100%
rename from src/cap5/Cap5.xs
rename to src/ca/client/perl/Cap5.xs
diff --git a/src/cap5/Makefile b/src/ca/client/perl/Makefile
similarity index 100%
rename from src/cap5/Makefile
rename to src/ca/client/perl/Makefile
diff --git a/src/cap5/caget.pl b/src/ca/client/perl/caget.pl
similarity index 100%
rename from src/cap5/caget.pl
rename to src/ca/client/perl/caget.pl
diff --git a/src/cap5/cainfo.pl b/src/ca/client/perl/cainfo.pl
similarity index 100%
rename from src/cap5/cainfo.pl
rename to src/ca/client/perl/cainfo.pl
diff --git a/src/cap5/camonitor.pl b/src/ca/client/perl/camonitor.pl
similarity index 100%
rename from src/cap5/camonitor.pl
rename to src/ca/client/perl/camonitor.pl
diff --git a/src/cap5/capr.pl b/src/ca/client/perl/capr.pl
similarity index 100%
rename from src/cap5/capr.pl
rename to src/ca/client/perl/capr.pl
diff --git a/src/cap5/caput.pl b/src/ca/client/perl/caput.pl
similarity index 100%
rename from src/cap5/caput.pl
rename to src/ca/client/perl/caput.pl
diff --git a/src/cap5/perlConfig.pl b/src/ca/client/perl/perlConfig.pl
similarity index 100%
rename from src/cap5/perlConfig.pl
rename to src/ca/client/perl/perlConfig.pl
diff --git a/src/ca/putCallback.cpp b/src/ca/client/putCallback.cpp
similarity index 100%
rename from src/ca/putCallback.cpp
rename to src/ca/client/putCallback.cpp
diff --git a/src/ca/repeater.cpp b/src/ca/client/repeater.cpp
similarity index 100%
rename from src/ca/repeater.cpp
rename to src/ca/client/repeater.cpp
diff --git a/src/ca/repeaterClient.h b/src/ca/client/repeaterClient.h
similarity index 100%
rename from src/ca/repeaterClient.h
rename to src/ca/client/repeaterClient.h
diff --git a/src/ca/repeaterSubscribeTimer.cpp b/src/ca/client/repeaterSubscribeTimer.cpp
similarity index 100%
rename from src/ca/repeaterSubscribeTimer.cpp
rename to src/ca/client/repeaterSubscribeTimer.cpp
diff --git a/src/ca/repeaterSubscribeTimer.h b/src/ca/client/repeaterSubscribeTimer.h
similarity index 100%
rename from src/ca/repeaterSubscribeTimer.h
rename to src/ca/client/repeaterSubscribeTimer.h
diff --git a/src/ca/searchTimer.cpp b/src/ca/client/searchTimer.cpp
similarity index 100%
rename from src/ca/searchTimer.cpp
rename to src/ca/client/searchTimer.cpp
diff --git a/src/ca/searchTimer.h b/src/ca/client/searchTimer.h
similarity index 100%
rename from src/ca/searchTimer.h
rename to src/ca/client/searchTimer.h
diff --git a/src/ca/sgAutoPtr.h b/src/ca/client/sgAutoPtr.h
similarity index 100%
rename from src/ca/sgAutoPtr.h
rename to src/ca/client/sgAutoPtr.h
diff --git a/src/ca/syncGroup.h b/src/ca/client/syncGroup.h
similarity index 100%
rename from src/ca/syncGroup.h
rename to src/ca/client/syncGroup.h
diff --git a/src/ca/syncGroupNotify.cpp b/src/ca/client/syncGroupNotify.cpp
similarity index 100%
rename from src/ca/syncGroupNotify.cpp
rename to src/ca/client/syncGroupNotify.cpp
diff --git a/src/ca/syncGroupReadNotify.cpp b/src/ca/client/syncGroupReadNotify.cpp
similarity index 100%
rename from src/ca/syncGroupReadNotify.cpp
rename to src/ca/client/syncGroupReadNotify.cpp
diff --git a/src/ca/syncGroupWriteNotify.cpp b/src/ca/client/syncGroupWriteNotify.cpp
similarity index 100%
rename from src/ca/syncGroupWriteNotify.cpp
rename to src/ca/client/syncGroupWriteNotify.cpp
diff --git a/src/ca/syncgrp.cpp b/src/ca/client/syncgrp.cpp
similarity index 100%
rename from src/ca/syncgrp.cpp
rename to src/ca/client/syncgrp.cpp
diff --git a/src/ca/tcpRecvThread.cpp b/src/ca/client/tcpRecvThread.cpp
similarity index 100%
rename from src/ca/tcpRecvThread.cpp
rename to src/ca/client/tcpRecvThread.cpp
diff --git a/src/ca/tcpRecvWatchdog.cpp b/src/ca/client/tcpRecvWatchdog.cpp
similarity index 100%
rename from src/ca/tcpRecvWatchdog.cpp
rename to src/ca/client/tcpRecvWatchdog.cpp
diff --git a/src/ca/tcpRecvWatchdog.h b/src/ca/client/tcpRecvWatchdog.h
similarity index 100%
rename from src/ca/tcpRecvWatchdog.h
rename to src/ca/client/tcpRecvWatchdog.h
diff --git a/src/ca/tcpSendWatchdog.cpp b/src/ca/client/tcpSendWatchdog.cpp
similarity index 100%
rename from src/ca/tcpSendWatchdog.cpp
rename to src/ca/client/tcpSendWatchdog.cpp
diff --git a/src/ca/tcpSendWatchdog.h b/src/ca/client/tcpSendWatchdog.h
similarity index 100%
rename from src/ca/tcpSendWatchdog.h
rename to src/ca/client/tcpSendWatchdog.h
diff --git a/src/ca/tcpiiu.cpp b/src/ca/client/tcpiiu.cpp
similarity index 100%
rename from src/ca/tcpiiu.cpp
rename to src/ca/client/tcpiiu.cpp
diff --git a/src/ca/templateInstances.cpp b/src/ca/client/templateInstances.cpp
similarity index 100%
rename from src/ca/templateInstances.cpp
rename to src/ca/client/templateInstances.cpp
diff --git a/src/ca/test_event.cpp b/src/ca/client/test_event.cpp
similarity index 100%
rename from src/ca/test_event.cpp
rename to src/ca/client/test_event.cpp
diff --git a/src/catools/Makefile b/src/ca/client/tools/Makefile
similarity index 100%
rename from src/catools/Makefile
rename to src/ca/client/tools/Makefile
diff --git a/src/catools/caget.c b/src/ca/client/tools/caget.c
similarity index 100%
rename from src/catools/caget.c
rename to src/ca/client/tools/caget.c
diff --git a/src/catools/cainfo.c b/src/ca/client/tools/cainfo.c
similarity index 100%
rename from src/catools/cainfo.c
rename to src/ca/client/tools/cainfo.c
diff --git a/src/catools/camonitor.c b/src/ca/client/tools/camonitor.c
similarity index 100%
rename from src/catools/camonitor.c
rename to src/ca/client/tools/camonitor.c
diff --git a/src/catools/caput.c b/src/ca/client/tools/caput.c
similarity index 100%
rename from src/catools/caput.c
rename to src/ca/client/tools/caput.c
diff --git a/src/catools/tool_lib.c b/src/ca/client/tools/tool_lib.c
similarity index 100%
rename from src/catools/tool_lib.c
rename to src/ca/client/tools/tool_lib.c
diff --git a/src/catools/tool_lib.h b/src/ca/client/tools/tool_lib.h
similarity index 100%
rename from src/catools/tool_lib.h
rename to src/ca/client/tools/tool_lib.h
diff --git a/src/ca/ucx.h b/src/ca/client/ucx.h
similarity index 100%
rename from src/ca/ucx.h
rename to src/ca/client/ucx.h
diff --git a/src/ca/udpiiu.cpp b/src/ca/client/udpiiu.cpp
similarity index 100%
rename from src/ca/udpiiu.cpp
rename to src/ca/client/udpiiu.cpp
diff --git a/src/ca/udpiiu.h b/src/ca/client/udpiiu.h
similarity index 100%
rename from src/ca/udpiiu.h
rename to src/ca/client/udpiiu.h
diff --git a/src/ca/virtualCircuit.h b/src/ca/client/virtualCircuit.h
similarity index 100%
rename from src/ca/virtualCircuit.h
rename to src/ca/client/virtualCircuit.h
diff --git a/src/gdd/Makefile b/src/ca/legacy/gdd/Makefile
similarity index 100%
rename from src/gdd/Makefile
rename to src/ca/legacy/gdd/Makefile
diff --git a/src/gdd/README b/src/ca/legacy/gdd/README
similarity index 100%
rename from src/gdd/README
rename to src/ca/legacy/gdd/README
diff --git a/src/gdd/aitConvert.cc b/src/ca/legacy/gdd/aitConvert.cc
similarity index 100%
rename from src/gdd/aitConvert.cc
rename to src/ca/legacy/gdd/aitConvert.cc
diff --git a/src/gdd/aitConvert.h b/src/ca/legacy/gdd/aitConvert.h
similarity index 100%
rename from src/gdd/aitConvert.h
rename to src/ca/legacy/gdd/aitConvert.h
diff --git a/src/gdd/aitGen.c b/src/ca/legacy/gdd/aitGen.c
similarity index 100%
rename from src/gdd/aitGen.c
rename to src/ca/legacy/gdd/aitGen.c
diff --git a/src/gdd/aitHelpers.cc b/src/ca/legacy/gdd/aitHelpers.cc
similarity index 100%
rename from src/gdd/aitHelpers.cc
rename to src/ca/legacy/gdd/aitHelpers.cc
diff --git a/src/gdd/aitHelpers.h b/src/ca/legacy/gdd/aitHelpers.h
similarity index 100%
rename from src/gdd/aitHelpers.h
rename to src/ca/legacy/gdd/aitHelpers.h
diff --git a/src/gdd/aitTypes.c b/src/ca/legacy/gdd/aitTypes.c
similarity index 100%
rename from src/gdd/aitTypes.c
rename to src/ca/legacy/gdd/aitTypes.c
diff --git a/src/gdd/aitTypes.h b/src/ca/legacy/gdd/aitTypes.h
similarity index 100%
rename from src/gdd/aitTypes.h
rename to src/ca/legacy/gdd/aitTypes.h
diff --git a/src/gdd/dbMapper.cc b/src/ca/legacy/gdd/dbMapper.cc
similarity index 100%
rename from src/gdd/dbMapper.cc
rename to src/ca/legacy/gdd/dbMapper.cc
diff --git a/src/gdd/dbMapper.h b/src/ca/legacy/gdd/dbMapper.h
similarity index 100%
rename from src/gdd/dbMapper.h
rename to src/ca/legacy/gdd/dbMapper.h
diff --git a/src/gdd/gdd.cc b/src/ca/legacy/gdd/gdd.cc
similarity index 100%
rename from src/gdd/gdd.cc
rename to src/ca/legacy/gdd/gdd.cc
diff --git a/src/gdd/gdd.gif b/src/ca/legacy/gdd/gdd.gif
similarity index 100%
rename from src/gdd/gdd.gif
rename to src/ca/legacy/gdd/gdd.gif
diff --git a/src/gdd/gdd.h b/src/ca/legacy/gdd/gdd.h
similarity index 100%
rename from src/gdd/gdd.h
rename to src/ca/legacy/gdd/gdd.h
diff --git a/src/gdd/gdd.html b/src/ca/legacy/gdd/gdd.html
similarity index 100%
rename from src/gdd/gdd.html
rename to src/ca/legacy/gdd/gdd.html
diff --git a/src/gdd/gdd.rc b/src/ca/legacy/gdd/gdd.rc
similarity index 100%
rename from src/gdd/gdd.rc
rename to src/ca/legacy/gdd/gdd.rc
diff --git a/src/gdd/gddAppDefs.cc b/src/ca/legacy/gdd/gddAppDefs.cc
similarity index 100%
rename from src/gdd/gddAppDefs.cc
rename to src/ca/legacy/gdd/gddAppDefs.cc
diff --git a/src/gdd/gddAppFuncTable.h b/src/ca/legacy/gdd/gddAppFuncTable.h
similarity index 100%
rename from src/gdd/gddAppFuncTable.h
rename to src/ca/legacy/gdd/gddAppFuncTable.h
diff --git a/src/gdd/gddAppTable.cc b/src/ca/legacy/gdd/gddAppTable.cc
similarity index 100%
rename from src/gdd/gddAppTable.cc
rename to src/ca/legacy/gdd/gddAppTable.cc
diff --git a/src/gdd/gddAppTable.h b/src/ca/legacy/gdd/gddAppTable.h
similarity index 100%
rename from src/gdd/gddAppTable.h
rename to src/ca/legacy/gdd/gddAppTable.h
diff --git a/src/gdd/gddArray.cc b/src/ca/legacy/gdd/gddArray.cc
similarity index 100%
rename from src/gdd/gddArray.cc
rename to src/ca/legacy/gdd/gddArray.cc
diff --git a/src/gdd/gddArray.h b/src/ca/legacy/gdd/gddArray.h
similarity index 100%
rename from src/gdd/gddArray.h
rename to src/ca/legacy/gdd/gddArray.h
diff --git a/src/gdd/gddArrayI.h b/src/ca/legacy/gdd/gddArrayI.h
similarity index 100%
rename from src/gdd/gddArrayI.h
rename to src/ca/legacy/gdd/gddArrayI.h
diff --git a/src/gdd/gddContainer.cc b/src/ca/legacy/gdd/gddContainer.cc
similarity index 100%
rename from src/gdd/gddContainer.cc
rename to src/ca/legacy/gdd/gddContainer.cc
diff --git a/src/gdd/gddContainer.h b/src/ca/legacy/gdd/gddContainer.h
similarity index 100%
rename from src/gdd/gddContainer.h
rename to src/ca/legacy/gdd/gddContainer.h
diff --git a/src/gdd/gddContainerI.h b/src/ca/legacy/gdd/gddContainerI.h
similarity index 100%
rename from src/gdd/gddContainerI.h
rename to src/ca/legacy/gdd/gddContainerI.h
diff --git a/src/gdd/gddEnumStringTable.cc b/src/ca/legacy/gdd/gddEnumStringTable.cc
similarity index 100%
rename from src/gdd/gddEnumStringTable.cc
rename to src/ca/legacy/gdd/gddEnumStringTable.cc
diff --git a/src/gdd/gddEnumStringTable.h b/src/ca/legacy/gdd/gddEnumStringTable.h
similarity index 100%
rename from src/gdd/gddEnumStringTable.h
rename to src/ca/legacy/gdd/gddEnumStringTable.h
diff --git a/src/gdd/gddErrorCodes.cc b/src/ca/legacy/gdd/gddErrorCodes.cc
similarity index 100%
rename from src/gdd/gddErrorCodes.cc
rename to src/ca/legacy/gdd/gddErrorCodes.cc
diff --git a/src/gdd/gddErrorCodes.h b/src/ca/legacy/gdd/gddErrorCodes.h
similarity index 100%
rename from src/gdd/gddErrorCodes.h
rename to src/ca/legacy/gdd/gddErrorCodes.h
diff --git a/src/gdd/gddI.h b/src/ca/legacy/gdd/gddI.h
similarity index 100%
rename from src/gdd/gddI.h
rename to src/ca/legacy/gdd/gddI.h
diff --git a/src/gdd/gddNewDel.cc b/src/ca/legacy/gdd/gddNewDel.cc
similarity index 100%
rename from src/gdd/gddNewDel.cc
rename to src/ca/legacy/gdd/gddNewDel.cc
diff --git a/src/gdd/gddNewDel.h b/src/ca/legacy/gdd/gddNewDel.h
similarity index 100%
rename from src/gdd/gddNewDel.h
rename to src/ca/legacy/gdd/gddNewDel.h
diff --git a/src/gdd/gddScalar.h b/src/ca/legacy/gdd/gddScalar.h
similarity index 100%
rename from src/gdd/gddScalar.h
rename to src/ca/legacy/gdd/gddScalar.h
diff --git a/src/gdd/gddScalarI.h b/src/ca/legacy/gdd/gddScalarI.h
similarity index 100%
rename from src/gdd/gddScalarI.h
rename to src/ca/legacy/gdd/gddScalarI.h
diff --git a/src/gdd/gddTest.cc b/src/ca/legacy/gdd/gddTest.cc
similarity index 100%
rename from src/gdd/gddTest.cc
rename to src/ca/legacy/gdd/gddTest.cc
diff --git a/src/gdd/gddUtils.cc b/src/ca/legacy/gdd/gddUtils.cc
similarity index 100%
rename from src/gdd/gddUtils.cc
rename to src/ca/legacy/gdd/gddUtils.cc
diff --git a/src/gdd/gddUtils.h b/src/ca/legacy/gdd/gddUtils.h
similarity index 100%
rename from src/gdd/gddUtils.h
rename to src/ca/legacy/gdd/gddUtils.h
diff --git a/src/gdd/gddUtilsI.h b/src/ca/legacy/gdd/gddUtilsI.h
similarity index 100%
rename from src/gdd/gddUtilsI.h
rename to src/ca/legacy/gdd/gddUtilsI.h
diff --git a/src/gdd/gddref.html b/src/ca/legacy/gdd/gddref.html
similarity index 100%
rename from src/gdd/gddref.html
rename to src/ca/legacy/gdd/gddref.html
diff --git a/src/gdd/gddref2.html b/src/ca/legacy/gdd/gddref2.html
similarity index 100%
rename from src/gdd/gddref2.html
rename to src/ca/legacy/gdd/gddref2.html
diff --git a/src/gdd/genApps.cc b/src/ca/legacy/gdd/genApps.cc
similarity index 100%
rename from src/gdd/genApps.cc
rename to src/ca/legacy/gdd/genApps.cc
diff --git a/src/gdd/smartGDDPointer.h b/src/ca/legacy/gdd/smartGDDPointer.h
similarity index 100%
rename from src/gdd/smartGDDPointer.h
rename to src/ca/legacy/gdd/smartGDDPointer.h
diff --git a/src/cas/Makefile b/src/ca/legacy/pcas/Makefile
similarity index 100%
rename from src/cas/Makefile
rename to src/ca/legacy/pcas/Makefile
diff --git a/src/cas/README b/src/ca/legacy/pcas/README
similarity index 100%
rename from src/cas/README
rename to src/ca/legacy/pcas/README
diff --git a/src/cas/RELEASE_NOTES b/src/ca/legacy/pcas/RELEASE_NOTES
similarity index 100%
rename from src/cas/RELEASE_NOTES
rename to src/ca/legacy/pcas/RELEASE_NOTES
diff --git a/src/cas/build/Makefile b/src/ca/legacy/pcas/build/Makefile
similarity index 100%
rename from src/cas/build/Makefile
rename to src/ca/legacy/pcas/build/Makefile
diff --git a/src/cas/build/cas.rc b/src/ca/legacy/pcas/build/cas.rc
similarity index 100%
rename from src/cas/build/cas.rc
rename to src/ca/legacy/pcas/build/cas.rc
diff --git a/src/excas/Makefile b/src/ca/legacy/pcas/ex/Makefile
similarity index 100%
rename from src/excas/Makefile
rename to src/ca/legacy/pcas/ex/Makefile
diff --git a/src/cas/example/Makefile b/src/ca/legacy/pcas/example/Makefile
similarity index 100%
rename from src/cas/example/Makefile
rename to src/ca/legacy/pcas/example/Makefile
diff --git a/src/cas/example/README b/src/ca/legacy/pcas/example/README
similarity index 100%
rename from src/cas/example/README
rename to src/ca/legacy/pcas/example/README
diff --git a/src/cas/example/directoryService/Makefile b/src/ca/legacy/pcas/example/directoryService/Makefile
similarity index 100%
rename from src/cas/example/directoryService/Makefile
rename to src/ca/legacy/pcas/example/directoryService/Makefile
diff --git a/src/cas/example/directoryService/README b/src/ca/legacy/pcas/example/directoryService/README
similarity index 100%
rename from src/cas/example/directoryService/README
rename to src/ca/legacy/pcas/example/directoryService/README
diff --git a/src/cas/example/directoryService/directoryServer.cc b/src/ca/legacy/pcas/example/directoryService/directoryServer.cc
similarity index 100%
rename from src/cas/example/directoryService/directoryServer.cc
rename to src/ca/legacy/pcas/example/directoryService/directoryServer.cc
diff --git a/src/cas/example/directoryService/directoryServer.h b/src/ca/legacy/pcas/example/directoryService/directoryServer.h
similarity index 100%
rename from src/cas/example/directoryService/directoryServer.h
rename to src/ca/legacy/pcas/example/directoryService/directoryServer.h
diff --git a/src/cas/example/directoryService/main.cc b/src/ca/legacy/pcas/example/directoryService/main.cc
similarity index 100%
rename from src/cas/example/directoryService/main.cc
rename to src/ca/legacy/pcas/example/directoryService/main.cc
diff --git a/src/cas/example/directoryService/pvDirectory.txt b/src/ca/legacy/pcas/example/directoryService/pvDirectory.txt
similarity index 100%
rename from src/cas/example/directoryService/pvDirectory.txt
rename to src/ca/legacy/pcas/example/directoryService/pvDirectory.txt
diff --git a/src/cas/example/directoryService/test.adl b/src/ca/legacy/pcas/example/directoryService/test.adl
similarity index 100%
rename from src/cas/example/directoryService/test.adl
rename to src/ca/legacy/pcas/example/directoryService/test.adl
diff --git a/src/cas/example/directoryService/vxEntry.cc b/src/ca/legacy/pcas/example/directoryService/vxEntry.cc
similarity index 100%
rename from src/cas/example/directoryService/vxEntry.cc
rename to src/ca/legacy/pcas/example/directoryService/vxEntry.cc
diff --git a/src/cas/generic/README b/src/ca/legacy/pcas/generic/README
similarity index 100%
rename from src/cas/generic/README
rename to src/ca/legacy/pcas/generic/README
diff --git a/src/cas/generic/beaconAnomalyGovernor.cc b/src/ca/legacy/pcas/generic/beaconAnomalyGovernor.cc
similarity index 100%
rename from src/cas/generic/beaconAnomalyGovernor.cc
rename to src/ca/legacy/pcas/generic/beaconAnomalyGovernor.cc
diff --git a/src/cas/generic/beaconAnomalyGovernor.h b/src/ca/legacy/pcas/generic/beaconAnomalyGovernor.h
similarity index 100%
rename from src/cas/generic/beaconAnomalyGovernor.h
rename to src/ca/legacy/pcas/generic/beaconAnomalyGovernor.h
diff --git a/src/cas/generic/beaconTimer.cc b/src/ca/legacy/pcas/generic/beaconTimer.cc
similarity index 100%
rename from src/cas/generic/beaconTimer.cc
rename to src/ca/legacy/pcas/generic/beaconTimer.cc
diff --git a/src/cas/generic/beaconTimer.h b/src/ca/legacy/pcas/generic/beaconTimer.h
similarity index 100%
rename from src/cas/generic/beaconTimer.h
rename to src/ca/legacy/pcas/generic/beaconTimer.h
diff --git a/src/cas/generic/caHdrLargeArray.h b/src/ca/legacy/pcas/generic/caHdrLargeArray.h
similarity index 100%
rename from src/cas/generic/caHdrLargeArray.h
rename to src/ca/legacy/pcas/generic/caHdrLargeArray.h
diff --git a/src/cas/generic/caNetAddr.cc b/src/ca/legacy/pcas/generic/caNetAddr.cc
similarity index 100%
rename from src/cas/generic/caNetAddr.cc
rename to src/ca/legacy/pcas/generic/caNetAddr.cc
diff --git a/src/cas/generic/caNetAddr.h b/src/ca/legacy/pcas/generic/caNetAddr.h
similarity index 100%
rename from src/cas/generic/caNetAddr.h
rename to src/ca/legacy/pcas/generic/caNetAddr.h
diff --git a/src/cas/generic/caServer.cc b/src/ca/legacy/pcas/generic/caServer.cc
similarity index 100%
rename from src/cas/generic/caServer.cc
rename to src/ca/legacy/pcas/generic/caServer.cc
diff --git a/src/cas/generic/caServerDefs.h b/src/ca/legacy/pcas/generic/caServerDefs.h
similarity index 100%
rename from src/cas/generic/caServerDefs.h
rename to src/ca/legacy/pcas/generic/caServerDefs.h
diff --git a/src/cas/generic/caServerI.cc b/src/ca/legacy/pcas/generic/caServerI.cc
similarity index 100%
rename from src/cas/generic/caServerI.cc
rename to src/ca/legacy/pcas/generic/caServerI.cc
diff --git a/src/cas/generic/caServerI.h b/src/ca/legacy/pcas/generic/caServerI.h
similarity index 100%
rename from src/cas/generic/caServerI.h
rename to src/ca/legacy/pcas/generic/caServerI.h
diff --git a/src/cas/generic/casAddr.h b/src/ca/legacy/pcas/generic/casAddr.h
similarity index 100%
rename from src/cas/generic/casAddr.h
rename to src/ca/legacy/pcas/generic/casAddr.h
diff --git a/src/cas/generic/casAsyncIOI.cc b/src/ca/legacy/pcas/generic/casAsyncIOI.cc
similarity index 100%
rename from src/cas/generic/casAsyncIOI.cc
rename to src/ca/legacy/pcas/generic/casAsyncIOI.cc
diff --git a/src/cas/generic/casAsyncIOI.h b/src/ca/legacy/pcas/generic/casAsyncIOI.h
similarity index 100%
rename from src/cas/generic/casAsyncIOI.h
rename to src/ca/legacy/pcas/generic/casAsyncIOI.h
diff --git a/src/cas/generic/casAsyncPVAttachIO.cc b/src/ca/legacy/pcas/generic/casAsyncPVAttachIO.cc
similarity index 100%
rename from src/cas/generic/casAsyncPVAttachIO.cc
rename to src/ca/legacy/pcas/generic/casAsyncPVAttachIO.cc
diff --git a/src/cas/generic/casAsyncPVAttachIOI.cpp b/src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.cpp
similarity index 100%
rename from src/cas/generic/casAsyncPVAttachIOI.cpp
rename to src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.cpp
diff --git a/src/cas/generic/casAsyncPVAttachIOI.h b/src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.h
similarity index 100%
rename from src/cas/generic/casAsyncPVAttachIOI.h
rename to src/ca/legacy/pcas/generic/casAsyncPVAttachIOI.h
diff --git a/src/cas/generic/casAsyncPVExistIO.cc b/src/ca/legacy/pcas/generic/casAsyncPVExistIO.cc
similarity index 100%
rename from src/cas/generic/casAsyncPVExistIO.cc
rename to src/ca/legacy/pcas/generic/casAsyncPVExistIO.cc
diff --git a/src/cas/generic/casAsyncPVExistIOI.cpp b/src/ca/legacy/pcas/generic/casAsyncPVExistIOI.cpp
similarity index 100%
rename from src/cas/generic/casAsyncPVExistIOI.cpp
rename to src/ca/legacy/pcas/generic/casAsyncPVExistIOI.cpp
diff --git a/src/cas/generic/casAsyncPVExistIOI.h b/src/ca/legacy/pcas/generic/casAsyncPVExistIOI.h
similarity index 100%
rename from src/cas/generic/casAsyncPVExistIOI.h
rename to src/ca/legacy/pcas/generic/casAsyncPVExistIOI.h
diff --git a/src/cas/generic/casAsyncReadIO.cc b/src/ca/legacy/pcas/generic/casAsyncReadIO.cc
similarity index 100%
rename from src/cas/generic/casAsyncReadIO.cc
rename to src/ca/legacy/pcas/generic/casAsyncReadIO.cc
diff --git a/src/cas/generic/casAsyncReadIOI.cc b/src/ca/legacy/pcas/generic/casAsyncReadIOI.cc
similarity index 100%
rename from src/cas/generic/casAsyncReadIOI.cc
rename to src/ca/legacy/pcas/generic/casAsyncReadIOI.cc
diff --git a/src/cas/generic/casAsyncReadIOI.h b/src/ca/legacy/pcas/generic/casAsyncReadIOI.h
similarity index 100%
rename from src/cas/generic/casAsyncReadIOI.h
rename to src/ca/legacy/pcas/generic/casAsyncReadIOI.h
diff --git a/src/cas/generic/casAsyncWriteIO.cc b/src/ca/legacy/pcas/generic/casAsyncWriteIO.cc
similarity index 100%
rename from src/cas/generic/casAsyncWriteIO.cc
rename to src/ca/legacy/pcas/generic/casAsyncWriteIO.cc
diff --git a/src/cas/generic/casAsyncWriteIOI.cpp b/src/ca/legacy/pcas/generic/casAsyncWriteIOI.cpp
similarity index 100%
rename from src/cas/generic/casAsyncWriteIOI.cpp
rename to src/ca/legacy/pcas/generic/casAsyncWriteIOI.cpp
diff --git a/src/cas/generic/casAsyncWriteIOI.h b/src/ca/legacy/pcas/generic/casAsyncWriteIOI.h
similarity index 100%
rename from src/cas/generic/casAsyncWriteIOI.h
rename to src/ca/legacy/pcas/generic/casAsyncWriteIOI.h
diff --git a/src/cas/generic/casBufferFactory.cpp b/src/ca/legacy/pcas/generic/casBufferFactory.cpp
similarity index 100%
rename from src/cas/generic/casBufferFactory.cpp
rename to src/ca/legacy/pcas/generic/casBufferFactory.cpp
diff --git a/src/cas/generic/casChannel.cc b/src/ca/legacy/pcas/generic/casChannel.cc
similarity index 100%
rename from src/cas/generic/casChannel.cc
rename to src/ca/legacy/pcas/generic/casChannel.cc
diff --git a/src/cas/generic/casChannelI.cc b/src/ca/legacy/pcas/generic/casChannelI.cc
similarity index 100%
rename from src/cas/generic/casChannelI.cc
rename to src/ca/legacy/pcas/generic/casChannelI.cc
diff --git a/src/cas/generic/casChannelI.h b/src/ca/legacy/pcas/generic/casChannelI.h
similarity index 100%
rename from src/cas/generic/casChannelI.h
rename to src/ca/legacy/pcas/generic/casChannelI.h
diff --git a/src/cas/generic/casCoreClient.cc b/src/ca/legacy/pcas/generic/casCoreClient.cc
similarity index 100%
rename from src/cas/generic/casCoreClient.cc
rename to src/ca/legacy/pcas/generic/casCoreClient.cc
diff --git a/src/cas/generic/casCoreClient.h b/src/ca/legacy/pcas/generic/casCoreClient.h
similarity index 100%
rename from src/cas/generic/casCoreClient.h
rename to src/ca/legacy/pcas/generic/casCoreClient.h
diff --git a/src/cas/generic/casCtx.cc b/src/ca/legacy/pcas/generic/casCtx.cc
similarity index 100%
rename from src/cas/generic/casCtx.cc
rename to src/ca/legacy/pcas/generic/casCtx.cc
diff --git a/src/cas/generic/casCtx.h b/src/ca/legacy/pcas/generic/casCtx.h
similarity index 100%
rename from src/cas/generic/casCtx.h
rename to src/ca/legacy/pcas/generic/casCtx.h
diff --git a/src/cas/generic/casCtxIL.h b/src/ca/legacy/pcas/generic/casCtxIL.h
similarity index 100%
rename from src/cas/generic/casCtxIL.h
rename to src/ca/legacy/pcas/generic/casCtxIL.h
diff --git a/src/cas/generic/casDGClient.cc b/src/ca/legacy/pcas/generic/casDGClient.cc
similarity index 100%
rename from src/cas/generic/casDGClient.cc
rename to src/ca/legacy/pcas/generic/casDGClient.cc
diff --git a/src/cas/generic/casDGClient.h b/src/ca/legacy/pcas/generic/casDGClient.h
similarity index 100%
rename from src/cas/generic/casDGClient.h
rename to src/ca/legacy/pcas/generic/casDGClient.h
diff --git a/src/cas/generic/casEvent.h b/src/ca/legacy/pcas/generic/casEvent.h
similarity index 100%
rename from src/cas/generic/casEvent.h
rename to src/ca/legacy/pcas/generic/casEvent.h
diff --git a/src/cas/generic/casEventMask.cc b/src/ca/legacy/pcas/generic/casEventMask.cc
similarity index 100%
rename from src/cas/generic/casEventMask.cc
rename to src/ca/legacy/pcas/generic/casEventMask.cc
diff --git a/src/cas/generic/casEventMask.h b/src/ca/legacy/pcas/generic/casEventMask.h
similarity index 100%
rename from src/cas/generic/casEventMask.h
rename to src/ca/legacy/pcas/generic/casEventMask.h
diff --git a/src/cas/generic/casEventRegistry.h b/src/ca/legacy/pcas/generic/casEventRegistry.h
similarity index 100%
rename from src/cas/generic/casEventRegistry.h
rename to src/ca/legacy/pcas/generic/casEventRegistry.h
diff --git a/src/cas/generic/casEventSys.cc b/src/ca/legacy/pcas/generic/casEventSys.cc
similarity index 100%
rename from src/cas/generic/casEventSys.cc
rename to src/ca/legacy/pcas/generic/casEventSys.cc
diff --git a/src/cas/generic/casEventSys.h b/src/ca/legacy/pcas/generic/casEventSys.h
similarity index 100%
rename from src/cas/generic/casEventSys.h
rename to src/ca/legacy/pcas/generic/casEventSys.h
diff --git a/src/cas/generic/casMonEvent.cc b/src/ca/legacy/pcas/generic/casMonEvent.cc
similarity index 100%
rename from src/cas/generic/casMonEvent.cc
rename to src/ca/legacy/pcas/generic/casMonEvent.cc
diff --git a/src/cas/generic/casMonEvent.h b/src/ca/legacy/pcas/generic/casMonEvent.h
similarity index 100%
rename from src/cas/generic/casMonEvent.h
rename to src/ca/legacy/pcas/generic/casMonEvent.h
diff --git a/src/cas/generic/casMonitor.cc b/src/ca/legacy/pcas/generic/casMonitor.cc
similarity index 100%
rename from src/cas/generic/casMonitor.cc
rename to src/ca/legacy/pcas/generic/casMonitor.cc
diff --git a/src/cas/generic/casMonitor.h b/src/ca/legacy/pcas/generic/casMonitor.h
similarity index 100%
rename from src/cas/generic/casMonitor.h
rename to src/ca/legacy/pcas/generic/casMonitor.h
diff --git a/src/cas/generic/casOpaqueAddr.cc b/src/ca/legacy/pcas/generic/casOpaqueAddr.cc
similarity index 100%
rename from src/cas/generic/casOpaqueAddr.cc
rename to src/ca/legacy/pcas/generic/casOpaqueAddr.cc
diff --git a/src/cas/generic/casOpaqueAddrIL.h b/src/ca/legacy/pcas/generic/casOpaqueAddrIL.h
similarity index 100%
rename from src/cas/generic/casOpaqueAddrIL.h
rename to src/ca/legacy/pcas/generic/casOpaqueAddrIL.h
diff --git a/src/cas/generic/casPV.cc b/src/ca/legacy/pcas/generic/casPV.cc
similarity index 100%
rename from src/cas/generic/casPV.cc
rename to src/ca/legacy/pcas/generic/casPV.cc
diff --git a/src/cas/generic/casPVI.cc b/src/ca/legacy/pcas/generic/casPVI.cc
similarity index 100%
rename from src/cas/generic/casPVI.cc
rename to src/ca/legacy/pcas/generic/casPVI.cc
diff --git a/src/cas/generic/casPVI.h b/src/ca/legacy/pcas/generic/casPVI.h
similarity index 100%
rename from src/cas/generic/casPVI.h
rename to src/ca/legacy/pcas/generic/casPVI.h
diff --git a/src/cas/generic/casStrmClient.cc b/src/ca/legacy/pcas/generic/casStrmClient.cc
similarity index 100%
rename from src/cas/generic/casStrmClient.cc
rename to src/ca/legacy/pcas/generic/casStrmClient.cc
diff --git a/src/cas/generic/casStrmClient.h b/src/ca/legacy/pcas/generic/casStrmClient.h
similarity index 100%
rename from src/cas/generic/casStrmClient.h
rename to src/ca/legacy/pcas/generic/casStrmClient.h
diff --git a/src/cas/generic/casdef.h b/src/ca/legacy/pcas/generic/casdef.h
similarity index 100%
rename from src/cas/generic/casdef.h
rename to src/ca/legacy/pcas/generic/casdef.h
diff --git a/src/cas/generic/chanIntfForPV.cc b/src/ca/legacy/pcas/generic/chanIntfForPV.cc
similarity index 100%
rename from src/cas/generic/chanIntfForPV.cc
rename to src/ca/legacy/pcas/generic/chanIntfForPV.cc
diff --git a/src/cas/generic/chanIntfForPV.h b/src/ca/legacy/pcas/generic/chanIntfForPV.h
similarity index 100%
rename from src/cas/generic/chanIntfForPV.h
rename to src/ca/legacy/pcas/generic/chanIntfForPV.h
diff --git a/src/cas/generic/channelDestroyEvent.cpp b/src/ca/legacy/pcas/generic/channelDestroyEvent.cpp
similarity index 100%
rename from src/cas/generic/channelDestroyEvent.cpp
rename to src/ca/legacy/pcas/generic/channelDestroyEvent.cpp
diff --git a/src/cas/generic/channelDestroyEvent.h b/src/ca/legacy/pcas/generic/channelDestroyEvent.h
similarity index 100%
rename from src/cas/generic/channelDestroyEvent.h
rename to src/ca/legacy/pcas/generic/channelDestroyEvent.h
diff --git a/src/cas/generic/clientBufMemoryManager.cpp b/src/ca/legacy/pcas/generic/clientBufMemoryManager.cpp
similarity index 100%
rename from src/cas/generic/clientBufMemoryManager.cpp
rename to src/ca/legacy/pcas/generic/clientBufMemoryManager.cpp
diff --git a/src/cas/generic/clientBufMemoryManager.h b/src/ca/legacy/pcas/generic/clientBufMemoryManager.h
similarity index 100%
rename from src/cas/generic/clientBufMemoryManager.h
rename to src/ca/legacy/pcas/generic/clientBufMemoryManager.h
diff --git a/src/cas/generic/inBuf.cc b/src/ca/legacy/pcas/generic/inBuf.cc
similarity index 100%
rename from src/cas/generic/inBuf.cc
rename to src/ca/legacy/pcas/generic/inBuf.cc
diff --git a/src/cas/generic/inBuf.h b/src/ca/legacy/pcas/generic/inBuf.h
similarity index 100%
rename from src/cas/generic/inBuf.h
rename to src/ca/legacy/pcas/generic/inBuf.h
diff --git a/src/cas/generic/ioBlocked.h b/src/ca/legacy/pcas/generic/ioBlocked.h
similarity index 100%
rename from src/cas/generic/ioBlocked.h
rename to src/ca/legacy/pcas/generic/ioBlocked.h
diff --git a/src/cas/generic/mt/README b/src/ca/legacy/pcas/generic/mt/README
similarity index 100%
rename from src/cas/generic/mt/README
rename to src/ca/legacy/pcas/generic/mt/README
diff --git a/src/cas/generic/mt/ioBlocked.cc b/src/ca/legacy/pcas/generic/mt/ioBlocked.cc
similarity index 100%
rename from src/cas/generic/mt/ioBlocked.cc
rename to src/ca/legacy/pcas/generic/mt/ioBlocked.cc
diff --git a/src/cas/generic/outBuf.cc b/src/ca/legacy/pcas/generic/outBuf.cc
similarity index 100%
rename from src/cas/generic/outBuf.cc
rename to src/ca/legacy/pcas/generic/outBuf.cc
diff --git a/src/cas/generic/outBuf.h b/src/ca/legacy/pcas/generic/outBuf.h
similarity index 100%
rename from src/cas/generic/outBuf.h
rename to src/ca/legacy/pcas/generic/outBuf.h
diff --git a/src/cas/generic/pvAttachReturn.cc b/src/ca/legacy/pcas/generic/pvAttachReturn.cc
similarity index 100%
rename from src/cas/generic/pvAttachReturn.cc
rename to src/ca/legacy/pcas/generic/pvAttachReturn.cc
diff --git a/src/cas/generic/pvExistReturn.cc b/src/ca/legacy/pcas/generic/pvExistReturn.cc
similarity index 100%
rename from src/cas/generic/pvExistReturn.cc
rename to src/ca/legacy/pcas/generic/pvExistReturn.cc
diff --git a/src/cas/generic/st/README b/src/ca/legacy/pcas/generic/st/README
similarity index 100%
rename from src/cas/generic/st/README
rename to src/ca/legacy/pcas/generic/st/README
diff --git a/src/cas/generic/st/caServerOS.cc b/src/ca/legacy/pcas/generic/st/caServerOS.cc
similarity index 100%
rename from src/cas/generic/st/caServerOS.cc
rename to src/ca/legacy/pcas/generic/st/caServerOS.cc
diff --git a/src/cas/generic/st/casDGEvWakeup.h b/src/ca/legacy/pcas/generic/st/casDGEvWakeup.h
similarity index 100%
rename from src/cas/generic/st/casDGEvWakeup.h
rename to src/ca/legacy/pcas/generic/st/casDGEvWakeup.h
diff --git a/src/cas/generic/st/casDGIOWakeup.h b/src/ca/legacy/pcas/generic/st/casDGIOWakeup.h
similarity index 100%
rename from src/cas/generic/st/casDGIOWakeup.h
rename to src/ca/legacy/pcas/generic/st/casDGIOWakeup.h
diff --git a/src/cas/generic/st/casDGIntfOS.cc b/src/ca/legacy/pcas/generic/st/casDGIntfOS.cc
similarity index 100%
rename from src/cas/generic/st/casDGIntfOS.cc
rename to src/ca/legacy/pcas/generic/st/casDGIntfOS.cc
diff --git a/src/cas/generic/st/casDGIntfOS.h b/src/ca/legacy/pcas/generic/st/casDGIntfOS.h
similarity index 100%
rename from src/cas/generic/st/casDGIntfOS.h
rename to src/ca/legacy/pcas/generic/st/casDGIntfOS.h
diff --git a/src/cas/generic/st/casIntfOS.cc b/src/ca/legacy/pcas/generic/st/casIntfOS.cc
similarity index 100%
rename from src/cas/generic/st/casIntfOS.cc
rename to src/ca/legacy/pcas/generic/st/casIntfOS.cc
diff --git a/src/cas/generic/st/casIntfOS.h b/src/ca/legacy/pcas/generic/st/casIntfOS.h
similarity index 100%
rename from src/cas/generic/st/casIntfOS.h
rename to src/ca/legacy/pcas/generic/st/casIntfOS.h
diff --git a/src/cas/generic/st/casOSD.h b/src/ca/legacy/pcas/generic/st/casOSD.h
similarity index 100%
rename from src/cas/generic/st/casOSD.h
rename to src/ca/legacy/pcas/generic/st/casOSD.h
diff --git a/src/cas/generic/st/casStreamOS.cc b/src/ca/legacy/pcas/generic/st/casStreamOS.cc
similarity index 100%
rename from src/cas/generic/st/casStreamOS.cc
rename to src/ca/legacy/pcas/generic/st/casStreamOS.cc
diff --git a/src/cas/generic/st/casStreamOS.h b/src/ca/legacy/pcas/generic/st/casStreamOS.h
similarity index 100%
rename from src/cas/generic/st/casStreamOS.h
rename to src/ca/legacy/pcas/generic/st/casStreamOS.h
diff --git a/src/cas/generic/st/ioBlocked.cc b/src/ca/legacy/pcas/generic/st/ioBlocked.cc
similarity index 100%
rename from src/cas/generic/st/ioBlocked.cc
rename to src/ca/legacy/pcas/generic/st/ioBlocked.cc
diff --git a/src/cas/generic/st/osiMutexCAS.h b/src/ca/legacy/pcas/generic/st/osiMutexCAS.h
similarity index 100%
rename from src/cas/generic/st/osiMutexCAS.h
rename to src/ca/legacy/pcas/generic/st/osiMutexCAS.h
diff --git a/src/cas/generic/templateInstances.cpp b/src/ca/legacy/pcas/generic/templateInstances.cpp
similarity index 100%
rename from src/cas/generic/templateInstances.cpp
rename to src/ca/legacy/pcas/generic/templateInstances.cpp
diff --git a/src/cas/io/bsdSocket/README b/src/ca/legacy/pcas/io/bsdSocket/README
similarity index 100%
rename from src/cas/io/bsdSocket/README
rename to src/ca/legacy/pcas/io/bsdSocket/README
diff --git a/src/cas/io/bsdSocket/caServerIO.cc b/src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc
similarity index 100%
rename from src/cas/io/bsdSocket/caServerIO.cc
rename to src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc
diff --git a/src/cas/io/bsdSocket/caServerIO.h b/src/ca/legacy/pcas/io/bsdSocket/caServerIO.h
similarity index 100%
rename from src/cas/io/bsdSocket/caServerIO.h
rename to src/ca/legacy/pcas/io/bsdSocket/caServerIO.h
diff --git a/src/cas/io/bsdSocket/casDGIntfIO.cc b/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc
similarity index 100%
rename from src/cas/io/bsdSocket/casDGIntfIO.cc
rename to src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc
diff --git a/src/cas/io/bsdSocket/casDGIntfIO.h b/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.h
similarity index 100%
rename from src/cas/io/bsdSocket/casDGIntfIO.h
rename to src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.h
diff --git a/src/cas/io/bsdSocket/casIOD.h b/src/ca/legacy/pcas/io/bsdSocket/casIOD.h
similarity index 100%
rename from src/cas/io/bsdSocket/casIOD.h
rename to src/ca/legacy/pcas/io/bsdSocket/casIOD.h
diff --git a/src/cas/io/bsdSocket/casIntfIO.cc b/src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc
similarity index 100%
rename from src/cas/io/bsdSocket/casIntfIO.cc
rename to src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc
diff --git a/src/cas/io/bsdSocket/casIntfIO.h b/src/ca/legacy/pcas/io/bsdSocket/casIntfIO.h
similarity index 100%
rename from src/cas/io/bsdSocket/casIntfIO.h
rename to src/ca/legacy/pcas/io/bsdSocket/casIntfIO.h
diff --git a/src/cas/io/bsdSocket/casStreamIO.cc b/src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc
similarity index 100%
rename from src/cas/io/bsdSocket/casStreamIO.cc
rename to src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc
diff --git a/src/cas/io/bsdSocket/casStreamIO.h b/src/ca/legacy/pcas/io/bsdSocket/casStreamIO.h
similarity index 100%
rename from src/cas/io/bsdSocket/casStreamIO.h
rename to src/ca/legacy/pcas/io/bsdSocket/casStreamIO.h
diff --git a/src/cas/io/bsdSocket/ipIgnoreEntry.cpp b/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp
similarity index 100%
rename from src/cas/io/bsdSocket/ipIgnoreEntry.cpp
rename to src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp
diff --git a/src/cas/io/bsdSocket/ipIgnoreEntry.h b/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h
similarity index 100%
rename from src/cas/io/bsdSocket/ipIgnoreEntry.h
rename to src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h
diff --git a/src/cas/os/vms/BUILD_VMS.COM b/src/ca/legacy/pcas/os/vms/BUILD_VMS.COM
similarity index 100%
rename from src/cas/os/vms/BUILD_VMS.COM
rename to src/ca/legacy/pcas/os/vms/BUILD_VMS.COM
diff --git a/src/cas/os/vms/README b/src/ca/legacy/pcas/os/vms/README
similarity index 100%
rename from src/cas/os/vms/README
rename to src/ca/legacy/pcas/os/vms/README
diff --git a/src/cas/os/vms/casSpecificOS.h b/src/ca/legacy/pcas/os/vms/casSpecificOS.h
similarity index 100%
rename from src/cas/os/vms/casSpecificOS.h
rename to src/ca/legacy/pcas/os/vms/casSpecificOS.h
diff --git a/src/cas/os/vms/login.com b/src/ca/legacy/pcas/os/vms/login.com
similarity index 100%
rename from src/cas/os/vms/login.com
rename to src/ca/legacy/pcas/os/vms/login.com
diff --git a/src/cas/os/vms/mitfp.c b/src/ca/legacy/pcas/os/vms/mitfp.c
similarity index 100%
rename from src/cas/os/vms/mitfp.c
rename to src/ca/legacy/pcas/os/vms/mitfp.c
diff --git a/src/cas/os/vms/mitfp.cc b/src/ca/legacy/pcas/os/vms/mitfp.cc
similarity index 100%
rename from src/cas/os/vms/mitfp.cc
rename to src/ca/legacy/pcas/os/vms/mitfp.cc
diff --git a/src/cas/os/vms/mitfp.h b/src/ca/legacy/pcas/os/vms/mitfp.h
similarity index 100%
rename from src/cas/os/vms/mitfp.h
rename to src/ca/legacy/pcas/os/vms/mitfp.h
diff --git a/src/cas/os/vms/vms_depen.h b/src/ca/legacy/pcas/os/vms/vms_depen.h
similarity index 100%
rename from src/cas/os/vms/vms_depen.h
rename to src/ca/legacy/pcas/os/vms/vms_depen.h
diff --git a/src/cas/test/gddAppFuncTableTest.cc b/src/ca/legacy/pcas/test/gddAppFuncTableTest.cc
similarity index 100%
rename from src/cas/test/gddAppFuncTableTest.cc
rename to src/ca/legacy/pcas/test/gddAppFuncTableTest.cc
diff --git a/src/as/Makefile b/src/ioc/as/Makefile
similarity index 100%
rename from src/as/Makefile
rename to src/ioc/as/Makefile
diff --git a/src/as/asCa.c b/src/ioc/as/asCa.c
similarity index 100%
rename from src/as/asCa.c
rename to src/ioc/as/asCa.c
diff --git a/src/as/asCa.h b/src/ioc/as/asCa.h
similarity index 100%
rename from src/as/asCa.h
rename to src/ioc/as/asCa.h
diff --git a/src/as/asDbLib.c b/src/ioc/as/asDbLib.c
similarity index 100%
rename from src/as/asDbLib.c
rename to src/ioc/as/asDbLib.c
diff --git a/src/as/asDbLib.h b/src/ioc/as/asDbLib.h
similarity index 100%
rename from src/as/asDbLib.h
rename to src/ioc/as/asDbLib.h
diff --git a/src/as/asHost.rc b/src/ioc/as/asHost.rc
similarity index 100%
rename from src/as/asHost.rc
rename to src/ioc/as/asHost.rc
diff --git a/src/as/asIoc.rc b/src/ioc/as/asIoc.rc
similarity index 100%
rename from src/as/asIoc.rc
rename to src/ioc/as/asIoc.rc
diff --git a/src/as/asIocRegister.c b/src/ioc/as/asIocRegister.c
similarity index 100%
rename from src/as/asIocRegister.c
rename to src/ioc/as/asIocRegister.c
diff --git a/src/as/asIocRegister.h b/src/ioc/as/asIocRegister.h
similarity index 100%
rename from src/as/asIocRegister.h
rename to src/ioc/as/asIocRegister.h
diff --git a/src/as/asLib.h b/src/ioc/as/asLib.h
similarity index 100%
rename from src/as/asLib.h
rename to src/ioc/as/asLib.h
diff --git a/src/as/asLib.y b/src/ioc/as/asLib.y
similarity index 100%
rename from src/as/asLib.y
rename to src/ioc/as/asLib.y
diff --git a/src/as/asLibRoutines.c b/src/ioc/as/asLibRoutines.c
similarity index 100%
rename from src/as/asLibRoutines.c
rename to src/ioc/as/asLibRoutines.c
diff --git a/src/as/asLib_lex.l b/src/ioc/as/asLib_lex.l
similarity index 100%
rename from src/as/asLib_lex.l
rename to src/ioc/as/asLib_lex.l
diff --git a/src/as/asTrapWrite.c b/src/ioc/as/asTrapWrite.c
similarity index 100%
rename from src/as/asTrapWrite.c
rename to src/ioc/as/asTrapWrite.c
diff --git a/src/as/asTrapWrite.h b/src/ioc/as/asTrapWrite.h
similarity index 100%
rename from src/as/asTrapWrite.h
rename to src/ioc/as/asTrapWrite.h
diff --git a/src/as/ascheck.c b/src/ioc/as/ascheck.c
similarity index 100%
rename from src/as/ascheck.c
rename to src/ioc/as/ascheck.c
diff --git a/src/bpt/Makefile b/src/ioc/bpt/Makefile
similarity index 100%
rename from src/bpt/Makefile
rename to src/ioc/bpt/Makefile
diff --git a/src/bpt/bptTypeJdegC.data b/src/ioc/bpt/bptTypeJdegC.data
similarity index 100%
rename from src/bpt/bptTypeJdegC.data
rename to src/ioc/bpt/bptTypeJdegC.data
diff --git a/src/bpt/bptTypeJdegF.data b/src/ioc/bpt/bptTypeJdegF.data
similarity index 100%
rename from src/bpt/bptTypeJdegF.data
rename to src/ioc/bpt/bptTypeJdegF.data
diff --git a/src/bpt/bptTypeKdegC.data b/src/ioc/bpt/bptTypeKdegC.data
similarity index 100%
rename from src/bpt/bptTypeKdegC.data
rename to src/ioc/bpt/bptTypeKdegC.data
diff --git a/src/bpt/bptTypeKdegF.data b/src/ioc/bpt/bptTypeKdegF.data
similarity index 100%
rename from src/bpt/bptTypeKdegF.data
rename to src/ioc/bpt/bptTypeKdegF.data
diff --git a/src/bpt/cvtTable.h b/src/ioc/bpt/cvtTable.h
similarity index 100%
rename from src/bpt/cvtTable.h
rename to src/ioc/bpt/cvtTable.h
diff --git a/src/bpt/makeBpt.c b/src/ioc/bpt/makeBpt.c
similarity index 100%
rename from src/bpt/makeBpt.c
rename to src/ioc/bpt/makeBpt.c
diff --git a/src/bpt/menuConvert.dbd b/src/ioc/bpt/menuConvert.dbd
similarity index 100%
rename from src/bpt/menuConvert.dbd
rename to src/ioc/bpt/menuConvert.dbd
diff --git a/src/db/Makefile b/src/ioc/db/Makefile
similarity index 100%
rename from src/db/Makefile
rename to src/ioc/db/Makefile
diff --git a/src/db/callback.c b/src/ioc/db/callback.c
similarity index 100%
rename from src/db/callback.c
rename to src/ioc/db/callback.c
diff --git a/src/db/callback.h b/src/ioc/db/callback.h
similarity index 100%
rename from src/db/callback.h
rename to src/ioc/db/callback.h
diff --git a/src/db/cvtBpt.c b/src/ioc/db/cvtBpt.c
similarity index 100%
rename from src/db/cvtBpt.c
rename to src/ioc/db/cvtBpt.c
diff --git a/src/db/dbAccess.c b/src/ioc/db/dbAccess.c
similarity index 100%
rename from src/db/dbAccess.c
rename to src/ioc/db/dbAccess.c
diff --git a/src/db/dbAccess.h b/src/ioc/db/dbAccess.h
similarity index 100%
rename from src/db/dbAccess.h
rename to src/ioc/db/dbAccess.h
diff --git a/src/db/dbAccessDefs.h b/src/ioc/db/dbAccessDefs.h
similarity index 100%
rename from src/db/dbAccessDefs.h
rename to src/ioc/db/dbAccessDefs.h
diff --git a/src/db/dbAddr.h b/src/ioc/db/dbAddr.h
similarity index 100%
rename from src/db/dbAddr.h
rename to src/ioc/db/dbAddr.h
diff --git a/src/db/dbBkpt.c b/src/ioc/db/dbBkpt.c
similarity index 100%
rename from src/db/dbBkpt.c
rename to src/ioc/db/dbBkpt.c
diff --git a/src/db/dbBkpt.h b/src/ioc/db/dbBkpt.h
similarity index 100%
rename from src/db/dbBkpt.h
rename to src/ioc/db/dbBkpt.h
diff --git a/src/db/dbCAC.h b/src/ioc/db/dbCAC.h
similarity index 100%
rename from src/db/dbCAC.h
rename to src/ioc/db/dbCAC.h
diff --git a/src/db/dbCa.c b/src/ioc/db/dbCa.c
similarity index 100%
rename from src/db/dbCa.c
rename to src/ioc/db/dbCa.c
diff --git a/src/db/dbCa.h b/src/ioc/db/dbCa.h
similarity index 100%
rename from src/db/dbCa.h
rename to src/ioc/db/dbCa.h
diff --git a/src/db/dbCaPvt.h b/src/ioc/db/dbCaPvt.h
similarity index 100%
rename from src/db/dbCaPvt.h
rename to src/ioc/db/dbCaPvt.h
diff --git a/src/db/dbCaTest.c b/src/ioc/db/dbCaTest.c
similarity index 100%
rename from src/db/dbCaTest.c
rename to src/ioc/db/dbCaTest.c
diff --git a/src/db/dbCaTest.h b/src/ioc/db/dbCaTest.h
similarity index 100%
rename from src/db/dbCaTest.h
rename to src/ioc/db/dbCaTest.h
diff --git a/src/db/dbChannelIO.cpp b/src/ioc/db/dbChannelIO.cpp
similarity index 100%
rename from src/db/dbChannelIO.cpp
rename to src/ioc/db/dbChannelIO.cpp
diff --git a/src/db/dbChannelIO.h b/src/ioc/db/dbChannelIO.h
similarity index 100%
rename from src/db/dbChannelIO.h
rename to src/ioc/db/dbChannelIO.h
diff --git a/src/db/dbCommon.dbd b/src/ioc/db/dbCommon.dbd
similarity index 100%
rename from src/db/dbCommon.dbd
rename to src/ioc/db/dbCommon.dbd
diff --git a/src/db/dbCommonRecord.dbd b/src/ioc/db/dbCommonRecord.dbd
similarity index 100%
rename from src/db/dbCommonRecord.dbd
rename to src/ioc/db/dbCommonRecord.dbd
diff --git a/src/db/dbContext.cpp b/src/ioc/db/dbContext.cpp
similarity index 100%
rename from src/db/dbContext.cpp
rename to src/ioc/db/dbContext.cpp
diff --git a/src/db/dbContextReadNotifyCache.cpp b/src/ioc/db/dbContextReadNotifyCache.cpp
similarity index 100%
rename from src/db/dbContextReadNotifyCache.cpp
rename to src/ioc/db/dbContextReadNotifyCache.cpp
diff --git a/src/db/dbConvert.c b/src/ioc/db/dbConvert.c
similarity index 100%
rename from src/db/dbConvert.c
rename to src/ioc/db/dbConvert.c
diff --git a/src/db/dbConvert.h b/src/ioc/db/dbConvert.h
similarity index 100%
rename from src/db/dbConvert.h
rename to src/ioc/db/dbConvert.h
diff --git a/src/db/dbConvertFast.h b/src/ioc/db/dbConvertFast.h
similarity index 100%
rename from src/db/dbConvertFast.h
rename to src/ioc/db/dbConvertFast.h
diff --git a/src/db/dbEvent.c b/src/ioc/db/dbEvent.c
similarity index 100%
rename from src/db/dbEvent.c
rename to src/ioc/db/dbEvent.c
diff --git a/src/db/dbEvent.h b/src/ioc/db/dbEvent.h
similarity index 100%
rename from src/db/dbEvent.h
rename to src/ioc/db/dbEvent.h
diff --git a/src/db/dbFastLinkConv.c b/src/ioc/db/dbFastLinkConv.c
similarity index 100%
rename from src/db/dbFastLinkConv.c
rename to src/ioc/db/dbFastLinkConv.c
diff --git a/src/db/dbIoc.rc b/src/ioc/db/dbIoc.rc
similarity index 100%
rename from src/db/dbIoc.rc
rename to src/ioc/db/dbIoc.rc
diff --git a/src/db/dbIocRegister.c b/src/ioc/db/dbIocRegister.c
similarity index 100%
rename from src/db/dbIocRegister.c
rename to src/ioc/db/dbIocRegister.c
diff --git a/src/db/dbIocRegister.h b/src/ioc/db/dbIocRegister.h
similarity index 100%
rename from src/db/dbIocRegister.h
rename to src/ioc/db/dbIocRegister.h
diff --git a/src/db/dbLock.c b/src/ioc/db/dbLock.c
similarity index 100%
rename from src/db/dbLock.c
rename to src/ioc/db/dbLock.c
diff --git a/src/db/dbLock.h b/src/ioc/db/dbLock.h
similarity index 100%
rename from src/db/dbLock.h
rename to src/ioc/db/dbLock.h
diff --git a/src/db/dbNotify.c b/src/ioc/db/dbNotify.c
similarity index 100%
rename from src/db/dbNotify.c
rename to src/ioc/db/dbNotify.c
diff --git a/src/db/dbNotify.h b/src/ioc/db/dbNotify.h
similarity index 100%
rename from src/db/dbNotify.h
rename to src/ioc/db/dbNotify.h
diff --git a/src/db/dbPutNotifyBlocker.cpp b/src/ioc/db/dbPutNotifyBlocker.cpp
similarity index 100%
rename from src/db/dbPutNotifyBlocker.cpp
rename to src/ioc/db/dbPutNotifyBlocker.cpp
diff --git a/src/db/dbPutNotifyBlocker.h b/src/ioc/db/dbPutNotifyBlocker.h
similarity index 100%
rename from src/db/dbPutNotifyBlocker.h
rename to src/ioc/db/dbPutNotifyBlocker.h
diff --git a/src/db/dbScan.c b/src/ioc/db/dbScan.c
similarity index 100%
rename from src/db/dbScan.c
rename to src/ioc/db/dbScan.c
diff --git a/src/db/dbScan.h b/src/ioc/db/dbScan.h
similarity index 100%
rename from src/db/dbScan.h
rename to src/ioc/db/dbScan.h
diff --git a/src/db/dbSubscriptionIO.cpp b/src/ioc/db/dbSubscriptionIO.cpp
similarity index 100%
rename from src/db/dbSubscriptionIO.cpp
rename to src/ioc/db/dbSubscriptionIO.cpp
diff --git a/src/db/dbTest.c b/src/ioc/db/dbTest.c
similarity index 100%
rename from src/db/dbTest.c
rename to src/ioc/db/dbTest.c
diff --git a/src/db/dbTest.h b/src/ioc/db/dbTest.h
similarity index 100%
rename from src/db/dbTest.h
rename to src/ioc/db/dbTest.h
diff --git a/src/db/db_access.c b/src/ioc/db/db_access.c
similarity index 100%
rename from src/db/db_access.c
rename to src/ioc/db/db_access.c
diff --git a/src/db/db_access_routines.h b/src/ioc/db/db_access_routines.h
similarity index 100%
rename from src/db/db_access_routines.h
rename to src/ioc/db/db_access_routines.h
diff --git a/src/db/db_convert.h b/src/ioc/db/db_convert.h
similarity index 100%
rename from src/db/db_convert.h
rename to src/ioc/db/db_convert.h
diff --git a/src/db/db_field_log.h b/src/ioc/db/db_field_log.h
similarity index 100%
rename from src/db/db_field_log.h
rename to src/ioc/db/db_field_log.h
diff --git a/src/db/db_test.c b/src/ioc/db/db_test.c
similarity index 100%
rename from src/db/db_test.c
rename to src/ioc/db/db_test.c
diff --git a/src/db/db_test.h b/src/ioc/db/db_test.h
similarity index 100%
rename from src/db/db_test.h
rename to src/ioc/db/db_test.h
diff --git a/src/db/initHooks.c b/src/ioc/db/initHooks.c
similarity index 100%
rename from src/db/initHooks.c
rename to src/ioc/db/initHooks.c
diff --git a/src/db/initHooks.h b/src/ioc/db/initHooks.h
similarity index 100%
rename from src/db/initHooks.h
rename to src/ioc/db/initHooks.h
diff --git a/src/db/menuAlarmSevr.dbd b/src/ioc/db/menuAlarmSevr.dbd
similarity index 100%
rename from src/db/menuAlarmSevr.dbd
rename to src/ioc/db/menuAlarmSevr.dbd
diff --git a/src/db/menuAlarmStat.dbd b/src/ioc/db/menuAlarmStat.dbd
similarity index 100%
rename from src/db/menuAlarmStat.dbd
rename to src/ioc/db/menuAlarmStat.dbd
diff --git a/src/db/menuCompress.dbd b/src/ioc/db/menuCompress.dbd
similarity index 100%
rename from src/db/menuCompress.dbd
rename to src/ioc/db/menuCompress.dbd
diff --git a/src/db/menuFtype.dbd b/src/ioc/db/menuFtype.dbd
similarity index 100%
rename from src/db/menuFtype.dbd
rename to src/ioc/db/menuFtype.dbd
diff --git a/src/db/menuGlobal.dbd b/src/ioc/db/menuGlobal.dbd
similarity index 100%
rename from src/db/menuGlobal.dbd
rename to src/ioc/db/menuGlobal.dbd
diff --git a/src/db/menuIvoa.dbd b/src/ioc/db/menuIvoa.dbd
similarity index 100%
rename from src/db/menuIvoa.dbd
rename to src/ioc/db/menuIvoa.dbd
diff --git a/src/db/menuOmsl.dbd b/src/ioc/db/menuOmsl.dbd
similarity index 100%
rename from src/db/menuOmsl.dbd
rename to src/ioc/db/menuOmsl.dbd
diff --git a/src/db/menuPini.dbd b/src/ioc/db/menuPini.dbd
similarity index 100%
rename from src/db/menuPini.dbd
rename to src/ioc/db/menuPini.dbd
diff --git a/src/db/menuPriority.dbd b/src/ioc/db/menuPriority.dbd
similarity index 100%
rename from src/db/menuPriority.dbd
rename to src/ioc/db/menuPriority.dbd
diff --git a/src/db/menuScan.dbd b/src/ioc/db/menuScan.dbd
similarity index 100%
rename from src/db/menuScan.dbd
rename to src/ioc/db/menuScan.dbd
diff --git a/src/db/menuSimm.dbd b/src/ioc/db/menuSimm.dbd
similarity index 100%
rename from src/db/menuSimm.dbd
rename to src/ioc/db/menuSimm.dbd
diff --git a/src/db/menuYesNo.dbd b/src/ioc/db/menuYesNo.dbd
similarity index 100%
rename from src/db/menuYesNo.dbd
rename to src/ioc/db/menuYesNo.dbd
diff --git a/src/db/recGbl.c b/src/ioc/db/recGbl.c
similarity index 100%
rename from src/db/recGbl.c
rename to src/ioc/db/recGbl.c
diff --git a/src/db/recGbl.h b/src/ioc/db/recGbl.h
similarity index 100%
rename from src/db/recGbl.h
rename to src/ioc/db/recGbl.h
diff --git a/src/db/templateInstances.cpp b/src/ioc/db/templateInstances.cpp
similarity index 100%
rename from src/db/templateInstances.cpp
rename to src/ioc/db/templateInstances.cpp
diff --git a/src/db/test/Makefile b/src/ioc/db/test/Makefile
similarity index 100%
rename from src/db/test/Makefile
rename to src/ioc/db/test/Makefile
diff --git a/src/db/test/callbackTest.c b/src/ioc/db/test/callbackTest.c
similarity index 100%
rename from src/db/test/callbackTest.c
rename to src/ioc/db/test/callbackTest.c
diff --git a/src/dbStatic/Makefile b/src/ioc/dbStatic/Makefile
similarity index 100%
rename from src/dbStatic/Makefile
rename to src/ioc/dbStatic/Makefile
diff --git a/src/dbStatic/alarm.h b/src/ioc/dbStatic/alarm.h
similarity index 100%
rename from src/dbStatic/alarm.h
rename to src/ioc/dbStatic/alarm.h
diff --git a/src/dbStatic/alarmString.h b/src/ioc/dbStatic/alarmString.h
similarity index 100%
rename from src/dbStatic/alarmString.h
rename to src/ioc/dbStatic/alarmString.h
diff --git a/src/dbStatic/dbBase.h b/src/ioc/dbStatic/dbBase.h
similarity index 100%
rename from src/dbStatic/dbBase.h
rename to src/ioc/dbStatic/dbBase.h
diff --git a/src/dbStatic/dbExpand.c b/src/ioc/dbStatic/dbExpand.c
similarity index 100%
rename from src/dbStatic/dbExpand.c
rename to src/ioc/dbStatic/dbExpand.c
diff --git a/src/dbStatic/dbFldTypes.h b/src/ioc/dbStatic/dbFldTypes.h
similarity index 100%
rename from src/dbStatic/dbFldTypes.h
rename to src/ioc/dbStatic/dbFldTypes.h
diff --git a/src/dbStatic/dbLex.l b/src/ioc/dbStatic/dbLex.l
similarity index 100%
rename from src/dbStatic/dbLex.l
rename to src/ioc/dbStatic/dbLex.l
diff --git a/src/dbStatic/dbLexRoutines.c b/src/ioc/dbStatic/dbLexRoutines.c
similarity index 100%
rename from src/dbStatic/dbLexRoutines.c
rename to src/ioc/dbStatic/dbLexRoutines.c
diff --git a/src/dbStatic/dbPvdLib.c b/src/ioc/dbStatic/dbPvdLib.c
similarity index 100%
rename from src/dbStatic/dbPvdLib.c
rename to src/ioc/dbStatic/dbPvdLib.c
diff --git a/src/dbStatic/dbReadTest.c b/src/ioc/dbStatic/dbReadTest.c
similarity index 100%
rename from src/dbStatic/dbReadTest.c
rename to src/ioc/dbStatic/dbReadTest.c
diff --git a/src/dbStatic/dbStaticHost.rc b/src/ioc/dbStatic/dbStaticHost.rc
similarity index 100%
rename from src/dbStatic/dbStaticHost.rc
rename to src/ioc/dbStatic/dbStaticHost.rc
diff --git a/src/dbStatic/dbStaticIoc.rc b/src/ioc/dbStatic/dbStaticIoc.rc
similarity index 100%
rename from src/dbStatic/dbStaticIoc.rc
rename to src/ioc/dbStatic/dbStaticIoc.rc
diff --git a/src/dbStatic/dbStaticIocRegister.c b/src/ioc/dbStatic/dbStaticIocRegister.c
similarity index 100%
rename from src/dbStatic/dbStaticIocRegister.c
rename to src/ioc/dbStatic/dbStaticIocRegister.c
diff --git a/src/dbStatic/dbStaticIocRegister.h b/src/ioc/dbStatic/dbStaticIocRegister.h
similarity index 100%
rename from src/dbStatic/dbStaticIocRegister.h
rename to src/ioc/dbStatic/dbStaticIocRegister.h
diff --git a/src/dbStatic/dbStaticLib.c b/src/ioc/dbStatic/dbStaticLib.c
similarity index 100%
rename from src/dbStatic/dbStaticLib.c
rename to src/ioc/dbStatic/dbStaticLib.c
diff --git a/src/dbStatic/dbStaticLib.h b/src/ioc/dbStatic/dbStaticLib.h
similarity index 100%
rename from src/dbStatic/dbStaticLib.h
rename to src/ioc/dbStatic/dbStaticLib.h
diff --git a/src/dbStatic/dbStaticNoRun.c b/src/ioc/dbStatic/dbStaticNoRun.c
similarity index 100%
rename from src/dbStatic/dbStaticNoRun.c
rename to src/ioc/dbStatic/dbStaticNoRun.c
diff --git a/src/dbStatic/dbStaticPvt.h b/src/ioc/dbStatic/dbStaticPvt.h
similarity index 100%
rename from src/dbStatic/dbStaticPvt.h
rename to src/ioc/dbStatic/dbStaticPvt.h
diff --git a/src/dbStatic/dbStaticRun.c b/src/ioc/dbStatic/dbStaticRun.c
similarity index 100%
rename from src/dbStatic/dbStaticRun.c
rename to src/ioc/dbStatic/dbStaticRun.c
diff --git a/src/dbStatic/dbToMenuH.c b/src/ioc/dbStatic/dbToMenuH.c
similarity index 100%
rename from src/dbStatic/dbToMenuH.c
rename to src/ioc/dbStatic/dbToMenuH.c
diff --git a/src/dbStatic/dbToRecordtypeH.c b/src/ioc/dbStatic/dbToRecordtypeH.c
similarity index 100%
rename from src/dbStatic/dbToRecordtypeH.c
rename to src/ioc/dbStatic/dbToRecordtypeH.c
diff --git a/src/dbStatic/dbYacc.y b/src/ioc/dbStatic/dbYacc.y
similarity index 100%
rename from src/dbStatic/dbYacc.y
rename to src/ioc/dbStatic/dbYacc.y
diff --git a/src/dbStatic/devSup.h b/src/ioc/dbStatic/devSup.h
similarity index 100%
rename from src/dbStatic/devSup.h
rename to src/ioc/dbStatic/devSup.h
diff --git a/src/dbStatic/drvSup.h b/src/ioc/dbStatic/drvSup.h
similarity index 100%
rename from src/dbStatic/drvSup.h
rename to src/ioc/dbStatic/drvSup.h
diff --git a/src/dbStatic/guigroup.h b/src/ioc/dbStatic/guigroup.h
similarity index 100%
rename from src/dbStatic/guigroup.h
rename to src/ioc/dbStatic/guigroup.h
diff --git a/src/dbStatic/link.h b/src/ioc/dbStatic/link.h
similarity index 100%
rename from src/dbStatic/link.h
rename to src/ioc/dbStatic/link.h
diff --git a/src/dbStatic/recSup.h b/src/ioc/dbStatic/recSup.h
similarity index 100%
rename from src/dbStatic/recSup.h
rename to src/ioc/dbStatic/recSup.h
diff --git a/src/dbStatic/special.h b/src/ioc/dbStatic/special.h
similarity index 100%
rename from src/dbStatic/special.h
rename to src/ioc/dbStatic/special.h
diff --git a/src/dbtools/Makefile b/src/ioc/dbtemplate/Makefile
similarity index 100%
rename from src/dbtools/Makefile
rename to src/ioc/dbtemplate/Makefile
diff --git a/src/dbtools/dbLoadTemplate.h b/src/ioc/dbtemplate/dbLoadTemplate.h
similarity index 100%
rename from src/dbtools/dbLoadTemplate.h
rename to src/ioc/dbtemplate/dbLoadTemplate.h
diff --git a/src/dbtools/dbLoadTemplate.html b/src/ioc/dbtemplate/dbLoadTemplate.html
similarity index 100%
rename from src/dbtools/dbLoadTemplate.html
rename to src/ioc/dbtemplate/dbLoadTemplate.html
diff --git a/src/dbtools/dbLoadTemplate.y b/src/ioc/dbtemplate/dbLoadTemplate.y
similarity index 100%
rename from src/dbtools/dbLoadTemplate.y
rename to src/ioc/dbtemplate/dbLoadTemplate.y
diff --git a/src/dbtools/dbLoadTemplate_lex.l b/src/ioc/dbtemplate/dbLoadTemplate_lex.l
similarity index 100%
rename from src/dbtools/dbLoadTemplate_lex.l
rename to src/ioc/dbtemplate/dbLoadTemplate_lex.l
diff --git a/src/dbtools/dbtoolsIoc.rc b/src/ioc/dbtemplate/dbtoolsIoc.rc
similarity index 100%
rename from src/dbtools/dbtoolsIoc.rc
rename to src/ioc/dbtemplate/dbtoolsIoc.rc
diff --git a/src/dbtools/dbtoolsIocRegister.c b/src/ioc/dbtemplate/dbtoolsIocRegister.c
similarity index 100%
rename from src/dbtools/dbtoolsIocRegister.c
rename to src/ioc/dbtemplate/dbtoolsIocRegister.c
diff --git a/src/dbtools/dbtoolsIocRegister.h b/src/ioc/dbtemplate/dbtoolsIocRegister.h
similarity index 100%
rename from src/dbtools/dbtoolsIocRegister.h
rename to src/ioc/dbtemplate/dbtoolsIocRegister.h
diff --git a/src/misc/Makefile b/src/ioc/misc/Makefile
similarity index 100%
rename from src/misc/Makefile
rename to src/ioc/misc/Makefile
diff --git a/src/misc/asSubRecordFunctions.c b/src/ioc/misc/asSubRecordFunctions.c
similarity index 100%
rename from src/misc/asSubRecordFunctions.c
rename to src/ioc/misc/asSubRecordFunctions.c
diff --git a/src/misc/base.dbd b/src/ioc/misc/base.dbd
similarity index 100%
rename from src/misc/base.dbd
rename to src/ioc/misc/base.dbd
diff --git a/src/misc/dlload.c b/src/ioc/misc/dlload.c
similarity index 100%
rename from src/misc/dlload.c
rename to src/ioc/misc/dlload.c
diff --git a/src/misc/dlload.dbd b/src/ioc/misc/dlload.dbd
similarity index 100%
rename from src/misc/dlload.dbd
rename to src/ioc/misc/dlload.dbd
diff --git a/src/misc/epicsRelease.c b/src/ioc/misc/epicsRelease.c
similarity index 100%
rename from src/misc/epicsRelease.c
rename to src/ioc/misc/epicsRelease.c
diff --git a/src/misc/epicsRelease.h b/src/ioc/misc/epicsRelease.h
similarity index 100%
rename from src/misc/epicsRelease.h
rename to src/ioc/misc/epicsRelease.h
diff --git a/src/misc/iocInit.c b/src/ioc/misc/iocInit.c
similarity index 100%
rename from src/misc/iocInit.c
rename to src/ioc/misc/iocInit.c
diff --git a/src/misc/iocInit.h b/src/ioc/misc/iocInit.h
similarity index 100%
rename from src/misc/iocInit.h
rename to src/ioc/misc/iocInit.h
diff --git a/src/misc/iocshRegisterCommon.c b/src/ioc/misc/iocshRegisterCommon.c
similarity index 100%
rename from src/misc/iocshRegisterCommon.c
rename to src/ioc/misc/iocshRegisterCommon.c
diff --git a/src/misc/iocshRegisterCommon.h b/src/ioc/misc/iocshRegisterCommon.h
similarity index 100%
rename from src/misc/iocshRegisterCommon.h
rename to src/ioc/misc/iocshRegisterCommon.h
diff --git a/src/misc/misc.rc b/src/ioc/misc/misc.rc
similarity index 100%
rename from src/misc/misc.rc
rename to src/ioc/misc/misc.rc
diff --git a/src/misc/miscIoc.rc b/src/ioc/misc/miscIoc.rc
similarity index 100%
rename from src/misc/miscIoc.rc
rename to src/ioc/misc/miscIoc.rc
diff --git a/src/misc/miscIocRegister.c b/src/ioc/misc/miscIocRegister.c
similarity index 100%
rename from src/misc/miscIocRegister.c
rename to src/ioc/misc/miscIocRegister.c
diff --git a/src/misc/miscIocRegister.h b/src/ioc/misc/miscIocRegister.h
similarity index 100%
rename from src/misc/miscIocRegister.h
rename to src/ioc/misc/miscIocRegister.h
diff --git a/src/misc/system.dbd b/src/ioc/misc/system.dbd
similarity index 100%
rename from src/misc/system.dbd
rename to src/ioc/misc/system.dbd
diff --git a/src/registry/Makefile b/src/ioc/registry/Makefile
similarity index 100%
rename from src/registry/Makefile
rename to src/ioc/registry/Makefile
diff --git a/src/registry/registerRecordDeviceDriver.pl b/src/ioc/registry/registerRecordDeviceDriver.pl
similarity index 100%
rename from src/registry/registerRecordDeviceDriver.pl
rename to src/ioc/registry/registerRecordDeviceDriver.pl
diff --git a/src/registry/registryCommon.c b/src/ioc/registry/registryCommon.c
similarity index 100%
rename from src/registry/registryCommon.c
rename to src/ioc/registry/registryCommon.c
diff --git a/src/registry/registryCommon.h b/src/ioc/registry/registryCommon.h
similarity index 100%
rename from src/registry/registryCommon.h
rename to src/ioc/registry/registryCommon.h
diff --git a/src/registry/registryDeviceSupport.c b/src/ioc/registry/registryDeviceSupport.c
similarity index 100%
rename from src/registry/registryDeviceSupport.c
rename to src/ioc/registry/registryDeviceSupport.c
diff --git a/src/registry/registryDeviceSupport.h b/src/ioc/registry/registryDeviceSupport.h
similarity index 100%
rename from src/registry/registryDeviceSupport.h
rename to src/ioc/registry/registryDeviceSupport.h
diff --git a/src/registry/registryDriverSupport.c b/src/ioc/registry/registryDriverSupport.c
similarity index 100%
rename from src/registry/registryDriverSupport.c
rename to src/ioc/registry/registryDriverSupport.c
diff --git a/src/registry/registryDriverSupport.h b/src/ioc/registry/registryDriverSupport.h
similarity index 100%
rename from src/registry/registryDriverSupport.h
rename to src/ioc/registry/registryDriverSupport.h
diff --git a/src/registry/registryFunction.c b/src/ioc/registry/registryFunction.c
similarity index 100%
rename from src/registry/registryFunction.c
rename to src/ioc/registry/registryFunction.c
diff --git a/src/registry/registryFunction.h b/src/ioc/registry/registryFunction.h
similarity index 100%
rename from src/registry/registryFunction.h
rename to src/ioc/registry/registryFunction.h
diff --git a/src/registry/registryIoc.rc b/src/ioc/registry/registryIoc.rc
similarity index 100%
rename from src/registry/registryIoc.rc
rename to src/ioc/registry/registryIoc.rc
diff --git a/src/registry/registryIocRegister.c b/src/ioc/registry/registryIocRegister.c
similarity index 100%
rename from src/registry/registryIocRegister.c
rename to src/ioc/registry/registryIocRegister.c
diff --git a/src/registry/registryIocRegister.h b/src/ioc/registry/registryIocRegister.h
similarity index 100%
rename from src/registry/registryIocRegister.h
rename to src/ioc/registry/registryIocRegister.h
diff --git a/src/registry/registryRecordType.c b/src/ioc/registry/registryRecordType.c
similarity index 100%
rename from src/registry/registryRecordType.c
rename to src/ioc/registry/registryRecordType.c
diff --git a/src/registry/registryRecordType.h b/src/ioc/registry/registryRecordType.h
similarity index 100%
rename from src/registry/registryRecordType.h
rename to src/ioc/registry/registryRecordType.h
diff --git a/src/rsrv/Makefile b/src/ioc/rsrv/Makefile
similarity index 100%
rename from src/rsrv/Makefile
rename to src/ioc/rsrv/Makefile
diff --git a/src/rsrv/camessage.c b/src/ioc/rsrv/camessage.c
similarity index 100%
rename from src/rsrv/camessage.c
rename to src/ioc/rsrv/camessage.c
diff --git a/src/rsrv/camsgtask.c b/src/ioc/rsrv/camsgtask.c
similarity index 100%
rename from src/rsrv/camsgtask.c
rename to src/ioc/rsrv/camsgtask.c
diff --git a/src/rsrv/caserverio.c b/src/ioc/rsrv/caserverio.c
similarity index 100%
rename from src/rsrv/caserverio.c
rename to src/ioc/rsrv/caserverio.c
diff --git a/src/rsrv/caservertask.c b/src/ioc/rsrv/caservertask.c
similarity index 100%
rename from src/rsrv/caservertask.c
rename to src/ioc/rsrv/caservertask.c
diff --git a/src/rsrv/cast_server.c b/src/ioc/rsrv/cast_server.c
similarity index 100%
rename from src/rsrv/cast_server.c
rename to src/ioc/rsrv/cast_server.c
diff --git a/src/rsrv/online_notify.c b/src/ioc/rsrv/online_notify.c
similarity index 100%
rename from src/rsrv/online_notify.c
rename to src/ioc/rsrv/online_notify.c
diff --git a/src/rsrv/rsrv.h b/src/ioc/rsrv/rsrv.h
similarity index 100%
rename from src/rsrv/rsrv.h
rename to src/ioc/rsrv/rsrv.h
diff --git a/src/rsrv/rsrvIoc.rc b/src/ioc/rsrv/rsrvIoc.rc
similarity index 100%
rename from src/rsrv/rsrvIoc.rc
rename to src/ioc/rsrv/rsrvIoc.rc
diff --git a/src/rsrv/rsrvIocRegister.c b/src/ioc/rsrv/rsrvIocRegister.c
similarity index 100%
rename from src/rsrv/rsrvIocRegister.c
rename to src/ioc/rsrv/rsrvIocRegister.c
diff --git a/src/rsrv/rsrvIocRegister.h b/src/ioc/rsrv/rsrvIocRegister.h
similarity index 100%
rename from src/rsrv/rsrvIocRegister.h
rename to src/ioc/rsrv/rsrvIocRegister.h
diff --git a/src/rsrv/server.h b/src/ioc/rsrv/server.h
similarity index 100%
rename from src/rsrv/server.h
rename to src/ioc/rsrv/server.h
diff --git a/src/RTEMS/Makefile b/src/libCom/RTEMS/Makefile
similarity index 100%
rename from src/RTEMS/Makefile
rename to src/libCom/RTEMS/Makefile
diff --git a/src/RTEMS/epicsRtemsInitHookPost.c b/src/libCom/RTEMS/epicsRtemsInitHookPost.c
similarity index 100%
rename from src/RTEMS/epicsRtemsInitHookPost.c
rename to src/libCom/RTEMS/epicsRtemsInitHookPost.c
diff --git a/src/RTEMS/epicsRtemsInitHookPre.c b/src/libCom/RTEMS/epicsRtemsInitHookPre.c
similarity index 100%
rename from src/RTEMS/epicsRtemsInitHookPre.c
rename to src/libCom/RTEMS/epicsRtemsInitHookPre.c
diff --git a/src/RTEMS/epicsRtemsInitHooks.h b/src/libCom/RTEMS/epicsRtemsInitHooks.h
similarity index 100%
rename from src/RTEMS/epicsRtemsInitHooks.h
rename to src/libCom/RTEMS/epicsRtemsInitHooks.h
diff --git a/src/RTEMS/rtems_config.c b/src/libCom/RTEMS/rtems_config.c
similarity index 100%
rename from src/RTEMS/rtems_config.c
rename to src/libCom/RTEMS/rtems_config.c
diff --git a/src/RTEMS/rtems_init.c b/src/libCom/RTEMS/rtems_init.c
similarity index 100%
rename from src/RTEMS/rtems_init.c
rename to src/libCom/RTEMS/rtems_init.c
diff --git a/src/RTEMS/rtems_netconfig.c b/src/libCom/RTEMS/rtems_netconfig.c
similarity index 100%
rename from src/RTEMS/rtems_netconfig.c
rename to src/libCom/RTEMS/rtems_netconfig.c
diff --git a/src/RTEMS/rtems_util.c b/src/libCom/RTEMS/rtems_util.c
similarity index 100%
rename from src/RTEMS/rtems_util.c
rename to src/libCom/RTEMS/rtems_util.c
diff --git a/src/RTEMS/setBootConfigFromNVRAM.c b/src/libCom/RTEMS/setBootConfigFromNVRAM.c
similarity index 100%
rename from src/RTEMS/setBootConfigFromNVRAM.c
rename to src/libCom/RTEMS/setBootConfigFromNVRAM.c
diff --git a/src/toolsComm/Makefile b/src/libCom/tools/Makefile
similarity index 100%
rename from src/toolsComm/Makefile
rename to src/libCom/tools/Makefile
diff --git a/src/toolsComm/antelope/ACKNOWLEDGEMENTS b/src/libCom/tools/antelope/ACKNOWLEDGEMENTS
similarity index 100%
rename from src/toolsComm/antelope/ACKNOWLEDGEMENTS
rename to src/libCom/tools/antelope/ACKNOWLEDGEMENTS
diff --git a/src/toolsComm/antelope/EPICS_READ_THIS b/src/libCom/tools/antelope/EPICS_READ_THIS
similarity index 100%
rename from src/toolsComm/antelope/EPICS_READ_THIS
rename to src/libCom/tools/antelope/EPICS_READ_THIS
diff --git a/src/toolsComm/antelope/Makefile b/src/libCom/tools/antelope/Makefile
similarity index 100%
rename from src/toolsComm/antelope/Makefile
rename to src/libCom/tools/antelope/Makefile
diff --git a/src/toolsComm/antelope/NEW_FEATURES b/src/libCom/tools/antelope/NEW_FEATURES
similarity index 100%
rename from src/toolsComm/antelope/NEW_FEATURES
rename to src/libCom/tools/antelope/NEW_FEATURES
diff --git a/src/toolsComm/antelope/NOTES b/src/libCom/tools/antelope/NOTES
similarity index 100%
rename from src/toolsComm/antelope/NOTES
rename to src/libCom/tools/antelope/NOTES
diff --git a/src/toolsComm/antelope/NO_WARRANTY b/src/libCom/tools/antelope/NO_WARRANTY
similarity index 100%
rename from src/toolsComm/antelope/NO_WARRANTY
rename to src/libCom/tools/antelope/NO_WARRANTY
diff --git a/src/toolsComm/antelope/README b/src/libCom/tools/antelope/README
similarity index 100%
rename from src/toolsComm/antelope/README
rename to src/libCom/tools/antelope/README
diff --git a/src/toolsComm/antelope/closure.c b/src/libCom/tools/antelope/closure.c
similarity index 100%
rename from src/toolsComm/antelope/closure.c
rename to src/libCom/tools/antelope/closure.c
diff --git a/src/toolsComm/antelope/defs.h b/src/libCom/tools/antelope/defs.h
similarity index 100%
rename from src/toolsComm/antelope/defs.h
rename to src/libCom/tools/antelope/defs.h
diff --git a/src/toolsComm/antelope/error.c b/src/libCom/tools/antelope/error.c
similarity index 100%
rename from src/toolsComm/antelope/error.c
rename to src/libCom/tools/antelope/error.c
diff --git a/src/toolsComm/antelope/lalr.c b/src/libCom/tools/antelope/lalr.c
similarity index 100%
rename from src/toolsComm/antelope/lalr.c
rename to src/libCom/tools/antelope/lalr.c
diff --git a/src/toolsComm/antelope/lr0.c b/src/libCom/tools/antelope/lr0.c
similarity index 100%
rename from src/toolsComm/antelope/lr0.c
rename to src/libCom/tools/antelope/lr0.c
diff --git a/src/toolsComm/antelope/main.c b/src/libCom/tools/antelope/main.c
similarity index 100%
rename from src/toolsComm/antelope/main.c
rename to src/libCom/tools/antelope/main.c
diff --git a/src/toolsComm/antelope/mkpar.c b/src/libCom/tools/antelope/mkpar.c
similarity index 100%
rename from src/toolsComm/antelope/mkpar.c
rename to src/libCom/tools/antelope/mkpar.c
diff --git a/src/toolsComm/antelope/output.c b/src/libCom/tools/antelope/output.c
similarity index 100%
rename from src/toolsComm/antelope/output.c
rename to src/libCom/tools/antelope/output.c
diff --git a/src/toolsComm/antelope/reader.c b/src/libCom/tools/antelope/reader.c
similarity index 100%
rename from src/toolsComm/antelope/reader.c
rename to src/libCom/tools/antelope/reader.c
diff --git a/src/toolsComm/antelope/skeleton.c b/src/libCom/tools/antelope/skeleton.c
similarity index 100%
rename from src/toolsComm/antelope/skeleton.c
rename to src/libCom/tools/antelope/skeleton.c
diff --git a/src/toolsComm/antelope/symtab.c b/src/libCom/tools/antelope/symtab.c
similarity index 100%
rename from src/toolsComm/antelope/symtab.c
rename to src/libCom/tools/antelope/symtab.c
diff --git a/src/toolsComm/antelope/verbose.c b/src/libCom/tools/antelope/verbose.c
similarity index 100%
rename from src/toolsComm/antelope/verbose.c
rename to src/libCom/tools/antelope/verbose.c
diff --git a/src/toolsComm/antelope/warshall.c b/src/libCom/tools/antelope/warshall.c
similarity index 100%
rename from src/toolsComm/antelope/warshall.c
rename to src/libCom/tools/antelope/warshall.c
diff --git a/src/toolsComm/antelope/yacc.html b/src/libCom/tools/antelope/yacc.html
similarity index 100%
rename from src/toolsComm/antelope/yacc.html
rename to src/libCom/tools/antelope/yacc.html
diff --git a/src/toolsComm/flex/COPYING b/src/libCom/tools/flex/COPYING
similarity index 100%
rename from src/toolsComm/flex/COPYING
rename to src/libCom/tools/flex/COPYING
diff --git a/src/toolsComm/flex/Changes b/src/libCom/tools/flex/Changes
similarity index 100%
rename from src/toolsComm/flex/Changes
rename to src/libCom/tools/flex/Changes
diff --git a/src/toolsComm/flex/EPICS_READ_THIS b/src/libCom/tools/flex/EPICS_READ_THIS
similarity index 100%
rename from src/toolsComm/flex/EPICS_READ_THIS
rename to src/libCom/tools/flex/EPICS_READ_THIS
diff --git a/src/toolsComm/flex/Flex.doc b/src/libCom/tools/flex/Flex.doc
similarity index 100%
rename from src/toolsComm/flex/Flex.doc
rename to src/libCom/tools/flex/Flex.doc
diff --git a/src/toolsComm/flex/Makefile b/src/libCom/tools/flex/Makefile
similarity index 100%
rename from src/toolsComm/flex/Makefile
rename to src/libCom/tools/flex/Makefile
diff --git a/src/toolsComm/flex/README b/src/libCom/tools/flex/README
similarity index 100%
rename from src/toolsComm/flex/README
rename to src/libCom/tools/flex/README
diff --git a/src/toolsComm/flex/ccl.c b/src/libCom/tools/flex/ccl.c
similarity index 100%
rename from src/toolsComm/flex/ccl.c
rename to src/libCom/tools/flex/ccl.c
diff --git a/src/toolsComm/flex/dfa.c b/src/libCom/tools/flex/dfa.c
similarity index 100%
rename from src/toolsComm/flex/dfa.c
rename to src/libCom/tools/flex/dfa.c
diff --git a/src/toolsComm/flex/ecs.c b/src/libCom/tools/flex/ecs.c
similarity index 100%
rename from src/toolsComm/flex/ecs.c
rename to src/libCom/tools/flex/ecs.c
diff --git a/src/toolsComm/flex/flex.html b/src/libCom/tools/flex/flex.html
similarity index 100%
rename from src/toolsComm/flex/flex.html
rename to src/libCom/tools/flex/flex.html
diff --git a/src/toolsComm/flex/flex.skel b/src/libCom/tools/flex/flex.skel
similarity index 100%
rename from src/toolsComm/flex/flex.skel
rename to src/libCom/tools/flex/flex.skel
diff --git a/src/toolsComm/flex/flex.skel.static b/src/libCom/tools/flex/flex.skel.static
similarity index 100%
rename from src/toolsComm/flex/flex.skel.static
rename to src/libCom/tools/flex/flex.skel.static
diff --git a/src/toolsComm/flex/flexdef.h b/src/libCom/tools/flex/flexdef.h
similarity index 100%
rename from src/toolsComm/flex/flexdef.h
rename to src/libCom/tools/flex/flexdef.h
diff --git a/src/toolsComm/flex/flexdoc.html b/src/libCom/tools/flex/flexdoc.html
similarity index 100%
rename from src/toolsComm/flex/flexdoc.html
rename to src/libCom/tools/flex/flexdoc.html
diff --git a/src/toolsComm/flex/gen.c b/src/libCom/tools/flex/gen.c
similarity index 100%
rename from src/toolsComm/flex/gen.c
rename to src/libCom/tools/flex/gen.c
diff --git a/src/toolsComm/flex/libmain.c b/src/libCom/tools/flex/libmain.c
similarity index 100%
rename from src/toolsComm/flex/libmain.c
rename to src/libCom/tools/flex/libmain.c
diff --git a/src/toolsComm/flex/main.c b/src/libCom/tools/flex/main.c
similarity index 100%
rename from src/toolsComm/flex/main.c
rename to src/libCom/tools/flex/main.c
diff --git a/src/toolsComm/flex/misc.c b/src/libCom/tools/flex/misc.c
similarity index 100%
rename from src/toolsComm/flex/misc.c
rename to src/libCom/tools/flex/misc.c
diff --git a/src/toolsComm/flex/nfa.c b/src/libCom/tools/flex/nfa.c
similarity index 100%
rename from src/toolsComm/flex/nfa.c
rename to src/libCom/tools/flex/nfa.c
diff --git a/src/toolsComm/flex/parse.y b/src/libCom/tools/flex/parse.y
similarity index 100%
rename from src/toolsComm/flex/parse.y
rename to src/libCom/tools/flex/parse.y
diff --git a/src/toolsComm/flex/scan.c b/src/libCom/tools/flex/scan.c
similarity index 100%
rename from src/toolsComm/flex/scan.c
rename to src/libCom/tools/flex/scan.c
diff --git a/src/toolsComm/flex/scan.l.DISTRIB b/src/libCom/tools/flex/scan.l.DISTRIB
similarity index 100%
rename from src/toolsComm/flex/scan.l.DISTRIB
rename to src/libCom/tools/flex/scan.l.DISTRIB
diff --git a/src/toolsComm/flex/sym.c b/src/libCom/tools/flex/sym.c
similarity index 100%
rename from src/toolsComm/flex/sym.c
rename to src/libCom/tools/flex/sym.c
diff --git a/src/toolsComm/flex/tblcmp.c b/src/libCom/tools/flex/tblcmp.c
similarity index 100%
rename from src/toolsComm/flex/tblcmp.c
rename to src/libCom/tools/flex/tblcmp.c
diff --git a/src/toolsComm/flex/yylex.c b/src/libCom/tools/flex/yylex.c
similarity index 100%
rename from src/toolsComm/flex/yylex.c
rename to src/libCom/tools/flex/yylex.c
diff --git a/src/dev/softDev/Makefile b/src/std/dev/Makefile
similarity index 100%
rename from src/dev/softDev/Makefile
rename to src/std/dev/Makefile
diff --git a/src/dev/softDev/devAaiSoft.c b/src/std/dev/devAaiSoft.c
similarity index 100%
rename from src/dev/softDev/devAaiSoft.c
rename to src/std/dev/devAaiSoft.c
diff --git a/src/dev/softDev/devAaoSoft.c b/src/std/dev/devAaoSoft.c
similarity index 100%
rename from src/dev/softDev/devAaoSoft.c
rename to src/std/dev/devAaoSoft.c
diff --git a/src/dev/softDev/devAiSoft.c b/src/std/dev/devAiSoft.c
similarity index 100%
rename from src/dev/softDev/devAiSoft.c
rename to src/std/dev/devAiSoft.c
diff --git a/src/dev/softDev/devAiSoftRaw.c b/src/std/dev/devAiSoftRaw.c
similarity index 100%
rename from src/dev/softDev/devAiSoftRaw.c
rename to src/std/dev/devAiSoftRaw.c
diff --git a/src/dev/softDev/devAoSoft.c b/src/std/dev/devAoSoft.c
similarity index 100%
rename from src/dev/softDev/devAoSoft.c
rename to src/std/dev/devAoSoft.c
diff --git a/src/dev/softDev/devAoSoftCallback.c b/src/std/dev/devAoSoftCallback.c
similarity index 100%
rename from src/dev/softDev/devAoSoftCallback.c
rename to src/std/dev/devAoSoftCallback.c
diff --git a/src/dev/softDev/devAoSoftRaw.c b/src/std/dev/devAoSoftRaw.c
similarity index 100%
rename from src/dev/softDev/devAoSoftRaw.c
rename to src/std/dev/devAoSoftRaw.c
diff --git a/src/dev/softDev/devBiSoft.c b/src/std/dev/devBiSoft.c
similarity index 100%
rename from src/dev/softDev/devBiSoft.c
rename to src/std/dev/devBiSoft.c
diff --git a/src/dev/softDev/devBiSoftRaw.c b/src/std/dev/devBiSoftRaw.c
similarity index 100%
rename from src/dev/softDev/devBiSoftRaw.c
rename to src/std/dev/devBiSoftRaw.c
diff --git a/src/dev/softDev/devBoSoft.c b/src/std/dev/devBoSoft.c
similarity index 100%
rename from src/dev/softDev/devBoSoft.c
rename to src/std/dev/devBoSoft.c
diff --git a/src/dev/softDev/devBoSoftCallback.c b/src/std/dev/devBoSoftCallback.c
similarity index 100%
rename from src/dev/softDev/devBoSoftCallback.c
rename to src/std/dev/devBoSoftCallback.c
diff --git a/src/dev/softDev/devBoSoftRaw.c b/src/std/dev/devBoSoftRaw.c
similarity index 100%
rename from src/dev/softDev/devBoSoftRaw.c
rename to src/std/dev/devBoSoftRaw.c
diff --git a/src/dev/softDev/devCalcoutSoft.c b/src/std/dev/devCalcoutSoft.c
similarity index 100%
rename from src/dev/softDev/devCalcoutSoft.c
rename to src/std/dev/devCalcoutSoft.c
diff --git a/src/dev/softDev/devCalcoutSoftCallback.c b/src/std/dev/devCalcoutSoftCallback.c
similarity index 100%
rename from src/dev/softDev/devCalcoutSoftCallback.c
rename to src/std/dev/devCalcoutSoftCallback.c
diff --git a/src/dev/softDev/devEventSoft.c b/src/std/dev/devEventSoft.c
similarity index 100%
rename from src/dev/softDev/devEventSoft.c
rename to src/std/dev/devEventSoft.c
diff --git a/src/dev/softDev/devGeneralTime.c b/src/std/dev/devGeneralTime.c
similarity index 100%
rename from src/dev/softDev/devGeneralTime.c
rename to src/std/dev/devGeneralTime.c
diff --git a/src/dev/softDev/devHistogramSoft.c b/src/std/dev/devHistogramSoft.c
similarity index 100%
rename from src/dev/softDev/devHistogramSoft.c
rename to src/std/dev/devHistogramSoft.c
diff --git a/src/dev/softDev/devLiSoft.c b/src/std/dev/devLiSoft.c
similarity index 100%
rename from src/dev/softDev/devLiSoft.c
rename to src/std/dev/devLiSoft.c
diff --git a/src/dev/softDev/devLoSoft.c b/src/std/dev/devLoSoft.c
similarity index 100%
rename from src/dev/softDev/devLoSoft.c
rename to src/std/dev/devLoSoft.c
diff --git a/src/dev/softDev/devLoSoftCallback.c b/src/std/dev/devLoSoftCallback.c
similarity index 100%
rename from src/dev/softDev/devLoSoftCallback.c
rename to src/std/dev/devLoSoftCallback.c
diff --git a/src/dev/softDev/devMbbiDirectSoft.c b/src/std/dev/devMbbiDirectSoft.c
similarity index 100%
rename from src/dev/softDev/devMbbiDirectSoft.c
rename to src/std/dev/devMbbiDirectSoft.c
diff --git a/src/dev/softDev/devMbbiDirectSoftRaw.c b/src/std/dev/devMbbiDirectSoftRaw.c
similarity index 100%
rename from src/dev/softDev/devMbbiDirectSoftRaw.c
rename to src/std/dev/devMbbiDirectSoftRaw.c
diff --git a/src/dev/softDev/devMbbiSoft.c b/src/std/dev/devMbbiSoft.c
similarity index 100%
rename from src/dev/softDev/devMbbiSoft.c
rename to src/std/dev/devMbbiSoft.c
diff --git a/src/dev/softDev/devMbbiSoftRaw.c b/src/std/dev/devMbbiSoftRaw.c
similarity index 100%
rename from src/dev/softDev/devMbbiSoftRaw.c
rename to src/std/dev/devMbbiSoftRaw.c
diff --git a/src/dev/softDev/devMbboDirectSoft.c b/src/std/dev/devMbboDirectSoft.c
similarity index 100%
rename from src/dev/softDev/devMbboDirectSoft.c
rename to src/std/dev/devMbboDirectSoft.c
diff --git a/src/dev/softDev/devMbboDirectSoftCallback.c b/src/std/dev/devMbboDirectSoftCallback.c
similarity index 100%
rename from src/dev/softDev/devMbboDirectSoftCallback.c
rename to src/std/dev/devMbboDirectSoftCallback.c
diff --git a/src/dev/softDev/devMbboDirectSoftRaw.c b/src/std/dev/devMbboDirectSoftRaw.c
similarity index 100%
rename from src/dev/softDev/devMbboDirectSoftRaw.c
rename to src/std/dev/devMbboDirectSoftRaw.c
diff --git a/src/dev/softDev/devMbboSoft.c b/src/std/dev/devMbboSoft.c
similarity index 100%
rename from src/dev/softDev/devMbboSoft.c
rename to src/std/dev/devMbboSoft.c
diff --git a/src/dev/softDev/devMbboSoftCallback.c b/src/std/dev/devMbboSoftCallback.c
similarity index 100%
rename from src/dev/softDev/devMbboSoftCallback.c
rename to src/std/dev/devMbboSoftCallback.c
diff --git a/src/dev/softDev/devMbboSoftRaw.c b/src/std/dev/devMbboSoftRaw.c
similarity index 100%
rename from src/dev/softDev/devMbboSoftRaw.c
rename to src/std/dev/devMbboSoftRaw.c
diff --git a/src/dev/softDev/devSASoft.c b/src/std/dev/devSASoft.c
similarity index 100%
rename from src/dev/softDev/devSASoft.c
rename to src/std/dev/devSASoft.c
diff --git a/src/dev/softDev/devSiSoft.c b/src/std/dev/devSiSoft.c
similarity index 100%
rename from src/dev/softDev/devSiSoft.c
rename to src/std/dev/devSiSoft.c
diff --git a/src/dev/softDev/devSoSoft.c b/src/std/dev/devSoSoft.c
similarity index 100%
rename from src/dev/softDev/devSoSoft.c
rename to src/std/dev/devSoSoft.c
diff --git a/src/dev/softDev/devSoSoftCallback.c b/src/std/dev/devSoSoftCallback.c
similarity index 100%
rename from src/dev/softDev/devSoSoftCallback.c
rename to src/std/dev/devSoSoftCallback.c
diff --git a/src/dev/softDev/devSoStdio.c b/src/std/dev/devSoStdio.c
similarity index 100%
rename from src/dev/softDev/devSoStdio.c
rename to src/std/dev/devSoStdio.c
diff --git a/src/dev/softDev/devSoft.dbd b/src/std/dev/devSoft.dbd
similarity index 100%
rename from src/dev/softDev/devSoft.dbd
rename to src/std/dev/devSoft.dbd
diff --git a/src/dev/softDev/devTimestamp.c b/src/std/dev/devTimestamp.c
similarity index 100%
rename from src/dev/softDev/devTimestamp.c
rename to src/std/dev/devTimestamp.c
diff --git a/src/dev/softDev/devWfSoft.c b/src/std/dev/devWfSoft.c
similarity index 100%
rename from src/dev/softDev/devWfSoft.c
rename to src/std/dev/devWfSoft.c
diff --git a/src/dev/softDev/softDevIoc.rc b/src/std/dev/softDevIoc.rc
similarity index 100%
rename from src/dev/softDev/softDevIoc.rc
rename to src/std/dev/softDevIoc.rc
diff --git a/src/rec/Makefile b/src/std/rec/Makefile
similarity index 100%
rename from src/rec/Makefile
rename to src/std/rec/Makefile
diff --git a/src/rec/aSubRecord.c b/src/std/rec/aSubRecord.c
similarity index 100%
rename from src/rec/aSubRecord.c
rename to src/std/rec/aSubRecord.c
diff --git a/src/rec/aSubRecord.dbd b/src/std/rec/aSubRecord.dbd
similarity index 100%
rename from src/rec/aSubRecord.dbd
rename to src/std/rec/aSubRecord.dbd
diff --git a/src/rec/aaiRecord.c b/src/std/rec/aaiRecord.c
similarity index 100%
rename from src/rec/aaiRecord.c
rename to src/std/rec/aaiRecord.c
diff --git a/src/rec/aaiRecord.dbd b/src/std/rec/aaiRecord.dbd
similarity index 100%
rename from src/rec/aaiRecord.dbd
rename to src/std/rec/aaiRecord.dbd
diff --git a/src/rec/aaoRecord.c b/src/std/rec/aaoRecord.c
similarity index 100%
rename from src/rec/aaoRecord.c
rename to src/std/rec/aaoRecord.c
diff --git a/src/rec/aaoRecord.dbd b/src/std/rec/aaoRecord.dbd
similarity index 100%
rename from src/rec/aaoRecord.dbd
rename to src/std/rec/aaoRecord.dbd
diff --git a/src/rec/aiRecord.c b/src/std/rec/aiRecord.c
similarity index 100%
rename from src/rec/aiRecord.c
rename to src/std/rec/aiRecord.c
diff --git a/src/rec/aiRecord.dbd b/src/std/rec/aiRecord.dbd
similarity index 100%
rename from src/rec/aiRecord.dbd
rename to src/std/rec/aiRecord.dbd
diff --git a/src/rec/aoRecord.c b/src/std/rec/aoRecord.c
similarity index 100%
rename from src/rec/aoRecord.c
rename to src/std/rec/aoRecord.c
diff --git a/src/rec/aoRecord.dbd b/src/std/rec/aoRecord.dbd
similarity index 100%
rename from src/rec/aoRecord.dbd
rename to src/std/rec/aoRecord.dbd
diff --git a/src/rec/biRecord.c b/src/std/rec/biRecord.c
similarity index 100%
rename from src/rec/biRecord.c
rename to src/std/rec/biRecord.c
diff --git a/src/rec/biRecord.dbd b/src/std/rec/biRecord.dbd
similarity index 100%
rename from src/rec/biRecord.dbd
rename to src/std/rec/biRecord.dbd
diff --git a/src/rec/boRecord.c b/src/std/rec/boRecord.c
similarity index 100%
rename from src/rec/boRecord.c
rename to src/std/rec/boRecord.c
diff --git a/src/rec/boRecord.dbd b/src/std/rec/boRecord.dbd
similarity index 100%
rename from src/rec/boRecord.dbd
rename to src/std/rec/boRecord.dbd
diff --git a/src/rec/calcRecord.c b/src/std/rec/calcRecord.c
similarity index 100%
rename from src/rec/calcRecord.c
rename to src/std/rec/calcRecord.c
diff --git a/src/rec/calcRecord.dbd b/src/std/rec/calcRecord.dbd
similarity index 100%
rename from src/rec/calcRecord.dbd
rename to src/std/rec/calcRecord.dbd
diff --git a/src/rec/calcoutRecord.c b/src/std/rec/calcoutRecord.c
similarity index 100%
rename from src/rec/calcoutRecord.c
rename to src/std/rec/calcoutRecord.c
diff --git a/src/rec/calcoutRecord.dbd b/src/std/rec/calcoutRecord.dbd
similarity index 100%
rename from src/rec/calcoutRecord.dbd
rename to src/std/rec/calcoutRecord.dbd
diff --git a/src/rec/compressRecord.c b/src/std/rec/compressRecord.c
similarity index 100%
rename from src/rec/compressRecord.c
rename to src/std/rec/compressRecord.c
diff --git a/src/rec/compressRecord.dbd b/src/std/rec/compressRecord.dbd
similarity index 100%
rename from src/rec/compressRecord.dbd
rename to src/std/rec/compressRecord.dbd
diff --git a/src/rec/dfanoutRecord.c b/src/std/rec/dfanoutRecord.c
similarity index 100%
rename from src/rec/dfanoutRecord.c
rename to src/std/rec/dfanoutRecord.c
diff --git a/src/rec/dfanoutRecord.dbd b/src/std/rec/dfanoutRecord.dbd
similarity index 100%
rename from src/rec/dfanoutRecord.dbd
rename to src/std/rec/dfanoutRecord.dbd
diff --git a/src/rec/eventRecord.c b/src/std/rec/eventRecord.c
similarity index 100%
rename from src/rec/eventRecord.c
rename to src/std/rec/eventRecord.c
diff --git a/src/rec/eventRecord.dbd b/src/std/rec/eventRecord.dbd
similarity index 100%
rename from src/rec/eventRecord.dbd
rename to src/std/rec/eventRecord.dbd
diff --git a/src/rec/fanoutRecord.c b/src/std/rec/fanoutRecord.c
similarity index 100%
rename from src/rec/fanoutRecord.c
rename to src/std/rec/fanoutRecord.c
diff --git a/src/rec/fanoutRecord.dbd b/src/std/rec/fanoutRecord.dbd
similarity index 100%
rename from src/rec/fanoutRecord.dbd
rename to src/std/rec/fanoutRecord.dbd
diff --git a/src/rec/histogramRecord.c b/src/std/rec/histogramRecord.c
similarity index 100%
rename from src/rec/histogramRecord.c
rename to src/std/rec/histogramRecord.c
diff --git a/src/rec/histogramRecord.dbd b/src/std/rec/histogramRecord.dbd
similarity index 100%
rename from src/rec/histogramRecord.dbd
rename to src/std/rec/histogramRecord.dbd
diff --git a/src/rec/longinRecord.c b/src/std/rec/longinRecord.c
similarity index 100%
rename from src/rec/longinRecord.c
rename to src/std/rec/longinRecord.c
diff --git a/src/rec/longinRecord.dbd b/src/std/rec/longinRecord.dbd
similarity index 100%
rename from src/rec/longinRecord.dbd
rename to src/std/rec/longinRecord.dbd
diff --git a/src/rec/longoutRecord.c b/src/std/rec/longoutRecord.c
similarity index 100%
rename from src/rec/longoutRecord.c
rename to src/std/rec/longoutRecord.c
diff --git a/src/rec/longoutRecord.dbd b/src/std/rec/longoutRecord.dbd
similarity index 100%
rename from src/rec/longoutRecord.dbd
rename to src/std/rec/longoutRecord.dbd
diff --git a/src/rec/mbbiDirectRecord.c b/src/std/rec/mbbiDirectRecord.c
similarity index 100%
rename from src/rec/mbbiDirectRecord.c
rename to src/std/rec/mbbiDirectRecord.c
diff --git a/src/rec/mbbiDirectRecord.dbd b/src/std/rec/mbbiDirectRecord.dbd
similarity index 100%
rename from src/rec/mbbiDirectRecord.dbd
rename to src/std/rec/mbbiDirectRecord.dbd
diff --git a/src/rec/mbbiRecord.c b/src/std/rec/mbbiRecord.c
similarity index 100%
rename from src/rec/mbbiRecord.c
rename to src/std/rec/mbbiRecord.c
diff --git a/src/rec/mbbiRecord.dbd b/src/std/rec/mbbiRecord.dbd
similarity index 100%
rename from src/rec/mbbiRecord.dbd
rename to src/std/rec/mbbiRecord.dbd
diff --git a/src/rec/mbboDirectRecord.c b/src/std/rec/mbboDirectRecord.c
similarity index 100%
rename from src/rec/mbboDirectRecord.c
rename to src/std/rec/mbboDirectRecord.c
diff --git a/src/rec/mbboDirectRecord.dbd b/src/std/rec/mbboDirectRecord.dbd
similarity index 100%
rename from src/rec/mbboDirectRecord.dbd
rename to src/std/rec/mbboDirectRecord.dbd
diff --git a/src/rec/mbboRecord.c b/src/std/rec/mbboRecord.c
similarity index 100%
rename from src/rec/mbboRecord.c
rename to src/std/rec/mbboRecord.c
diff --git a/src/rec/mbboRecord.dbd b/src/std/rec/mbboRecord.dbd
similarity index 100%
rename from src/rec/mbboRecord.dbd
rename to src/std/rec/mbboRecord.dbd
diff --git a/src/rec/permissiveRecord.c b/src/std/rec/permissiveRecord.c
similarity index 100%
rename from src/rec/permissiveRecord.c
rename to src/std/rec/permissiveRecord.c
diff --git a/src/rec/permissiveRecord.dbd b/src/std/rec/permissiveRecord.dbd
similarity index 100%
rename from src/rec/permissiveRecord.dbd
rename to src/std/rec/permissiveRecord.dbd
diff --git a/src/rec/recIoc.rc b/src/std/rec/recIoc.rc
similarity index 100%
rename from src/rec/recIoc.rc
rename to src/std/rec/recIoc.rc
diff --git a/src/rec/selRecord.c b/src/std/rec/selRecord.c
similarity index 100%
rename from src/rec/selRecord.c
rename to src/std/rec/selRecord.c
diff --git a/src/rec/selRecord.dbd b/src/std/rec/selRecord.dbd
similarity index 100%
rename from src/rec/selRecord.dbd
rename to src/std/rec/selRecord.dbd
diff --git a/src/rec/seqRecord.c b/src/std/rec/seqRecord.c
similarity index 100%
rename from src/rec/seqRecord.c
rename to src/std/rec/seqRecord.c
diff --git a/src/rec/seqRecord.dbd b/src/std/rec/seqRecord.dbd
similarity index 100%
rename from src/rec/seqRecord.dbd
rename to src/std/rec/seqRecord.dbd
diff --git a/src/rec/stateRecord.c b/src/std/rec/stateRecord.c
similarity index 100%
rename from src/rec/stateRecord.c
rename to src/std/rec/stateRecord.c
diff --git a/src/rec/stateRecord.dbd b/src/std/rec/stateRecord.dbd
similarity index 100%
rename from src/rec/stateRecord.dbd
rename to src/std/rec/stateRecord.dbd
diff --git a/src/rec/stringinRecord.c b/src/std/rec/stringinRecord.c
similarity index 100%
rename from src/rec/stringinRecord.c
rename to src/std/rec/stringinRecord.c
diff --git a/src/rec/stringinRecord.dbd b/src/std/rec/stringinRecord.dbd
similarity index 100%
rename from src/rec/stringinRecord.dbd
rename to src/std/rec/stringinRecord.dbd
diff --git a/src/rec/stringoutRecord.c b/src/std/rec/stringoutRecord.c
similarity index 100%
rename from src/rec/stringoutRecord.c
rename to src/std/rec/stringoutRecord.c
diff --git a/src/rec/stringoutRecord.dbd b/src/std/rec/stringoutRecord.dbd
similarity index 100%
rename from src/rec/stringoutRecord.dbd
rename to src/std/rec/stringoutRecord.dbd
diff --git a/src/rec/subArrayRecord.c b/src/std/rec/subArrayRecord.c
similarity index 100%
rename from src/rec/subArrayRecord.c
rename to src/std/rec/subArrayRecord.c
diff --git a/src/rec/subArrayRecord.dbd b/src/std/rec/subArrayRecord.dbd
similarity index 100%
rename from src/rec/subArrayRecord.dbd
rename to src/std/rec/subArrayRecord.dbd
diff --git a/src/rec/subRecord.c b/src/std/rec/subRecord.c
similarity index 100%
rename from src/rec/subRecord.c
rename to src/std/rec/subRecord.c
diff --git a/src/rec/subRecord.dbd b/src/std/rec/subRecord.dbd
similarity index 100%
rename from src/rec/subRecord.dbd
rename to src/std/rec/subRecord.dbd
diff --git a/src/rec/waveformRecord.c b/src/std/rec/waveformRecord.c
similarity index 100%
rename from src/rec/waveformRecord.c
rename to src/std/rec/waveformRecord.c
diff --git a/src/rec/waveformRecord.dbd b/src/std/rec/waveformRecord.dbd
similarity index 100%
rename from src/rec/waveformRecord.dbd
rename to src/std/rec/waveformRecord.dbd
diff --git a/src/softIoc/Makefile b/src/std/softIoc/Makefile
similarity index 100%
rename from src/softIoc/Makefile
rename to src/std/softIoc/Makefile
diff --git a/src/softIoc/makeInstallDir.pl b/src/std/softIoc/makeInstallDir.pl
similarity index 100%
rename from src/softIoc/makeInstallDir.pl
rename to src/std/softIoc/makeInstallDir.pl
diff --git a/src/softIoc/softIocExit.db b/src/std/softIoc/softIocExit.db
similarity index 100%
rename from src/softIoc/softIocExit.db
rename to src/std/softIoc/softIocExit.db
diff --git a/src/softIoc/softMain.cpp b/src/std/softIoc/softMain.cpp
similarity index 100%
rename from src/softIoc/softMain.cpp
rename to src/std/softIoc/softMain.cpp
diff --git a/src/dev/testDev/Makefile b/src/std/test/Makefile
similarity index 100%
rename from src/dev/testDev/Makefile
rename to src/std/test/Makefile
diff --git a/src/dev/testDev/devHistogramTestAsyn.c b/src/std/test/devHistogramTestAsyn.c
similarity index 100%
rename from src/dev/testDev/devHistogramTestAsyn.c
rename to src/std/test/devHistogramTestAsyn.c
diff --git a/src/dev/testDev/devTestAsyn.c b/src/std/test/devTestAsyn.c
similarity index 100%
rename from src/dev/testDev/devTestAsyn.c
rename to src/std/test/devTestAsyn.c
diff --git a/src/dev/testDev/devTestAsyn.dbd b/src/std/test/devTestAsyn.dbd
similarity index 100%
rename from src/dev/testDev/devTestAsyn.dbd
rename to src/std/test/devTestAsyn.dbd
diff --git a/src/dev/testDev/testDevIoc.rc b/src/std/test/testDevIoc.rc
similarity index 100%
rename from src/dev/testDev/testDevIoc.rc
rename to src/std/test/testDevIoc.rc
diff --git a/src/makeBaseApp/Makefile b/src/template/base/Makefile
similarity index 100%
rename from src/makeBaseApp/Makefile
rename to src/template/base/Makefile
diff --git a/src/makeBaseApp/makeBaseApp.pl b/src/template/base/makeBaseApp.pl
similarity index 100%
rename from src/makeBaseApp/makeBaseApp.pl
rename to src/template/base/makeBaseApp.pl
diff --git a/src/makeBaseApp/top/Makefile b/src/template/base/top/Makefile
similarity index 100%
rename from src/makeBaseApp/top/Makefile
rename to src/template/base/top/Makefile
diff --git a/src/makeBaseApp/top/caClientApp/Makefile b/src/template/base/top/caClientApp/Makefile
similarity index 100%
rename from src/makeBaseApp/top/caClientApp/Makefile
rename to src/template/base/top/caClientApp/Makefile
diff --git a/src/makeBaseApp/top/caClientApp/caExample.c b/src/template/base/top/caClientApp/caExample.c
similarity index 100%
rename from src/makeBaseApp/top/caClientApp/caExample.c
rename to src/template/base/top/caClientApp/caExample.c
diff --git a/src/makeBaseApp/top/caClientApp/caMonitor.c b/src/template/base/top/caClientApp/caMonitor.c
similarity index 100%
rename from src/makeBaseApp/top/caClientApp/caMonitor.c
rename to src/template/base/top/caClientApp/caMonitor.c
diff --git a/src/makeBaseApp/top/caServerApp/Makefile b/src/template/base/top/caServerApp/Makefile
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/Makefile
rename to src/template/base/top/caServerApp/Makefile
diff --git a/src/makeBaseApp/top/caServerApp/README b/src/template/base/top/caServerApp/README
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/README
rename to src/template/base/top/caServerApp/README
diff --git a/src/makeBaseApp/top/caServerApp/exAsyncPV.cc b/src/template/base/top/caServerApp/exAsyncPV.cc
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/exAsyncPV.cc
rename to src/template/base/top/caServerApp/exAsyncPV.cc
diff --git a/src/makeBaseApp/top/caServerApp/exChannel.cc b/src/template/base/top/caServerApp/exChannel.cc
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/exChannel.cc
rename to src/template/base/top/caServerApp/exChannel.cc
diff --git a/src/makeBaseApp/top/caServerApp/exPV.cc b/src/template/base/top/caServerApp/exPV.cc
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/exPV.cc
rename to src/template/base/top/caServerApp/exPV.cc
diff --git a/src/makeBaseApp/top/caServerApp/exScalarPV.cc b/src/template/base/top/caServerApp/exScalarPV.cc
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/exScalarPV.cc
rename to src/template/base/top/caServerApp/exScalarPV.cc
diff --git a/src/makeBaseApp/top/caServerApp/exServer.cc b/src/template/base/top/caServerApp/exServer.cc
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/exServer.cc
rename to src/template/base/top/caServerApp/exServer.cc
diff --git a/src/makeBaseApp/top/caServerApp/exServer.h b/src/template/base/top/caServerApp/exServer.h
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/exServer.h
rename to src/template/base/top/caServerApp/exServer.h
diff --git a/src/makeBaseApp/top/caServerApp/exVectorPV.cc b/src/template/base/top/caServerApp/exVectorPV.cc
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/exVectorPV.cc
rename to src/template/base/top/caServerApp/exVectorPV.cc
diff --git a/src/makeBaseApp/top/caServerApp/main.cc b/src/template/base/top/caServerApp/main.cc
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/main.cc
rename to src/template/base/top/caServerApp/main.cc
diff --git a/src/makeBaseApp/top/caServerApp/test.adl b/src/template/base/top/caServerApp/test.adl
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/test.adl
rename to src/template/base/top/caServerApp/test.adl
diff --git a/src/makeBaseApp/top/caServerApp/vxEntry.cc b/src/template/base/top/caServerApp/vxEntry.cc
similarity index 100%
rename from src/makeBaseApp/top/caServerApp/vxEntry.cc
rename to src/template/base/top/caServerApp/vxEntry.cc
diff --git a/src/makeBaseApp/top/configure/CONFIG b/src/template/base/top/configure/CONFIG
similarity index 100%
rename from src/makeBaseApp/top/configure/CONFIG
rename to src/template/base/top/configure/CONFIG
diff --git a/src/makeBaseApp/top/configure/CONFIG_SITE b/src/template/base/top/configure/CONFIG_SITE
similarity index 100%
rename from src/makeBaseApp/top/configure/CONFIG_SITE
rename to src/template/base/top/configure/CONFIG_SITE
diff --git a/src/makeBaseApp/top/configure/Makefile b/src/template/base/top/configure/Makefile
similarity index 100%
rename from src/makeBaseApp/top/configure/Makefile
rename to src/template/base/top/configure/Makefile
diff --git a/src/makeBaseApp/top/configure/RELEASE b/src/template/base/top/configure/RELEASE
similarity index 100%
rename from src/makeBaseApp/top/configure/RELEASE
rename to src/template/base/top/configure/RELEASE
diff --git a/src/makeBaseApp/top/configure/RULES b/src/template/base/top/configure/RULES
similarity index 100%
rename from src/makeBaseApp/top/configure/RULES
rename to src/template/base/top/configure/RULES
diff --git a/src/makeBaseApp/top/configure/RULES.ioc b/src/template/base/top/configure/RULES.ioc
similarity index 100%
rename from src/makeBaseApp/top/configure/RULES.ioc
rename to src/template/base/top/configure/RULES.ioc
diff --git a/src/makeBaseApp/top/configure/RULES_DIRS b/src/template/base/top/configure/RULES_DIRS
similarity index 100%
rename from src/makeBaseApp/top/configure/RULES_DIRS
rename to src/template/base/top/configure/RULES_DIRS
diff --git a/src/makeBaseApp/top/configure/RULES_TOP b/src/template/base/top/configure/RULES_TOP
similarity index 100%
rename from src/makeBaseApp/top/configure/RULES_TOP
rename to src/template/base/top/configure/RULES_TOP
diff --git a/src/makeBaseApp/top/exampleApp/Db/Makefile b/src/template/base/top/exampleApp/Db/Makefile
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/Db/Makefile
rename to src/template/base/top/exampleApp/Db/Makefile
diff --git a/src/makeBaseApp/top/exampleApp/Db/dbExample1.db b/src/template/base/top/exampleApp/Db/dbExample1.db
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/Db/dbExample1.db
rename to src/template/base/top/exampleApp/Db/dbExample1.db
diff --git a/src/makeBaseApp/top/exampleApp/Db/dbExample2.db b/src/template/base/top/exampleApp/Db/dbExample2.db
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/Db/dbExample2.db
rename to src/template/base/top/exampleApp/Db/dbExample2.db
diff --git a/src/makeBaseApp/top/exampleApp/Db/dbSubExample.db b/src/template/base/top/exampleApp/Db/dbSubExample.db
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/Db/dbSubExample.db
rename to src/template/base/top/exampleApp/Db/dbSubExample.db
diff --git a/src/makeBaseApp/top/exampleApp/Db/user.substitutions b/src/template/base/top/exampleApp/Db/user.substitutions
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/Db/user.substitutions
rename to src/template/base/top/exampleApp/Db/user.substitutions
diff --git a/src/makeBaseApp/top/exampleApp/Db/userHost.substitutions b/src/template/base/top/exampleApp/Db/userHost.substitutions
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/Db/userHost.substitutions
rename to src/template/base/top/exampleApp/Db/userHost.substitutions
diff --git a/src/makeBaseApp/top/exampleApp/Makefile b/src/template/base/top/exampleApp/Makefile
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/Makefile
rename to src/template/base/top/exampleApp/Makefile
diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile b/src/template/base/top/exampleApp/src/Makefile
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/Makefile
rename to src/template/base/top/exampleApp/src/Makefile
diff --git a/src/makeBaseApp/top/exampleApp/src/_APPNAME_Hello.c b/src/template/base/top/exampleApp/src/_APPNAME_Hello.c
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/_APPNAME_Hello.c
rename to src/template/base/top/exampleApp/src/_APPNAME_Hello.c
diff --git a/src/makeBaseApp/top/exampleApp/src/_APPNAME_Hello.dbd b/src/template/base/top/exampleApp/src/_APPNAME_Hello.dbd
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/_APPNAME_Hello.dbd
rename to src/template/base/top/exampleApp/src/_APPNAME_Hello.dbd
diff --git a/src/makeBaseApp/top/exampleApp/src/_APPNAME_Main.cpp b/src/template/base/top/exampleApp/src/_APPNAME_Main.cpp
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/_APPNAME_Main.cpp
rename to src/template/base/top/exampleApp/src/_APPNAME_Main.cpp
diff --git a/src/makeBaseApp/top/exampleApp/src/dbSubExample.c b/src/template/base/top/exampleApp/src/dbSubExample.c
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/dbSubExample.c
rename to src/template/base/top/exampleApp/src/dbSubExample.c
diff --git a/src/makeBaseApp/top/exampleApp/src/dbSubExample.dbd b/src/template/base/top/exampleApp/src/dbSubExample.dbd
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/dbSubExample.dbd
rename to src/template/base/top/exampleApp/src/dbSubExample.dbd
diff --git a/src/makeBaseApp/top/exampleApp/src/devXxxSoft.c b/src/template/base/top/exampleApp/src/devXxxSoft.c
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/devXxxSoft.c
rename to src/template/base/top/exampleApp/src/devXxxSoft.c
diff --git a/src/makeBaseApp/top/exampleApp/src/initTrace.c b/src/template/base/top/exampleApp/src/initTrace.c
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/initTrace.c
rename to src/template/base/top/exampleApp/src/initTrace.c
diff --git a/src/makeBaseApp/top/exampleApp/src/initTrace.dbd b/src/template/base/top/exampleApp/src/initTrace.dbd
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/initTrace.dbd
rename to src/template/base/top/exampleApp/src/initTrace.dbd
diff --git a/src/makeBaseApp/top/exampleApp/src/sncExample.dbd b/src/template/base/top/exampleApp/src/sncExample.dbd
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/sncExample.dbd
rename to src/template/base/top/exampleApp/src/sncExample.dbd
diff --git a/src/makeBaseApp/top/exampleApp/src/sncExample.stt b/src/template/base/top/exampleApp/src/sncExample.stt
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/sncExample.stt
rename to src/template/base/top/exampleApp/src/sncExample.stt
diff --git a/src/makeBaseApp/top/exampleApp/src/sncProgram.st b/src/template/base/top/exampleApp/src/sncProgram.st
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/sncProgram.st
rename to src/template/base/top/exampleApp/src/sncProgram.st
diff --git a/src/makeBaseApp/top/exampleApp/src/xxxRecord.c b/src/template/base/top/exampleApp/src/xxxRecord.c
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/xxxRecord.c
rename to src/template/base/top/exampleApp/src/xxxRecord.c
diff --git a/src/makeBaseApp/top/exampleApp/src/xxxRecord.dbd b/src/template/base/top/exampleApp/src/xxxRecord.dbd
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/xxxRecord.dbd
rename to src/template/base/top/exampleApp/src/xxxRecord.dbd
diff --git a/src/makeBaseApp/top/exampleApp/src/xxxSupport.dbd b/src/template/base/top/exampleApp/src/xxxSupport.dbd
similarity index 100%
rename from src/makeBaseApp/top/exampleApp/src/xxxSupport.dbd
rename to src/template/base/top/exampleApp/src/xxxSupport.dbd
diff --git a/src/makeBaseApp/top/exampleBoot/Makefile b/src/template/base/top/exampleBoot/Makefile
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/Makefile
rename to src/template/base/top/exampleBoot/Makefile
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/Makefile@Common b/src/template/base/top/exampleBoot/ioc/Makefile@Common
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/ioc/Makefile@Common
rename to src/template/base/top/exampleBoot/ioc/Makefile@Common
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/Makefile@vxWorks b/src/template/base/top/exampleBoot/ioc/Makefile@vxWorks
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/ioc/Makefile@vxWorks
rename to src/template/base/top/exampleBoot/ioc/Makefile@vxWorks
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/Makefile@win32 b/src/template/base/top/exampleBoot/ioc/Makefile@win32
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/ioc/Makefile@win32
rename to src/template/base/top/exampleBoot/ioc/Makefile@win32
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/README@Common b/src/template/base/top/exampleBoot/ioc/README@Common
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/ioc/README@Common
rename to src/template/base/top/exampleBoot/ioc/README@Common
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/README@RTEMS b/src/template/base/top/exampleBoot/ioc/README@RTEMS
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/ioc/README@RTEMS
rename to src/template/base/top/exampleBoot/ioc/README@RTEMS
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/README@vxWorks b/src/template/base/top/exampleBoot/ioc/README@vxWorks
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/ioc/README@vxWorks
rename to src/template/base/top/exampleBoot/ioc/README@vxWorks
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common b/src/template/base/top/exampleBoot/ioc/st.cmd@Common
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common
rename to src/template/base/top/exampleBoot/ioc/st.cmd@Common
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@RTEMS b/src/template/base/top/exampleBoot/ioc/st.cmd@RTEMS
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/ioc/st.cmd@RTEMS
rename to src/template/base/top/exampleBoot/ioc/st.cmd@RTEMS
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@vxWorks b/src/template/base/top/exampleBoot/ioc/st.cmd@vxWorks
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/ioc/st.cmd@vxWorks
rename to src/template/base/top/exampleBoot/ioc/st.cmd@vxWorks
diff --git a/src/makeBaseApp/top/exampleBoot/nfsCommands@RTEMS b/src/template/base/top/exampleBoot/nfsCommands@RTEMS
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/nfsCommands@RTEMS
rename to src/template/base/top/exampleBoot/nfsCommands@RTEMS
diff --git a/src/makeBaseApp/top/exampleBoot/nfsCommands@vxWorks b/src/template/base/top/exampleBoot/nfsCommands@vxWorks
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/nfsCommands@vxWorks
rename to src/template/base/top/exampleBoot/nfsCommands@vxWorks
diff --git a/src/makeBaseApp/top/iocApp/Db/Makefile b/src/template/base/top/iocApp/Db/Makefile
similarity index 100%
rename from src/makeBaseApp/top/iocApp/Db/Makefile
rename to src/template/base/top/iocApp/Db/Makefile
diff --git a/src/makeBaseApp/top/iocApp/Makefile b/src/template/base/top/iocApp/Makefile
similarity index 100%
rename from src/makeBaseApp/top/iocApp/Makefile
rename to src/template/base/top/iocApp/Makefile
diff --git a/src/makeBaseApp/top/iocApp/src/Makefile b/src/template/base/top/iocApp/src/Makefile
similarity index 100%
rename from src/makeBaseApp/top/iocApp/src/Makefile
rename to src/template/base/top/iocApp/src/Makefile
diff --git a/src/makeBaseApp/top/iocApp/src/_APPNAME_Main.cpp b/src/template/base/top/iocApp/src/_APPNAME_Main.cpp
similarity index 100%
rename from src/makeBaseApp/top/iocApp/src/_APPNAME_Main.cpp
rename to src/template/base/top/iocApp/src/_APPNAME_Main.cpp
diff --git a/src/makeBaseApp/top/iocBoot/Makefile b/src/template/base/top/iocBoot/Makefile
similarity index 100%
rename from src/makeBaseApp/top/iocBoot/Makefile
rename to src/template/base/top/iocBoot/Makefile
diff --git a/src/makeBaseApp/top/iocBoot/ioc/Makefile@Common b/src/template/base/top/iocBoot/ioc/Makefile@Common
similarity index 100%
rename from src/makeBaseApp/top/iocBoot/ioc/Makefile@Common
rename to src/template/base/top/iocBoot/ioc/Makefile@Common
diff --git a/src/makeBaseApp/top/iocBoot/ioc/Makefile@vxWorks b/src/template/base/top/iocBoot/ioc/Makefile@vxWorks
similarity index 100%
rename from src/makeBaseApp/top/iocBoot/ioc/Makefile@vxWorks
rename to src/template/base/top/iocBoot/ioc/Makefile@vxWorks
diff --git a/src/makeBaseApp/top/iocBoot/ioc/Makefile@win32 b/src/template/base/top/iocBoot/ioc/Makefile@win32
similarity index 100%
rename from src/makeBaseApp/top/iocBoot/ioc/Makefile@win32
rename to src/template/base/top/iocBoot/ioc/Makefile@win32
diff --git a/src/makeBaseApp/top/iocBoot/ioc/st.cmd@Common b/src/template/base/top/iocBoot/ioc/st.cmd@Common
similarity index 100%
rename from src/makeBaseApp/top/iocBoot/ioc/st.cmd@Common
rename to src/template/base/top/iocBoot/ioc/st.cmd@Common
diff --git a/src/makeBaseApp/top/iocBoot/ioc/st.cmd@Cross b/src/template/base/top/iocBoot/ioc/st.cmd@Cross
similarity index 100%
rename from src/makeBaseApp/top/iocBoot/ioc/st.cmd@Cross
rename to src/template/base/top/iocBoot/ioc/st.cmd@Cross
diff --git a/src/makeBaseApp/top/iocBoot/ioc/st.cmd@RTEMS b/src/template/base/top/iocBoot/ioc/st.cmd@RTEMS
similarity index 100%
rename from src/makeBaseApp/top/iocBoot/ioc/st.cmd@RTEMS
rename to src/template/base/top/iocBoot/ioc/st.cmd@RTEMS
diff --git a/src/makeBaseApp/top/iocBoot/ioc/st.cmd@vxWorks b/src/template/base/top/iocBoot/ioc/st.cmd@vxWorks
similarity index 100%
rename from src/makeBaseApp/top/iocBoot/ioc/st.cmd@vxWorks
rename to src/template/base/top/iocBoot/ioc/st.cmd@vxWorks
diff --git a/src/makeBaseApp/top/iocBoot/nfsCommands@RTEMS b/src/template/base/top/iocBoot/nfsCommands@RTEMS
similarity index 100%
rename from src/makeBaseApp/top/iocBoot/nfsCommands@RTEMS
rename to src/template/base/top/iocBoot/nfsCommands@RTEMS
diff --git a/src/makeBaseApp/top/iocBoot/nfsCommands@vxWorks b/src/template/base/top/iocBoot/nfsCommands@vxWorks
similarity index 100%
rename from src/makeBaseApp/top/iocBoot/nfsCommands@vxWorks
rename to src/template/base/top/iocBoot/nfsCommands@vxWorks
diff --git a/src/makeBaseApp/top/supportApp/Db/Makefile b/src/template/base/top/supportApp/Db/Makefile
similarity index 100%
rename from src/makeBaseApp/top/supportApp/Db/Makefile
rename to src/template/base/top/supportApp/Db/Makefile
diff --git a/src/makeBaseApp/top/supportApp/Makefile b/src/template/base/top/supportApp/Makefile
similarity index 100%
rename from src/makeBaseApp/top/supportApp/Makefile
rename to src/template/base/top/supportApp/Makefile
diff --git a/src/makeBaseApp/top/supportApp/src/Makefile b/src/template/base/top/supportApp/src/Makefile
similarity index 100%
rename from src/makeBaseApp/top/supportApp/src/Makefile
rename to src/template/base/top/supportApp/src/Makefile
diff --git a/src/makeBaseApp/top/supportApp/src/_APPNAME_.dbd b/src/template/base/top/supportApp/src/_APPNAME_.dbd
similarity index 100%
rename from src/makeBaseApp/top/supportApp/src/_APPNAME_.dbd
rename to src/template/base/top/supportApp/src/_APPNAME_.dbd
diff --git a/src/makeBaseExt/Makefile b/src/template/ext/Makefile
similarity index 100%
rename from src/makeBaseExt/Makefile
rename to src/template/ext/Makefile
diff --git a/src/makeBaseExt/makeBaseExt.pl b/src/template/ext/makeBaseExt.pl
similarity index 100%
rename from src/makeBaseExt/makeBaseExt.pl
rename to src/template/ext/makeBaseExt.pl
diff --git a/src/makeBaseExt/top/Makefile b/src/template/ext/top/Makefile
similarity index 100%
rename from src/makeBaseExt/top/Makefile
rename to src/template/ext/top/Makefile
diff --git a/src/makeBaseExt/top/README b/src/template/ext/top/README
similarity index 100%
rename from src/makeBaseExt/top/README
rename to src/template/ext/top/README
diff --git a/src/makeBaseExt/top/configure/CONFIG b/src/template/ext/top/configure/CONFIG
similarity index 100%
rename from src/makeBaseExt/top/configure/CONFIG
rename to src/template/ext/top/configure/CONFIG
diff --git a/src/makeBaseExt/top/configure/CONFIG_SITE b/src/template/ext/top/configure/CONFIG_SITE
similarity index 100%
rename from src/makeBaseExt/top/configure/CONFIG_SITE
rename to src/template/ext/top/configure/CONFIG_SITE
diff --git a/src/makeBaseExt/top/configure/Makefile b/src/template/ext/top/configure/Makefile
similarity index 100%
rename from src/makeBaseExt/top/configure/Makefile
rename to src/template/ext/top/configure/Makefile
diff --git a/src/makeBaseExt/top/configure/RELEASE b/src/template/ext/top/configure/RELEASE
similarity index 100%
rename from src/makeBaseExt/top/configure/RELEASE
rename to src/template/ext/top/configure/RELEASE
diff --git a/src/makeBaseExt/top/configure/RULES b/src/template/ext/top/configure/RULES
similarity index 100%
rename from src/makeBaseExt/top/configure/RULES
rename to src/template/ext/top/configure/RULES
diff --git a/src/makeBaseExt/top/configure/RULES_DIRS b/src/template/ext/top/configure/RULES_DIRS
similarity index 100%
rename from src/makeBaseExt/top/configure/RULES_DIRS
rename to src/template/ext/top/configure/RULES_DIRS
diff --git a/src/makeBaseExt/top/configure/RULES_IDL b/src/template/ext/top/configure/RULES_IDL
similarity index 100%
rename from src/makeBaseExt/top/configure/RULES_IDL
rename to src/template/ext/top/configure/RULES_IDL
diff --git a/src/makeBaseExt/top/configure/RULES_PYTHON b/src/template/ext/top/configure/RULES_PYTHON
similarity index 100%
rename from src/makeBaseExt/top/configure/RULES_PYTHON
rename to src/template/ext/top/configure/RULES_PYTHON
diff --git a/src/makeBaseExt/top/configure/RULES_TOP b/src/template/ext/top/configure/RULES_TOP
similarity index 100%
rename from src/makeBaseExt/top/configure/RULES_TOP
rename to src/template/ext/top/configure/RULES_TOP
diff --git a/src/makeBaseExt/top/configure/os/CONFIG.linux-x86.linux-386 b/src/template/ext/top/configure/os/CONFIG.linux-x86.linux-386
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG.linux-x86.linux-386
rename to src/template/ext/top/configure/os/CONFIG.linux-x86.linux-386
diff --git a/src/makeBaseExt/top/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/src/template/ext/top/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
rename to src/template/ext/top/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.Common.Common b/src/template/ext/top/configure/os/CONFIG_SITE.Common.Common
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.Common.Common
rename to src/template/ext/top/configure/os/CONFIG_SITE.Common.Common
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu b/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu
rename to src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.aix-ppc.aix-ppc b/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc.aix-ppc
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.aix-ppc.aix-ppc
rename to src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc.aix-ppc
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86
rename to src/template/ext/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.darwin-ppc.darwin-ppc b/src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppc.darwin-ppc
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.darwin-ppc.darwin-ppc
rename to src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppc.darwin-ppc
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.darwin-ppcx86.darwin-ppcx86 b/src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppcx86.darwin-ppcx86
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.darwin-ppcx86.darwin-ppcx86
rename to src/template/ext/top/configure/os/CONFIG_SITE.darwin-ppcx86.darwin-ppcx86
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86
rename to src/template/ext/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.freebsd-x86_64.freebsd-x86_64 b/src/template/ext/top/configure/os/CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
rename to src/template/ext/top/configure/os/CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.hpux-parisc-gnu.hpux-parisc-gnu b/src/template/ext/top/configure/os/CONFIG_SITE.hpux-parisc-gnu.hpux-parisc-gnu
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.hpux-parisc-gnu.hpux-parisc-gnu
rename to src/template/ext/top/configure/os/CONFIG_SITE.hpux-parisc-gnu.hpux-parisc-gnu
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.hpux-parisc.hpux-parisc b/src/template/ext/top/configure/os/CONFIG_SITE.hpux-parisc.hpux-parisc
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.hpux-parisc.hpux-parisc
rename to src/template/ext/top/configure/os/CONFIG_SITE.hpux-parisc.hpux-parisc
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.interix-x86.interix-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.interix-x86.interix-x86
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.interix-x86.interix-x86
rename to src/template/ext/top/configure/os/CONFIG_SITE.interix-x86.interix-x86
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-ppc.linux-ppc b/src/template/ext/top/configure/os/CONFIG_SITE.linux-ppc.linux-ppc
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-ppc.linux-ppc
rename to src/template/ext/top/configure/os/CONFIG_SITE.linux-ppc.linux-ppc
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86-borland.linux-x86-borland b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86-borland.linux-x86-borland
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86-borland.linux-x86-borland
rename to src/template/ext/top/configure/os/CONFIG_SITE.linux-x86-borland.linux-x86-borland
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug
rename to src/template/ext/top/configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86.linux-athlon b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-athlon
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86.linux-athlon
rename to src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-athlon
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86.linux-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-x86
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86.linux-x86
rename to src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-x86
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug
rename to src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64
rename to src/template/ext/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc-debug.solaris-sparc-debug b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-debug.solaris-sparc-debug
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc-debug.solaris-sparc-debug
rename to src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-debug.solaris-sparc-debug
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc-gnu.solaris-sparc-gnu b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-gnu.solaris-sparc-gnu
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc-gnu.solaris-sparc-gnu
rename to src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc-gnu.solaris-sparc-gnu
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc
rename to src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu
rename to src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64 b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64
rename to src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-x86-debug.solaris-x86-debug b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-debug.solaris-x86-debug
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-x86-debug.solaris-x86-debug
rename to src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-debug.solaris-x86-debug
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-x86-gnu.solaris-x86-gnu b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-gnu.solaris-x86-gnu
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-x86-gnu.solaris-x86-gnu
rename to src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86-gnu.solaris-x86-gnu
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-x86.solaris-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86.solaris-x86
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-x86.solaris-x86
rename to src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86.solaris-x86
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-x86_64.solaris-x86_64 b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86_64.solaris-x86_64
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-x86_64.solaris-x86_64
rename to src/template/ext/top/configure/os/CONFIG_SITE.solaris-x86_64.solaris-x86_64
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86-borland.win32-x86-borland b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-borland.win32-x86-borland
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86-borland.win32-x86-borland
rename to src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-borland.win32-x86-borland
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
rename to src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86-debug.win32-x86-debug b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-debug.win32-x86-debug
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86-debug.win32-x86-debug
rename to src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-debug.win32-x86-debug
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw
rename to src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86.win32-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86.win32-x86
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86.win32-x86
rename to src/template/ext/top/configure/os/CONFIG_SITE.win32-x86.win32-x86
diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.windows-x64.windows-x64 b/src/template/ext/top/configure/os/CONFIG_SITE.windows-x64.windows-x64
similarity index 100%
rename from src/makeBaseExt/top/configure/os/CONFIG_SITE.windows-x64.windows-x64
rename to src/template/ext/top/configure/os/CONFIG_SITE.windows-x64.windows-x64
diff --git a/src/makeBaseExt/top/exampleExt/Makefile b/src/template/ext/top/exampleExt/Makefile
similarity index 100%
rename from src/makeBaseExt/top/exampleExt/Makefile
rename to src/template/ext/top/exampleExt/Makefile
diff --git a/src/makeBaseExt/top/exampleExt/RELEASE_NOTES.HTM b/src/template/ext/top/exampleExt/RELEASE_NOTES.HTM
similarity index 100%
rename from src/makeBaseExt/top/exampleExt/RELEASE_NOTES.HTM
rename to src/template/ext/top/exampleExt/RELEASE_NOTES.HTM
diff --git a/src/makeBaseExt/top/exampleExt/caExample.c b/src/template/ext/top/exampleExt/caExample.c
similarity index 100%
rename from src/makeBaseExt/top/exampleExt/caExample.c
rename to src/template/ext/top/exampleExt/caExample.c
diff --git a/src/makeBaseExt/top/simpleExt/Makefile b/src/template/ext/top/simpleExt/Makefile
similarity index 100%
rename from src/makeBaseExt/top/simpleExt/Makefile
rename to src/template/ext/top/simpleExt/Makefile
diff --git a/src/makeBaseExt/top/src/Makefile b/src/template/ext/top/src/Makefile
similarity index 100%
rename from src/makeBaseExt/top/src/Makefile
rename to src/template/ext/top/src/Makefile