diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2dd7304c2..000000000 --- a/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -/cfg/ -/bin/ -/lib/ -/db/ -/dbd/ -/html/ -/include/ -/templates/ -/configure/*.local -O.*/ -/QtC-* -*.orig -*.log -.*.swp diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 4806c058e..000000000 --- a/LICENSE +++ /dev/null @@ -1,87 +0,0 @@ -Copyright (c) 1991-2011 UChicago Argonne LLC. -Copyright (c) 1991-2006 The Regents of the University of California. -Copyright (c) 2006-2011. Los Alamos National Security, LLC. Some of this -material was produced under U.S. Government contract DE-AC52-06NA25396 -for Los Alamos National Laboratory (LANL), which is operated by Los Alamos -National Security, LLC for the U.S. Department of Energy. - -EPICS BASE is distributed subject to the following license conditions: - - SOFTWARE LICENSE AGREEMENT - Software: EPICS BASE - - 1. The "Software", below, refers to EPICS BASE (in either source code, or - binary form and accompanying documentation). Each licensee is - addressed as "you" or "Licensee." - - 2. The copyright holders shown above and their third-party licensors - hereby grant Licensee a royalty-free nonexclusive license, subject to - the limitations stated herein and U.S. Government license rights. - - 3. You may modify and make a copy or copies of the Software for use - within your organization, if you meet the following conditions: - a. Copies in source code must include the copyright notice and this - Software License Agreement. - b. Copies in binary form must include the copyright notice and this - Software License Agreement in the documentation and/or other - materials provided with the copy. - - 4. You may modify a copy or copies of the Software or any portion of it, - thus forming a work based on the Software, and distribute copies of - such work outside your organization, if you meet all of the following - conditions: - a. Copies in source code must include the copyright notice and this - Software License Agreement; - b. Copies in binary form must include the copyright notice and this - Software License Agreement in the documentation and/or other - materials provided with the copy; - c. Modified copies and works based on the Software must carry - prominent notices stating that you changed specified portions of - the Software. - - 5. Portions of the Software resulted from work developed under a U.S. - Government contract and are subject to the following license: the - Government is granted for itself and others acting on its behalf a - paid-up, nonexclusive, irrevocable worldwide license in this computer - software to reproduce, prepare derivative works, and perform publicly - and display publicly. - - 6. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY - OF ANY KIND. THE COPYRIGHT HOLDERS, THEIR THIRD PARTY LICENSORS, THE - UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND THEIR - EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING - BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS - FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME - ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, - OR USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE - SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT - THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR-FREE - OR THAT ANY ERRORS WILL BE CORRECTED. - - 7. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR - THIRD PARTY LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT - OF ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, INCIDENTAL, - CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE, - INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA, FOR ANY - REASON WHATSOEVER, WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF - CONTRACT, TORT (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR - OTHERWISE, EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE - POSSIBILITY OF SUCH LOSS OR DAMAGES. - -________________________________________________________________________ - -This software is in part copyrighted by the BERLINER SPEICHERRING -GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY), BERLIN, GERMANY. - -In no event shall BESSY be liable to any party for direct, indirect, -special, incidental, or consequential damages arising out of the use of -this software, its documentation, or any derivatives thereof, even if -BESSY has been advised of the possibility of such damage. - -BESSY specifically disclaims any warranties, including, but not limited -to, the implied warranties of merchantability, fitness for a particular -purpose, and non-infringement. This software is provided on an "as is" -basis, and BESSY has no obligation to provide maintenance, support, -updates, enhancements, or modifications. -________________________________________________________________________ - diff --git a/.ci/travis-build.sh b/modules/database/.ci/travis-build.sh similarity index 100% rename from .ci/travis-build.sh rename to modules/database/.ci/travis-build.sh diff --git a/.ci/travis-prepare.sh b/modules/database/.ci/travis-prepare.sh similarity index 100% rename from .ci/travis-prepare.sh rename to modules/database/.ci/travis-prepare.sh diff --git a/.travis.yml b/modules/database/.travis.yml similarity index 100% rename from .travis.yml rename to modules/database/.travis.yml diff --git a/Makefile b/modules/database/Makefile similarity index 100% rename from Makefile rename to modules/database/Makefile diff --git a/configure/CONFIG b/modules/database/configure/CONFIG similarity index 100% rename from configure/CONFIG rename to modules/database/configure/CONFIG diff --git a/configure/CONFIG_DATABASE_MODULE b/modules/database/configure/CONFIG_DATABASE_MODULE similarity index 100% rename from configure/CONFIG_DATABASE_MODULE rename to modules/database/configure/CONFIG_DATABASE_MODULE diff --git a/configure/CONFIG_DATABASE_VERSION b/modules/database/configure/CONFIG_DATABASE_VERSION similarity index 100% rename from configure/CONFIG_DATABASE_VERSION rename to modules/database/configure/CONFIG_DATABASE_VERSION diff --git a/configure/CONFIG_SITE b/modules/database/configure/CONFIG_SITE similarity index 100% rename from configure/CONFIG_SITE rename to modules/database/configure/CONFIG_SITE diff --git a/configure/Makefile b/modules/database/configure/Makefile similarity index 100% rename from configure/Makefile rename to modules/database/configure/Makefile diff --git a/configure/RELEASE b/modules/database/configure/RELEASE similarity index 100% rename from configure/RELEASE rename to modules/database/configure/RELEASE diff --git a/configure/RULES b/modules/database/configure/RULES similarity index 100% rename from configure/RULES rename to modules/database/configure/RULES diff --git a/configure/RULES.ioc b/modules/database/configure/RULES.ioc similarity index 100% rename from configure/RULES.ioc rename to modules/database/configure/RULES.ioc diff --git a/configure/RULES_DIRS b/modules/database/configure/RULES_DIRS similarity index 100% rename from configure/RULES_DIRS rename to modules/database/configure/RULES_DIRS diff --git a/configure/RULES_TOP b/modules/database/configure/RULES_TOP similarity index 100% rename from configure/RULES_TOP rename to modules/database/configure/RULES_TOP diff --git a/src/Makefile b/modules/database/src/Makefile similarity index 100% rename from src/Makefile rename to modules/database/src/Makefile diff --git a/src/ioc/Makefile b/modules/database/src/ioc/Makefile similarity index 100% rename from src/ioc/Makefile rename to modules/database/src/ioc/Makefile diff --git a/src/ioc/as/Makefile b/modules/database/src/ioc/as/Makefile similarity index 100% rename from src/ioc/as/Makefile rename to modules/database/src/ioc/as/Makefile diff --git a/src/ioc/as/asCa.c b/modules/database/src/ioc/as/asCa.c similarity index 100% rename from src/ioc/as/asCa.c rename to modules/database/src/ioc/as/asCa.c diff --git a/src/ioc/as/asCa.h b/modules/database/src/ioc/as/asCa.h similarity index 100% rename from src/ioc/as/asCa.h rename to modules/database/src/ioc/as/asCa.h diff --git a/src/ioc/as/asDbLib.c b/modules/database/src/ioc/as/asDbLib.c similarity index 100% rename from src/ioc/as/asDbLib.c rename to modules/database/src/ioc/as/asDbLib.c diff --git a/src/ioc/as/asDbLib.h b/modules/database/src/ioc/as/asDbLib.h similarity index 100% rename from src/ioc/as/asDbLib.h rename to modules/database/src/ioc/as/asDbLib.h diff --git a/src/ioc/as/asIocRegister.c b/modules/database/src/ioc/as/asIocRegister.c similarity index 100% rename from src/ioc/as/asIocRegister.c rename to modules/database/src/ioc/as/asIocRegister.c diff --git a/src/ioc/as/asIocRegister.h b/modules/database/src/ioc/as/asIocRegister.h similarity index 100% rename from src/ioc/as/asIocRegister.h rename to modules/database/src/ioc/as/asIocRegister.h diff --git a/src/ioc/as/ascheck.c b/modules/database/src/ioc/as/ascheck.c similarity index 100% rename from src/ioc/as/ascheck.c rename to modules/database/src/ioc/as/ascheck.c diff --git a/src/ioc/bpt/Makefile b/modules/database/src/ioc/bpt/Makefile similarity index 100% rename from src/ioc/bpt/Makefile rename to modules/database/src/ioc/bpt/Makefile diff --git a/src/ioc/bpt/RULES b/modules/database/src/ioc/bpt/RULES similarity index 100% rename from src/ioc/bpt/RULES rename to modules/database/src/ioc/bpt/RULES diff --git a/src/ioc/bpt/bptTypeJdegC.data b/modules/database/src/ioc/bpt/bptTypeJdegC.data similarity index 100% rename from src/ioc/bpt/bptTypeJdegC.data rename to modules/database/src/ioc/bpt/bptTypeJdegC.data diff --git a/src/ioc/bpt/bptTypeJdegF.data b/modules/database/src/ioc/bpt/bptTypeJdegF.data similarity index 100% rename from src/ioc/bpt/bptTypeJdegF.data rename to modules/database/src/ioc/bpt/bptTypeJdegF.data diff --git a/src/ioc/bpt/bptTypeKdegC.data b/modules/database/src/ioc/bpt/bptTypeKdegC.data similarity index 100% rename from src/ioc/bpt/bptTypeKdegC.data rename to modules/database/src/ioc/bpt/bptTypeKdegC.data diff --git a/src/ioc/bpt/bptTypeKdegF.data b/modules/database/src/ioc/bpt/bptTypeKdegF.data similarity index 100% rename from src/ioc/bpt/bptTypeKdegF.data rename to modules/database/src/ioc/bpt/bptTypeKdegF.data diff --git a/src/ioc/bpt/cvtTable.h b/modules/database/src/ioc/bpt/cvtTable.h similarity index 100% rename from src/ioc/bpt/cvtTable.h rename to modules/database/src/ioc/bpt/cvtTable.h diff --git a/src/ioc/bpt/makeBpt.c b/modules/database/src/ioc/bpt/makeBpt.c similarity index 100% rename from src/ioc/bpt/makeBpt.c rename to modules/database/src/ioc/bpt/makeBpt.c diff --git a/src/ioc/bpt/menuConvert.dbd.pod b/modules/database/src/ioc/bpt/menuConvert.dbd.pod similarity index 100% rename from src/ioc/bpt/menuConvert.dbd.pod rename to modules/database/src/ioc/bpt/menuConvert.dbd.pod diff --git a/src/ioc/databaseVersion.h b/modules/database/src/ioc/databaseVersion.h similarity index 100% rename from src/ioc/databaseVersion.h rename to modules/database/src/ioc/databaseVersion.h diff --git a/src/ioc/databaseVersionNum.h@ b/modules/database/src/ioc/databaseVersionNum.h@ similarity index 100% rename from src/ioc/databaseVersionNum.h@ rename to modules/database/src/ioc/databaseVersionNum.h@ diff --git a/src/ioc/db/Makefile b/modules/database/src/ioc/db/Makefile similarity index 100% rename from src/ioc/db/Makefile rename to modules/database/src/ioc/db/Makefile diff --git a/src/ioc/db/RULES b/modules/database/src/ioc/db/RULES similarity index 100% rename from src/ioc/db/RULES rename to modules/database/src/ioc/db/RULES diff --git a/src/ioc/db/callback.c b/modules/database/src/ioc/db/callback.c similarity index 100% rename from src/ioc/db/callback.c rename to modules/database/src/ioc/db/callback.c diff --git a/src/ioc/db/callback.h b/modules/database/src/ioc/db/callback.h similarity index 100% rename from src/ioc/db/callback.h rename to modules/database/src/ioc/db/callback.h diff --git a/src/ioc/db/chfPlugin.c b/modules/database/src/ioc/db/chfPlugin.c similarity index 100% rename from src/ioc/db/chfPlugin.c rename to modules/database/src/ioc/db/chfPlugin.c diff --git a/src/ioc/db/chfPlugin.h b/modules/database/src/ioc/db/chfPlugin.h similarity index 100% rename from src/ioc/db/chfPlugin.h rename to modules/database/src/ioc/db/chfPlugin.h diff --git a/src/ioc/db/cvtBpt.c b/modules/database/src/ioc/db/cvtBpt.c similarity index 100% rename from src/ioc/db/cvtBpt.c rename to modules/database/src/ioc/db/cvtBpt.c diff --git a/src/ioc/db/dbAccess.c b/modules/database/src/ioc/db/dbAccess.c similarity index 100% rename from src/ioc/db/dbAccess.c rename to modules/database/src/ioc/db/dbAccess.c diff --git a/src/ioc/db/dbAccess.h b/modules/database/src/ioc/db/dbAccess.h similarity index 100% rename from src/ioc/db/dbAccess.h rename to modules/database/src/ioc/db/dbAccess.h diff --git a/src/ioc/db/dbAccessDefs.h b/modules/database/src/ioc/db/dbAccessDefs.h similarity index 100% rename from src/ioc/db/dbAccessDefs.h rename to modules/database/src/ioc/db/dbAccessDefs.h diff --git a/src/ioc/db/dbAddr.h b/modules/database/src/ioc/db/dbAddr.h similarity index 100% rename from src/ioc/db/dbAddr.h rename to modules/database/src/ioc/db/dbAddr.h diff --git a/src/ioc/db/dbBkpt.c b/modules/database/src/ioc/db/dbBkpt.c similarity index 100% rename from src/ioc/db/dbBkpt.c rename to modules/database/src/ioc/db/dbBkpt.c diff --git a/src/ioc/db/dbBkpt.h b/modules/database/src/ioc/db/dbBkpt.h similarity index 100% rename from src/ioc/db/dbBkpt.h rename to modules/database/src/ioc/db/dbBkpt.h diff --git a/src/ioc/db/dbCAC.h b/modules/database/src/ioc/db/dbCAC.h similarity index 100% rename from src/ioc/db/dbCAC.h rename to modules/database/src/ioc/db/dbCAC.h diff --git a/src/ioc/db/dbCa.c b/modules/database/src/ioc/db/dbCa.c similarity index 100% rename from src/ioc/db/dbCa.c rename to modules/database/src/ioc/db/dbCa.c diff --git a/src/ioc/db/dbCa.h b/modules/database/src/ioc/db/dbCa.h similarity index 100% rename from src/ioc/db/dbCa.h rename to modules/database/src/ioc/db/dbCa.h diff --git a/src/ioc/db/dbCaPvt.h b/modules/database/src/ioc/db/dbCaPvt.h similarity index 100% rename from src/ioc/db/dbCaPvt.h rename to modules/database/src/ioc/db/dbCaPvt.h diff --git a/src/ioc/db/dbCaTest.c b/modules/database/src/ioc/db/dbCaTest.c similarity index 100% rename from src/ioc/db/dbCaTest.c rename to modules/database/src/ioc/db/dbCaTest.c diff --git a/src/ioc/db/dbCaTest.h b/modules/database/src/ioc/db/dbCaTest.h similarity index 100% rename from src/ioc/db/dbCaTest.h rename to modules/database/src/ioc/db/dbCaTest.h diff --git a/src/ioc/db/dbChannel.c b/modules/database/src/ioc/db/dbChannel.c similarity index 100% rename from src/ioc/db/dbChannel.c rename to modules/database/src/ioc/db/dbChannel.c diff --git a/src/ioc/db/dbChannel.h b/modules/database/src/ioc/db/dbChannel.h similarity index 100% rename from src/ioc/db/dbChannel.h rename to modules/database/src/ioc/db/dbChannel.h diff --git a/src/ioc/db/dbChannelIO.cpp b/modules/database/src/ioc/db/dbChannelIO.cpp similarity index 100% rename from src/ioc/db/dbChannelIO.cpp rename to modules/database/src/ioc/db/dbChannelIO.cpp diff --git a/src/ioc/db/dbChannelIO.h b/modules/database/src/ioc/db/dbChannelIO.h similarity index 100% rename from src/ioc/db/dbChannelIO.h rename to modules/database/src/ioc/db/dbChannelIO.h diff --git a/src/ioc/db/dbChannelNOOP.h b/modules/database/src/ioc/db/dbChannelNOOP.h similarity index 100% rename from src/ioc/db/dbChannelNOOP.h rename to modules/database/src/ioc/db/dbChannelNOOP.h diff --git a/src/ioc/db/dbCommon.dbd b/modules/database/src/ioc/db/dbCommon.dbd similarity index 100% rename from src/ioc/db/dbCommon.dbd rename to modules/database/src/ioc/db/dbCommon.dbd diff --git a/src/ioc/db/dbCommonPvt.h b/modules/database/src/ioc/db/dbCommonPvt.h similarity index 100% rename from src/ioc/db/dbCommonPvt.h rename to modules/database/src/ioc/db/dbCommonPvt.h diff --git a/src/ioc/db/dbCommonRecord.dbd b/modules/database/src/ioc/db/dbCommonRecord.dbd similarity index 100% rename from src/ioc/db/dbCommonRecord.dbd rename to modules/database/src/ioc/db/dbCommonRecord.dbd diff --git a/src/ioc/db/dbConstLink.c b/modules/database/src/ioc/db/dbConstLink.c similarity index 100% rename from src/ioc/db/dbConstLink.c rename to modules/database/src/ioc/db/dbConstLink.c diff --git a/src/ioc/db/dbConstLink.h b/modules/database/src/ioc/db/dbConstLink.h similarity index 100% rename from src/ioc/db/dbConstLink.h rename to modules/database/src/ioc/db/dbConstLink.h diff --git a/src/ioc/db/dbContext.cpp b/modules/database/src/ioc/db/dbContext.cpp similarity index 100% rename from src/ioc/db/dbContext.cpp rename to modules/database/src/ioc/db/dbContext.cpp diff --git a/src/ioc/db/dbContextReadNotifyCache.cpp b/modules/database/src/ioc/db/dbContextReadNotifyCache.cpp similarity index 100% rename from src/ioc/db/dbContextReadNotifyCache.cpp rename to modules/database/src/ioc/db/dbContextReadNotifyCache.cpp diff --git a/src/ioc/db/dbConvert.c b/modules/database/src/ioc/db/dbConvert.c similarity index 100% rename from src/ioc/db/dbConvert.c rename to modules/database/src/ioc/db/dbConvert.c diff --git a/src/ioc/db/dbConvert.h b/modules/database/src/ioc/db/dbConvert.h similarity index 100% rename from src/ioc/db/dbConvert.h rename to modules/database/src/ioc/db/dbConvert.h diff --git a/src/ioc/db/dbConvertFast.h b/modules/database/src/ioc/db/dbConvertFast.h similarity index 100% rename from src/ioc/db/dbConvertFast.h rename to modules/database/src/ioc/db/dbConvertFast.h diff --git a/src/ioc/db/dbConvertJSON.c b/modules/database/src/ioc/db/dbConvertJSON.c similarity index 100% rename from src/ioc/db/dbConvertJSON.c rename to modules/database/src/ioc/db/dbConvertJSON.c diff --git a/src/ioc/db/dbConvertJSON.h b/modules/database/src/ioc/db/dbConvertJSON.h similarity index 100% rename from src/ioc/db/dbConvertJSON.h rename to modules/database/src/ioc/db/dbConvertJSON.h diff --git a/src/ioc/db/dbDbLink.c b/modules/database/src/ioc/db/dbDbLink.c similarity index 100% rename from src/ioc/db/dbDbLink.c rename to modules/database/src/ioc/db/dbDbLink.c diff --git a/src/ioc/db/dbDbLink.h b/modules/database/src/ioc/db/dbDbLink.h similarity index 100% rename from src/ioc/db/dbDbLink.h rename to modules/database/src/ioc/db/dbDbLink.h diff --git a/src/ioc/db/dbEvent.c b/modules/database/src/ioc/db/dbEvent.c similarity index 100% rename from src/ioc/db/dbEvent.c rename to modules/database/src/ioc/db/dbEvent.c diff --git a/src/ioc/db/dbEvent.h b/modules/database/src/ioc/db/dbEvent.h similarity index 100% rename from src/ioc/db/dbEvent.h rename to modules/database/src/ioc/db/dbEvent.h diff --git a/src/ioc/db/dbExtractArray.c b/modules/database/src/ioc/db/dbExtractArray.c similarity index 100% rename from src/ioc/db/dbExtractArray.c rename to modules/database/src/ioc/db/dbExtractArray.c diff --git a/src/ioc/db/dbExtractArray.h b/modules/database/src/ioc/db/dbExtractArray.h similarity index 100% rename from src/ioc/db/dbExtractArray.h rename to modules/database/src/ioc/db/dbExtractArray.h diff --git a/src/ioc/db/dbFastLinkConv.c b/modules/database/src/ioc/db/dbFastLinkConv.c similarity index 100% rename from src/ioc/db/dbFastLinkConv.c rename to modules/database/src/ioc/db/dbFastLinkConv.c diff --git a/src/ioc/db/dbIocRegister.c b/modules/database/src/ioc/db/dbIocRegister.c similarity index 100% rename from src/ioc/db/dbIocRegister.c rename to modules/database/src/ioc/db/dbIocRegister.c diff --git a/src/ioc/db/dbIocRegister.h b/modules/database/src/ioc/db/dbIocRegister.h similarity index 100% rename from src/ioc/db/dbIocRegister.h rename to modules/database/src/ioc/db/dbIocRegister.h diff --git a/src/ioc/db/dbJLink.c b/modules/database/src/ioc/db/dbJLink.c similarity index 100% rename from src/ioc/db/dbJLink.c rename to modules/database/src/ioc/db/dbJLink.c diff --git a/src/ioc/db/dbJLink.h b/modules/database/src/ioc/db/dbJLink.h similarity index 100% rename from src/ioc/db/dbJLink.h rename to modules/database/src/ioc/db/dbJLink.h diff --git a/src/ioc/db/dbLink.c b/modules/database/src/ioc/db/dbLink.c similarity index 100% rename from src/ioc/db/dbLink.c rename to modules/database/src/ioc/db/dbLink.c diff --git a/src/ioc/db/dbLink.h b/modules/database/src/ioc/db/dbLink.h similarity index 100% rename from src/ioc/db/dbLink.h rename to modules/database/src/ioc/db/dbLink.h diff --git a/src/ioc/db/dbLock.c b/modules/database/src/ioc/db/dbLock.c similarity index 100% rename from src/ioc/db/dbLock.c rename to modules/database/src/ioc/db/dbLock.c diff --git a/src/ioc/db/dbLock.h b/modules/database/src/ioc/db/dbLock.h similarity index 100% rename from src/ioc/db/dbLock.h rename to modules/database/src/ioc/db/dbLock.h diff --git a/src/ioc/db/dbLockPvt.h b/modules/database/src/ioc/db/dbLockPvt.h similarity index 100% rename from src/ioc/db/dbLockPvt.h rename to modules/database/src/ioc/db/dbLockPvt.h diff --git a/src/ioc/db/dbNotify.c b/modules/database/src/ioc/db/dbNotify.c similarity index 100% rename from src/ioc/db/dbNotify.c rename to modules/database/src/ioc/db/dbNotify.c diff --git a/src/ioc/db/dbNotify.h b/modules/database/src/ioc/db/dbNotify.h similarity index 100% rename from src/ioc/db/dbNotify.h rename to modules/database/src/ioc/db/dbNotify.h diff --git a/src/ioc/db/dbPutNotifyBlocker.cpp b/modules/database/src/ioc/db/dbPutNotifyBlocker.cpp similarity index 100% rename from src/ioc/db/dbPutNotifyBlocker.cpp rename to modules/database/src/ioc/db/dbPutNotifyBlocker.cpp diff --git a/src/ioc/db/dbPutNotifyBlocker.h b/modules/database/src/ioc/db/dbPutNotifyBlocker.h similarity index 100% rename from src/ioc/db/dbPutNotifyBlocker.h rename to modules/database/src/ioc/db/dbPutNotifyBlocker.h diff --git a/src/ioc/db/dbScan.c b/modules/database/src/ioc/db/dbScan.c similarity index 100% rename from src/ioc/db/dbScan.c rename to modules/database/src/ioc/db/dbScan.c diff --git a/src/ioc/db/dbScan.h b/modules/database/src/ioc/db/dbScan.h similarity index 100% rename from src/ioc/db/dbScan.h rename to modules/database/src/ioc/db/dbScan.h diff --git a/src/ioc/db/dbServer.c b/modules/database/src/ioc/db/dbServer.c similarity index 100% rename from src/ioc/db/dbServer.c rename to modules/database/src/ioc/db/dbServer.c diff --git a/src/ioc/db/dbServer.h b/modules/database/src/ioc/db/dbServer.h similarity index 100% rename from src/ioc/db/dbServer.h rename to modules/database/src/ioc/db/dbServer.h diff --git a/src/ioc/db/dbState.c b/modules/database/src/ioc/db/dbState.c similarity index 100% rename from src/ioc/db/dbState.c rename to modules/database/src/ioc/db/dbState.c diff --git a/src/ioc/db/dbState.h b/modules/database/src/ioc/db/dbState.h similarity index 100% rename from src/ioc/db/dbState.h rename to modules/database/src/ioc/db/dbState.h diff --git a/src/ioc/db/dbSubscriptionIO.cpp b/modules/database/src/ioc/db/dbSubscriptionIO.cpp similarity index 100% rename from src/ioc/db/dbSubscriptionIO.cpp rename to modules/database/src/ioc/db/dbSubscriptionIO.cpp diff --git a/src/ioc/db/dbTest.c b/modules/database/src/ioc/db/dbTest.c similarity index 100% rename from src/ioc/db/dbTest.c rename to modules/database/src/ioc/db/dbTest.c diff --git a/src/ioc/db/dbTest.h b/modules/database/src/ioc/db/dbTest.h similarity index 100% rename from src/ioc/db/dbTest.h rename to modules/database/src/ioc/db/dbTest.h diff --git a/src/ioc/db/dbUnitTest.c b/modules/database/src/ioc/db/dbUnitTest.c similarity index 100% rename from src/ioc/db/dbUnitTest.c rename to modules/database/src/ioc/db/dbUnitTest.c diff --git a/src/ioc/db/dbUnitTest.h b/modules/database/src/ioc/db/dbUnitTest.h similarity index 100% rename from src/ioc/db/dbUnitTest.h rename to modules/database/src/ioc/db/dbUnitTest.h diff --git a/src/ioc/db/db_access.c b/modules/database/src/ioc/db/db_access.c similarity index 100% rename from src/ioc/db/db_access.c rename to modules/database/src/ioc/db/db_access.c diff --git a/src/ioc/db/db_access_routines.h b/modules/database/src/ioc/db/db_access_routines.h similarity index 100% rename from src/ioc/db/db_access_routines.h rename to modules/database/src/ioc/db/db_access_routines.h diff --git a/src/ioc/db/db_convert.h b/modules/database/src/ioc/db/db_convert.h similarity index 100% rename from src/ioc/db/db_convert.h rename to modules/database/src/ioc/db/db_convert.h diff --git a/src/ioc/db/db_field_log.h b/modules/database/src/ioc/db/db_field_log.h similarity index 100% rename from src/ioc/db/db_field_log.h rename to modules/database/src/ioc/db/db_field_log.h diff --git a/src/ioc/db/db_test.c b/modules/database/src/ioc/db/db_test.c similarity index 100% rename from src/ioc/db/db_test.c rename to modules/database/src/ioc/db/db_test.c diff --git a/src/ioc/db/db_test.h b/modules/database/src/ioc/db/db_test.h similarity index 100% rename from src/ioc/db/db_test.h rename to modules/database/src/ioc/db/db_test.h diff --git a/src/ioc/db/initHooks.c b/modules/database/src/ioc/db/initHooks.c similarity index 100% rename from src/ioc/db/initHooks.c rename to modules/database/src/ioc/db/initHooks.c diff --git a/src/ioc/db/initHooks.h b/modules/database/src/ioc/db/initHooks.h similarity index 100% rename from src/ioc/db/initHooks.h rename to modules/database/src/ioc/db/initHooks.h diff --git a/src/ioc/db/menuAlarmSevr.dbd.pod b/modules/database/src/ioc/db/menuAlarmSevr.dbd.pod similarity index 100% rename from src/ioc/db/menuAlarmSevr.dbd.pod rename to modules/database/src/ioc/db/menuAlarmSevr.dbd.pod diff --git a/src/ioc/db/menuAlarmStat.dbd b/modules/database/src/ioc/db/menuAlarmStat.dbd similarity index 100% rename from src/ioc/db/menuAlarmStat.dbd rename to modules/database/src/ioc/db/menuAlarmStat.dbd diff --git a/src/ioc/db/menuFtype.dbd b/modules/database/src/ioc/db/menuFtype.dbd similarity index 100% rename from src/ioc/db/menuFtype.dbd rename to modules/database/src/ioc/db/menuFtype.dbd diff --git a/src/ioc/db/menuIvoa.dbd b/modules/database/src/ioc/db/menuIvoa.dbd similarity index 100% rename from src/ioc/db/menuIvoa.dbd rename to modules/database/src/ioc/db/menuIvoa.dbd diff --git a/src/ioc/db/menuOmsl.dbd b/modules/database/src/ioc/db/menuOmsl.dbd similarity index 100% rename from src/ioc/db/menuOmsl.dbd rename to modules/database/src/ioc/db/menuOmsl.dbd diff --git a/src/ioc/db/menuPini.dbd b/modules/database/src/ioc/db/menuPini.dbd similarity index 100% rename from src/ioc/db/menuPini.dbd rename to modules/database/src/ioc/db/menuPini.dbd diff --git a/src/ioc/db/menuPost.dbd b/modules/database/src/ioc/db/menuPost.dbd similarity index 100% rename from src/ioc/db/menuPost.dbd rename to modules/database/src/ioc/db/menuPost.dbd diff --git a/src/ioc/db/menuPriority.dbd b/modules/database/src/ioc/db/menuPriority.dbd similarity index 100% rename from src/ioc/db/menuPriority.dbd rename to modules/database/src/ioc/db/menuPriority.dbd diff --git a/src/ioc/db/menuScan.dbd b/modules/database/src/ioc/db/menuScan.dbd similarity index 100% rename from src/ioc/db/menuScan.dbd rename to modules/database/src/ioc/db/menuScan.dbd diff --git a/src/ioc/db/menuSimm.dbd.pod b/modules/database/src/ioc/db/menuSimm.dbd.pod similarity index 100% rename from src/ioc/db/menuSimm.dbd.pod rename to modules/database/src/ioc/db/menuSimm.dbd.pod diff --git a/src/ioc/db/menuYesNo.dbd b/modules/database/src/ioc/db/menuYesNo.dbd similarity index 100% rename from src/ioc/db/menuYesNo.dbd rename to modules/database/src/ioc/db/menuYesNo.dbd diff --git a/src/ioc/db/recGbl.c b/modules/database/src/ioc/db/recGbl.c similarity index 100% rename from src/ioc/db/recGbl.c rename to modules/database/src/ioc/db/recGbl.c diff --git a/src/ioc/db/recGbl.h b/modules/database/src/ioc/db/recGbl.h similarity index 100% rename from src/ioc/db/recGbl.h rename to modules/database/src/ioc/db/recGbl.h diff --git a/src/ioc/dbCore.rc b/modules/database/src/ioc/dbCore.rc similarity index 100% rename from src/ioc/dbCore.rc rename to modules/database/src/ioc/dbCore.rc diff --git a/src/ioc/dbStatic/Makefile b/modules/database/src/ioc/dbStatic/Makefile similarity index 100% rename from src/ioc/dbStatic/Makefile rename to modules/database/src/ioc/dbStatic/Makefile diff --git a/src/ioc/dbStatic/RULES b/modules/database/src/ioc/dbStatic/RULES similarity index 100% rename from src/ioc/dbStatic/RULES rename to modules/database/src/ioc/dbStatic/RULES diff --git a/src/ioc/dbStatic/dbBase.h b/modules/database/src/ioc/dbStatic/dbBase.h similarity index 100% rename from src/ioc/dbStatic/dbBase.h rename to modules/database/src/ioc/dbStatic/dbBase.h diff --git a/src/ioc/dbStatic/dbFldTypes.h b/modules/database/src/ioc/dbStatic/dbFldTypes.h similarity index 100% rename from src/ioc/dbStatic/dbFldTypes.h rename to modules/database/src/ioc/dbStatic/dbFldTypes.h diff --git a/src/ioc/dbStatic/dbLex.l b/modules/database/src/ioc/dbStatic/dbLex.l similarity index 100% rename from src/ioc/dbStatic/dbLex.l rename to modules/database/src/ioc/dbStatic/dbLex.l diff --git a/src/ioc/dbStatic/dbLexRoutines.c b/modules/database/src/ioc/dbStatic/dbLexRoutines.c similarity index 100% rename from src/ioc/dbStatic/dbLexRoutines.c rename to modules/database/src/ioc/dbStatic/dbLexRoutines.c diff --git a/src/ioc/dbStatic/dbPvdLib.c b/modules/database/src/ioc/dbStatic/dbPvdLib.c similarity index 100% rename from src/ioc/dbStatic/dbPvdLib.c rename to modules/database/src/ioc/dbStatic/dbPvdLib.c diff --git a/src/ioc/dbStatic/dbStaticIocRegister.c b/modules/database/src/ioc/dbStatic/dbStaticIocRegister.c similarity index 100% rename from src/ioc/dbStatic/dbStaticIocRegister.c rename to modules/database/src/ioc/dbStatic/dbStaticIocRegister.c diff --git a/src/ioc/dbStatic/dbStaticIocRegister.h b/modules/database/src/ioc/dbStatic/dbStaticIocRegister.h similarity index 100% rename from src/ioc/dbStatic/dbStaticIocRegister.h rename to modules/database/src/ioc/dbStatic/dbStaticIocRegister.h diff --git a/src/ioc/dbStatic/dbStaticLib.c b/modules/database/src/ioc/dbStatic/dbStaticLib.c similarity index 100% rename from src/ioc/dbStatic/dbStaticLib.c rename to modules/database/src/ioc/dbStatic/dbStaticLib.c diff --git a/src/ioc/dbStatic/dbStaticLib.h b/modules/database/src/ioc/dbStatic/dbStaticLib.h similarity index 100% rename from src/ioc/dbStatic/dbStaticLib.h rename to modules/database/src/ioc/dbStatic/dbStaticLib.h diff --git a/src/ioc/dbStatic/dbStaticPvt.h b/modules/database/src/ioc/dbStatic/dbStaticPvt.h similarity index 100% rename from src/ioc/dbStatic/dbStaticPvt.h rename to modules/database/src/ioc/dbStatic/dbStaticPvt.h diff --git a/src/ioc/dbStatic/dbStaticRun.c b/modules/database/src/ioc/dbStatic/dbStaticRun.c similarity index 100% rename from src/ioc/dbStatic/dbStaticRun.c rename to modules/database/src/ioc/dbStatic/dbStaticRun.c diff --git a/src/ioc/dbStatic/dbYacc.y b/modules/database/src/ioc/dbStatic/dbYacc.y similarity index 100% rename from src/ioc/dbStatic/dbYacc.y rename to modules/database/src/ioc/dbStatic/dbYacc.y diff --git a/src/ioc/dbStatic/devSup.h b/modules/database/src/ioc/dbStatic/devSup.h similarity index 100% rename from src/ioc/dbStatic/devSup.h rename to modules/database/src/ioc/dbStatic/devSup.h diff --git a/src/ioc/dbStatic/drvSup.h b/modules/database/src/ioc/dbStatic/drvSup.h similarity index 100% rename from src/ioc/dbStatic/drvSup.h rename to modules/database/src/ioc/dbStatic/drvSup.h diff --git a/src/ioc/dbStatic/guigroup.h b/modules/database/src/ioc/dbStatic/guigroup.h similarity index 100% rename from src/ioc/dbStatic/guigroup.h rename to modules/database/src/ioc/dbStatic/guigroup.h diff --git a/src/ioc/dbStatic/link.h b/modules/database/src/ioc/dbStatic/link.h similarity index 100% rename from src/ioc/dbStatic/link.h rename to modules/database/src/ioc/dbStatic/link.h diff --git a/src/ioc/dbStatic/recSup.h b/modules/database/src/ioc/dbStatic/recSup.h similarity index 100% rename from src/ioc/dbStatic/recSup.h rename to modules/database/src/ioc/dbStatic/recSup.h diff --git a/src/ioc/dbStatic/special.h b/modules/database/src/ioc/dbStatic/special.h similarity index 100% rename from src/ioc/dbStatic/special.h rename to modules/database/src/ioc/dbStatic/special.h diff --git a/src/ioc/dbtemplate/Makefile b/modules/database/src/ioc/dbtemplate/Makefile similarity index 100% rename from src/ioc/dbtemplate/Makefile rename to modules/database/src/ioc/dbtemplate/Makefile diff --git a/src/ioc/dbtemplate/RULES b/modules/database/src/ioc/dbtemplate/RULES similarity index 100% rename from src/ioc/dbtemplate/RULES rename to modules/database/src/ioc/dbtemplate/RULES diff --git a/src/ioc/dbtemplate/dbLoadTemplate.h b/modules/database/src/ioc/dbtemplate/dbLoadTemplate.h similarity index 100% rename from src/ioc/dbtemplate/dbLoadTemplate.h rename to modules/database/src/ioc/dbtemplate/dbLoadTemplate.h diff --git a/src/ioc/dbtemplate/dbLoadTemplate.y b/modules/database/src/ioc/dbtemplate/dbLoadTemplate.y similarity index 100% rename from src/ioc/dbtemplate/dbLoadTemplate.y rename to modules/database/src/ioc/dbtemplate/dbLoadTemplate.y diff --git a/src/ioc/dbtemplate/dbLoadTemplate_lex.l b/modules/database/src/ioc/dbtemplate/dbLoadTemplate_lex.l similarity index 100% rename from src/ioc/dbtemplate/dbLoadTemplate_lex.l rename to modules/database/src/ioc/dbtemplate/dbLoadTemplate_lex.l diff --git a/src/ioc/dbtemplate/dbtoolsIocRegister.c b/modules/database/src/ioc/dbtemplate/dbtoolsIocRegister.c similarity index 100% rename from src/ioc/dbtemplate/dbtoolsIocRegister.c rename to modules/database/src/ioc/dbtemplate/dbtoolsIocRegister.c diff --git a/src/ioc/dbtemplate/dbtoolsIocRegister.h b/modules/database/src/ioc/dbtemplate/dbtoolsIocRegister.h similarity index 100% rename from src/ioc/dbtemplate/dbtoolsIocRegister.h rename to modules/database/src/ioc/dbtemplate/dbtoolsIocRegister.h diff --git a/src/ioc/dbtemplate/msi.c b/modules/database/src/ioc/dbtemplate/msi.c similarity index 100% rename from src/ioc/dbtemplate/msi.c rename to modules/database/src/ioc/dbtemplate/msi.c diff --git a/src/ioc/dbtemplate/msi.html b/modules/database/src/ioc/dbtemplate/msi.html similarity index 100% rename from src/ioc/dbtemplate/msi.html rename to modules/database/src/ioc/dbtemplate/msi.html diff --git a/src/ioc/misc/Makefile b/modules/database/src/ioc/misc/Makefile similarity index 100% rename from src/ioc/misc/Makefile rename to modules/database/src/ioc/misc/Makefile diff --git a/src/ioc/misc/dbCore.dbd b/modules/database/src/ioc/misc/dbCore.dbd similarity index 100% rename from src/ioc/misc/dbCore.dbd rename to modules/database/src/ioc/misc/dbCore.dbd diff --git a/src/ioc/misc/dlload.c b/modules/database/src/ioc/misc/dlload.c similarity index 100% rename from src/ioc/misc/dlload.c rename to modules/database/src/ioc/misc/dlload.c diff --git a/src/ioc/misc/dlload.dbd b/modules/database/src/ioc/misc/dlload.dbd similarity index 100% rename from src/ioc/misc/dlload.dbd rename to modules/database/src/ioc/misc/dlload.dbd diff --git a/src/ioc/misc/epicsRelease.c b/modules/database/src/ioc/misc/epicsRelease.c similarity index 100% rename from src/ioc/misc/epicsRelease.c rename to modules/database/src/ioc/misc/epicsRelease.c diff --git a/src/ioc/misc/epicsRelease.h b/modules/database/src/ioc/misc/epicsRelease.h similarity index 100% rename from src/ioc/misc/epicsRelease.h rename to modules/database/src/ioc/misc/epicsRelease.h diff --git a/src/ioc/misc/iocInit.c b/modules/database/src/ioc/misc/iocInit.c similarity index 100% rename from src/ioc/misc/iocInit.c rename to modules/database/src/ioc/misc/iocInit.c diff --git a/src/ioc/misc/iocInit.h b/modules/database/src/ioc/misc/iocInit.h similarity index 100% rename from src/ioc/misc/iocInit.h rename to modules/database/src/ioc/misc/iocInit.h diff --git a/src/ioc/misc/iocshRegisterCommon.c b/modules/database/src/ioc/misc/iocshRegisterCommon.c similarity index 100% rename from src/ioc/misc/iocshRegisterCommon.c rename to modules/database/src/ioc/misc/iocshRegisterCommon.c diff --git a/src/ioc/misc/iocshRegisterCommon.h b/modules/database/src/ioc/misc/iocshRegisterCommon.h similarity index 100% rename from src/ioc/misc/iocshRegisterCommon.h rename to modules/database/src/ioc/misc/iocshRegisterCommon.h diff --git a/src/ioc/misc/miscIocRegister.c b/modules/database/src/ioc/misc/miscIocRegister.c similarity index 100% rename from src/ioc/misc/miscIocRegister.c rename to modules/database/src/ioc/misc/miscIocRegister.c diff --git a/src/ioc/misc/miscIocRegister.h b/modules/database/src/ioc/misc/miscIocRegister.h similarity index 100% rename from src/ioc/misc/miscIocRegister.h rename to modules/database/src/ioc/misc/miscIocRegister.h diff --git a/src/ioc/misc/system.dbd b/modules/database/src/ioc/misc/system.dbd similarity index 100% rename from src/ioc/misc/system.dbd rename to modules/database/src/ioc/misc/system.dbd diff --git a/src/ioc/registry/Makefile b/modules/database/src/ioc/registry/Makefile similarity index 100% rename from src/ioc/registry/Makefile rename to modules/database/src/ioc/registry/Makefile diff --git a/src/ioc/registry/registryCommon.c b/modules/database/src/ioc/registry/registryCommon.c similarity index 100% rename from src/ioc/registry/registryCommon.c rename to modules/database/src/ioc/registry/registryCommon.c diff --git a/src/ioc/registry/registryCommon.h b/modules/database/src/ioc/registry/registryCommon.h similarity index 100% rename from src/ioc/registry/registryCommon.h rename to modules/database/src/ioc/registry/registryCommon.h diff --git a/src/ioc/registry/registryDeviceSupport.c b/modules/database/src/ioc/registry/registryDeviceSupport.c similarity index 100% rename from src/ioc/registry/registryDeviceSupport.c rename to modules/database/src/ioc/registry/registryDeviceSupport.c diff --git a/src/ioc/registry/registryDeviceSupport.h b/modules/database/src/ioc/registry/registryDeviceSupport.h similarity index 100% rename from src/ioc/registry/registryDeviceSupport.h rename to modules/database/src/ioc/registry/registryDeviceSupport.h diff --git a/src/ioc/registry/registryDriverSupport.c b/modules/database/src/ioc/registry/registryDriverSupport.c similarity index 100% rename from src/ioc/registry/registryDriverSupport.c rename to modules/database/src/ioc/registry/registryDriverSupport.c diff --git a/src/ioc/registry/registryDriverSupport.h b/modules/database/src/ioc/registry/registryDriverSupport.h similarity index 100% rename from src/ioc/registry/registryDriverSupport.h rename to modules/database/src/ioc/registry/registryDriverSupport.h diff --git a/src/ioc/registry/registryFunction.c b/modules/database/src/ioc/registry/registryFunction.c similarity index 100% rename from src/ioc/registry/registryFunction.c rename to modules/database/src/ioc/registry/registryFunction.c diff --git a/src/ioc/registry/registryFunction.h b/modules/database/src/ioc/registry/registryFunction.h similarity index 100% rename from src/ioc/registry/registryFunction.h rename to modules/database/src/ioc/registry/registryFunction.h diff --git a/src/ioc/registry/registryIocRegister.c b/modules/database/src/ioc/registry/registryIocRegister.c similarity index 100% rename from src/ioc/registry/registryIocRegister.c rename to modules/database/src/ioc/registry/registryIocRegister.c diff --git a/src/ioc/registry/registryIocRegister.h b/modules/database/src/ioc/registry/registryIocRegister.h similarity index 100% rename from src/ioc/registry/registryIocRegister.h rename to modules/database/src/ioc/registry/registryIocRegister.h diff --git a/src/ioc/registry/registryJLinks.c b/modules/database/src/ioc/registry/registryJLinks.c similarity index 100% rename from src/ioc/registry/registryJLinks.c rename to modules/database/src/ioc/registry/registryJLinks.c diff --git a/src/ioc/registry/registryJLinks.h b/modules/database/src/ioc/registry/registryJLinks.h similarity index 100% rename from src/ioc/registry/registryJLinks.h rename to modules/database/src/ioc/registry/registryJLinks.h diff --git a/src/ioc/registry/registryRecordType.c b/modules/database/src/ioc/registry/registryRecordType.c similarity index 100% rename from src/ioc/registry/registryRecordType.c rename to modules/database/src/ioc/registry/registryRecordType.c diff --git a/src/ioc/registry/registryRecordType.h b/modules/database/src/ioc/registry/registryRecordType.h similarity index 100% rename from src/ioc/registry/registryRecordType.h rename to modules/database/src/ioc/registry/registryRecordType.h diff --git a/src/ioc/rsrv/Makefile b/modules/database/src/ioc/rsrv/Makefile similarity index 100% rename from src/ioc/rsrv/Makefile rename to modules/database/src/ioc/rsrv/Makefile diff --git a/src/ioc/rsrv/camessage.c b/modules/database/src/ioc/rsrv/camessage.c similarity index 100% rename from src/ioc/rsrv/camessage.c rename to modules/database/src/ioc/rsrv/camessage.c diff --git a/src/ioc/rsrv/camsgtask.c b/modules/database/src/ioc/rsrv/camsgtask.c similarity index 100% rename from src/ioc/rsrv/camsgtask.c rename to modules/database/src/ioc/rsrv/camsgtask.c diff --git a/src/ioc/rsrv/caserverio.c b/modules/database/src/ioc/rsrv/caserverio.c similarity index 100% rename from src/ioc/rsrv/caserverio.c rename to modules/database/src/ioc/rsrv/caserverio.c diff --git a/src/ioc/rsrv/caservertask.c b/modules/database/src/ioc/rsrv/caservertask.c similarity index 100% rename from src/ioc/rsrv/caservertask.c rename to modules/database/src/ioc/rsrv/caservertask.c diff --git a/src/ioc/rsrv/cast_server.c b/modules/database/src/ioc/rsrv/cast_server.c similarity index 100% rename from src/ioc/rsrv/cast_server.c rename to modules/database/src/ioc/rsrv/cast_server.c diff --git a/src/ioc/rsrv/online_notify.c b/modules/database/src/ioc/rsrv/online_notify.c similarity index 100% rename from src/ioc/rsrv/online_notify.c rename to modules/database/src/ioc/rsrv/online_notify.c diff --git a/src/ioc/rsrv/rsrv.dbd b/modules/database/src/ioc/rsrv/rsrv.dbd similarity index 100% rename from src/ioc/rsrv/rsrv.dbd rename to modules/database/src/ioc/rsrv/rsrv.dbd diff --git a/src/ioc/rsrv/rsrv.h b/modules/database/src/ioc/rsrv/rsrv.h similarity index 100% rename from src/ioc/rsrv/rsrv.h rename to modules/database/src/ioc/rsrv/rsrv.h diff --git a/src/ioc/rsrv/rsrvIocRegister.c b/modules/database/src/ioc/rsrv/rsrvIocRegister.c similarity index 100% rename from src/ioc/rsrv/rsrvIocRegister.c rename to modules/database/src/ioc/rsrv/rsrvIocRegister.c diff --git a/src/ioc/rsrv/server.h b/modules/database/src/ioc/rsrv/server.h similarity index 100% rename from src/ioc/rsrv/server.h rename to modules/database/src/ioc/rsrv/server.h diff --git a/src/std/Makefile b/modules/database/src/std/Makefile similarity index 100% rename from src/std/Makefile rename to modules/database/src/std/Makefile diff --git a/src/std/dbRecStd.rc b/modules/database/src/std/dbRecStd.rc similarity index 100% rename from src/std/dbRecStd.rc rename to modules/database/src/std/dbRecStd.rc diff --git a/src/std/dev/Makefile b/modules/database/src/std/dev/Makefile similarity index 100% rename from src/std/dev/Makefile rename to modules/database/src/std/dev/Makefile diff --git a/src/std/dev/asSubRecordFunctions.c b/modules/database/src/std/dev/asSubRecordFunctions.c similarity index 100% rename from src/std/dev/asSubRecordFunctions.c rename to modules/database/src/std/dev/asSubRecordFunctions.c diff --git a/src/std/dev/devAaiSoft.c b/modules/database/src/std/dev/devAaiSoft.c similarity index 100% rename from src/std/dev/devAaiSoft.c rename to modules/database/src/std/dev/devAaiSoft.c diff --git a/src/std/dev/devAaoSoft.c b/modules/database/src/std/dev/devAaoSoft.c similarity index 100% rename from src/std/dev/devAaoSoft.c rename to modules/database/src/std/dev/devAaoSoft.c diff --git a/src/std/dev/devAiSoft.c b/modules/database/src/std/dev/devAiSoft.c similarity index 100% rename from src/std/dev/devAiSoft.c rename to modules/database/src/std/dev/devAiSoft.c diff --git a/src/std/dev/devAiSoftCallback.c b/modules/database/src/std/dev/devAiSoftCallback.c similarity index 100% rename from src/std/dev/devAiSoftCallback.c rename to modules/database/src/std/dev/devAiSoftCallback.c diff --git a/src/std/dev/devAiSoftRaw.c b/modules/database/src/std/dev/devAiSoftRaw.c similarity index 100% rename from src/std/dev/devAiSoftRaw.c rename to modules/database/src/std/dev/devAiSoftRaw.c diff --git a/src/std/dev/devAoSoft.c b/modules/database/src/std/dev/devAoSoft.c similarity index 100% rename from src/std/dev/devAoSoft.c rename to modules/database/src/std/dev/devAoSoft.c diff --git a/src/std/dev/devAoSoftCallback.c b/modules/database/src/std/dev/devAoSoftCallback.c similarity index 100% rename from src/std/dev/devAoSoftCallback.c rename to modules/database/src/std/dev/devAoSoftCallback.c diff --git a/src/std/dev/devAoSoftRaw.c b/modules/database/src/std/dev/devAoSoftRaw.c similarity index 100% rename from src/std/dev/devAoSoftRaw.c rename to modules/database/src/std/dev/devAoSoftRaw.c diff --git a/src/std/dev/devBiDbState.c b/modules/database/src/std/dev/devBiDbState.c similarity index 100% rename from src/std/dev/devBiDbState.c rename to modules/database/src/std/dev/devBiDbState.c diff --git a/src/std/dev/devBiSoft.c b/modules/database/src/std/dev/devBiSoft.c similarity index 100% rename from src/std/dev/devBiSoft.c rename to modules/database/src/std/dev/devBiSoft.c diff --git a/src/std/dev/devBiSoftCallback.c b/modules/database/src/std/dev/devBiSoftCallback.c similarity index 100% rename from src/std/dev/devBiSoftCallback.c rename to modules/database/src/std/dev/devBiSoftCallback.c diff --git a/src/std/dev/devBiSoftRaw.c b/modules/database/src/std/dev/devBiSoftRaw.c similarity index 100% rename from src/std/dev/devBiSoftRaw.c rename to modules/database/src/std/dev/devBiSoftRaw.c diff --git a/src/std/dev/devBoDbState.c b/modules/database/src/std/dev/devBoDbState.c similarity index 100% rename from src/std/dev/devBoDbState.c rename to modules/database/src/std/dev/devBoDbState.c diff --git a/src/std/dev/devBoSoft.c b/modules/database/src/std/dev/devBoSoft.c similarity index 100% rename from src/std/dev/devBoSoft.c rename to modules/database/src/std/dev/devBoSoft.c diff --git a/src/std/dev/devBoSoftCallback.c b/modules/database/src/std/dev/devBoSoftCallback.c similarity index 100% rename from src/std/dev/devBoSoftCallback.c rename to modules/database/src/std/dev/devBoSoftCallback.c diff --git a/src/std/dev/devBoSoftRaw.c b/modules/database/src/std/dev/devBoSoftRaw.c similarity index 100% rename from src/std/dev/devBoSoftRaw.c rename to modules/database/src/std/dev/devBoSoftRaw.c diff --git a/src/std/dev/devCalcoutSoft.c b/modules/database/src/std/dev/devCalcoutSoft.c similarity index 100% rename from src/std/dev/devCalcoutSoft.c rename to modules/database/src/std/dev/devCalcoutSoft.c diff --git a/src/std/dev/devCalcoutSoftCallback.c b/modules/database/src/std/dev/devCalcoutSoftCallback.c similarity index 100% rename from src/std/dev/devCalcoutSoftCallback.c rename to modules/database/src/std/dev/devCalcoutSoftCallback.c diff --git a/src/std/dev/devEnviron.c b/modules/database/src/std/dev/devEnviron.c similarity index 100% rename from src/std/dev/devEnviron.c rename to modules/database/src/std/dev/devEnviron.c diff --git a/src/std/dev/devEventSoft.c b/modules/database/src/std/dev/devEventSoft.c similarity index 100% rename from src/std/dev/devEventSoft.c rename to modules/database/src/std/dev/devEventSoft.c diff --git a/src/std/dev/devGeneralTime.c b/modules/database/src/std/dev/devGeneralTime.c similarity index 100% rename from src/std/dev/devGeneralTime.c rename to modules/database/src/std/dev/devGeneralTime.c diff --git a/src/std/dev/devHistogramSoft.c b/modules/database/src/std/dev/devHistogramSoft.c similarity index 100% rename from src/std/dev/devHistogramSoft.c rename to modules/database/src/std/dev/devHistogramSoft.c diff --git a/src/std/dev/devI64inSoft.c b/modules/database/src/std/dev/devI64inSoft.c similarity index 100% rename from src/std/dev/devI64inSoft.c rename to modules/database/src/std/dev/devI64inSoft.c diff --git a/src/std/dev/devI64inSoftCallback.c b/modules/database/src/std/dev/devI64inSoftCallback.c similarity index 100% rename from src/std/dev/devI64inSoftCallback.c rename to modules/database/src/std/dev/devI64inSoftCallback.c diff --git a/src/std/dev/devI64outSoft.c b/modules/database/src/std/dev/devI64outSoft.c similarity index 100% rename from src/std/dev/devI64outSoft.c rename to modules/database/src/std/dev/devI64outSoft.c diff --git a/src/std/dev/devI64outSoftCallback.c b/modules/database/src/std/dev/devI64outSoftCallback.c similarity index 100% rename from src/std/dev/devI64outSoftCallback.c rename to modules/database/src/std/dev/devI64outSoftCallback.c diff --git a/src/std/dev/devLiSoft.c b/modules/database/src/std/dev/devLiSoft.c similarity index 100% rename from src/std/dev/devLiSoft.c rename to modules/database/src/std/dev/devLiSoft.c diff --git a/src/std/dev/devLiSoftCallback.c b/modules/database/src/std/dev/devLiSoftCallback.c similarity index 100% rename from src/std/dev/devLiSoftCallback.c rename to modules/database/src/std/dev/devLiSoftCallback.c diff --git a/src/std/dev/devLoSoft.c b/modules/database/src/std/dev/devLoSoft.c similarity index 100% rename from src/std/dev/devLoSoft.c rename to modules/database/src/std/dev/devLoSoft.c diff --git a/src/std/dev/devLoSoftCallback.c b/modules/database/src/std/dev/devLoSoftCallback.c similarity index 100% rename from src/std/dev/devLoSoftCallback.c rename to modules/database/src/std/dev/devLoSoftCallback.c diff --git a/src/std/dev/devLsiSoft.c b/modules/database/src/std/dev/devLsiSoft.c similarity index 100% rename from src/std/dev/devLsiSoft.c rename to modules/database/src/std/dev/devLsiSoft.c diff --git a/src/std/dev/devLsoSoft.c b/modules/database/src/std/dev/devLsoSoft.c similarity index 100% rename from src/std/dev/devLsoSoft.c rename to modules/database/src/std/dev/devLsoSoft.c diff --git a/src/std/dev/devLsoSoftCallback.c b/modules/database/src/std/dev/devLsoSoftCallback.c similarity index 100% rename from src/std/dev/devLsoSoftCallback.c rename to modules/database/src/std/dev/devLsoSoftCallback.c diff --git a/src/std/dev/devMbbiDirectSoft.c b/modules/database/src/std/dev/devMbbiDirectSoft.c similarity index 100% rename from src/std/dev/devMbbiDirectSoft.c rename to modules/database/src/std/dev/devMbbiDirectSoft.c diff --git a/src/std/dev/devMbbiDirectSoftCallback.c b/modules/database/src/std/dev/devMbbiDirectSoftCallback.c similarity index 100% rename from src/std/dev/devMbbiDirectSoftCallback.c rename to modules/database/src/std/dev/devMbbiDirectSoftCallback.c diff --git a/src/std/dev/devMbbiDirectSoftRaw.c b/modules/database/src/std/dev/devMbbiDirectSoftRaw.c similarity index 100% rename from src/std/dev/devMbbiDirectSoftRaw.c rename to modules/database/src/std/dev/devMbbiDirectSoftRaw.c diff --git a/src/std/dev/devMbbiSoft.c b/modules/database/src/std/dev/devMbbiSoft.c similarity index 100% rename from src/std/dev/devMbbiSoft.c rename to modules/database/src/std/dev/devMbbiSoft.c diff --git a/src/std/dev/devMbbiSoftCallback.c b/modules/database/src/std/dev/devMbbiSoftCallback.c similarity index 100% rename from src/std/dev/devMbbiSoftCallback.c rename to modules/database/src/std/dev/devMbbiSoftCallback.c diff --git a/src/std/dev/devMbbiSoftRaw.c b/modules/database/src/std/dev/devMbbiSoftRaw.c similarity index 100% rename from src/std/dev/devMbbiSoftRaw.c rename to modules/database/src/std/dev/devMbbiSoftRaw.c diff --git a/src/std/dev/devMbboDirectSoft.c b/modules/database/src/std/dev/devMbboDirectSoft.c similarity index 100% rename from src/std/dev/devMbboDirectSoft.c rename to modules/database/src/std/dev/devMbboDirectSoft.c diff --git a/src/std/dev/devMbboDirectSoftCallback.c b/modules/database/src/std/dev/devMbboDirectSoftCallback.c similarity index 100% rename from src/std/dev/devMbboDirectSoftCallback.c rename to modules/database/src/std/dev/devMbboDirectSoftCallback.c diff --git a/src/std/dev/devMbboDirectSoftRaw.c b/modules/database/src/std/dev/devMbboDirectSoftRaw.c similarity index 100% rename from src/std/dev/devMbboDirectSoftRaw.c rename to modules/database/src/std/dev/devMbboDirectSoftRaw.c diff --git a/src/std/dev/devMbboSoft.c b/modules/database/src/std/dev/devMbboSoft.c similarity index 100% rename from src/std/dev/devMbboSoft.c rename to modules/database/src/std/dev/devMbboSoft.c diff --git a/src/std/dev/devMbboSoftCallback.c b/modules/database/src/std/dev/devMbboSoftCallback.c similarity index 100% rename from src/std/dev/devMbboSoftCallback.c rename to modules/database/src/std/dev/devMbboSoftCallback.c diff --git a/src/std/dev/devMbboSoftRaw.c b/modules/database/src/std/dev/devMbboSoftRaw.c similarity index 100% rename from src/std/dev/devMbboSoftRaw.c rename to modules/database/src/std/dev/devMbboSoftRaw.c diff --git a/src/std/dev/devPrintfSoft.c b/modules/database/src/std/dev/devPrintfSoft.c similarity index 100% rename from src/std/dev/devPrintfSoft.c rename to modules/database/src/std/dev/devPrintfSoft.c diff --git a/src/std/dev/devPrintfSoftCallback.c b/modules/database/src/std/dev/devPrintfSoftCallback.c similarity index 100% rename from src/std/dev/devPrintfSoftCallback.c rename to modules/database/src/std/dev/devPrintfSoftCallback.c diff --git a/src/std/dev/devSASoft.c b/modules/database/src/std/dev/devSASoft.c similarity index 100% rename from src/std/dev/devSASoft.c rename to modules/database/src/std/dev/devSASoft.c diff --git a/src/std/dev/devSiSoft.c b/modules/database/src/std/dev/devSiSoft.c similarity index 100% rename from src/std/dev/devSiSoft.c rename to modules/database/src/std/dev/devSiSoft.c diff --git a/src/std/dev/devSiSoftCallback.c b/modules/database/src/std/dev/devSiSoftCallback.c similarity index 100% rename from src/std/dev/devSiSoftCallback.c rename to modules/database/src/std/dev/devSiSoftCallback.c diff --git a/src/std/dev/devSoSoft.c b/modules/database/src/std/dev/devSoSoft.c similarity index 100% rename from src/std/dev/devSoSoft.c rename to modules/database/src/std/dev/devSoSoft.c diff --git a/src/std/dev/devSoSoftCallback.c b/modules/database/src/std/dev/devSoSoftCallback.c similarity index 100% rename from src/std/dev/devSoSoftCallback.c rename to modules/database/src/std/dev/devSoSoftCallback.c diff --git a/src/std/dev/devSoft.dbd b/modules/database/src/std/dev/devSoft.dbd similarity index 100% rename from src/std/dev/devSoft.dbd rename to modules/database/src/std/dev/devSoft.dbd diff --git a/src/std/dev/devStdio.c b/modules/database/src/std/dev/devStdio.c similarity index 100% rename from src/std/dev/devStdio.c rename to modules/database/src/std/dev/devStdio.c diff --git a/src/std/dev/devTimestamp.c b/modules/database/src/std/dev/devTimestamp.c similarity index 100% rename from src/std/dev/devTimestamp.c rename to modules/database/src/std/dev/devTimestamp.c diff --git a/src/std/dev/devWfSoft.c b/modules/database/src/std/dev/devWfSoft.c similarity index 100% rename from src/std/dev/devWfSoft.c rename to modules/database/src/std/dev/devWfSoft.c diff --git a/src/std/dev/softDevIoc.rc b/modules/database/src/std/dev/softDevIoc.rc similarity index 100% rename from src/std/dev/softDevIoc.rc rename to modules/database/src/std/dev/softDevIoc.rc diff --git a/src/std/filters/Makefile b/modules/database/src/std/filters/Makefile similarity index 100% rename from src/std/filters/Makefile rename to modules/database/src/std/filters/Makefile diff --git a/src/std/filters/arr.c b/modules/database/src/std/filters/arr.c similarity index 100% rename from src/std/filters/arr.c rename to modules/database/src/std/filters/arr.c diff --git a/src/std/filters/dbnd.c b/modules/database/src/std/filters/dbnd.c similarity index 100% rename from src/std/filters/dbnd.c rename to modules/database/src/std/filters/dbnd.c diff --git a/src/std/filters/filters.dbd.pod b/modules/database/src/std/filters/filters.dbd.pod similarity index 100% rename from src/std/filters/filters.dbd.pod rename to modules/database/src/std/filters/filters.dbd.pod diff --git a/src/std/filters/sync.c b/modules/database/src/std/filters/sync.c similarity index 100% rename from src/std/filters/sync.c rename to modules/database/src/std/filters/sync.c diff --git a/src/std/filters/ts.c b/modules/database/src/std/filters/ts.c similarity index 100% rename from src/std/filters/ts.c rename to modules/database/src/std/filters/ts.c diff --git a/src/std/link/Makefile b/modules/database/src/std/link/Makefile similarity index 100% rename from src/std/link/Makefile rename to modules/database/src/std/link/Makefile diff --git a/src/std/link/links.dbd.pod b/modules/database/src/std/link/links.dbd.pod similarity index 100% rename from src/std/link/links.dbd.pod rename to modules/database/src/std/link/links.dbd.pod diff --git a/src/std/link/lnkCalc.c b/modules/database/src/std/link/lnkCalc.c similarity index 100% rename from src/std/link/lnkCalc.c rename to modules/database/src/std/link/lnkCalc.c diff --git a/src/std/link/lnkConst.c b/modules/database/src/std/link/lnkConst.c similarity index 100% rename from src/std/link/lnkConst.c rename to modules/database/src/std/link/lnkConst.c diff --git a/src/std/rec/Makefile b/modules/database/src/std/rec/Makefile similarity index 100% rename from src/std/rec/Makefile rename to modules/database/src/std/rec/Makefile diff --git a/src/std/rec/RULES b/modules/database/src/std/rec/RULES similarity index 100% rename from src/std/rec/RULES rename to modules/database/src/std/rec/RULES diff --git a/src/std/rec/aSubRecord.c b/modules/database/src/std/rec/aSubRecord.c similarity index 100% rename from src/std/rec/aSubRecord.c rename to modules/database/src/std/rec/aSubRecord.c diff --git a/src/std/rec/aSubRecord.dbd.pod b/modules/database/src/std/rec/aSubRecord.dbd.pod similarity index 100% rename from src/std/rec/aSubRecord.dbd.pod rename to modules/database/src/std/rec/aSubRecord.dbd.pod diff --git a/src/std/rec/aaiRecord.c b/modules/database/src/std/rec/aaiRecord.c similarity index 100% rename from src/std/rec/aaiRecord.c rename to modules/database/src/std/rec/aaiRecord.c diff --git a/src/std/rec/aaiRecord.dbd b/modules/database/src/std/rec/aaiRecord.dbd similarity index 100% rename from src/std/rec/aaiRecord.dbd rename to modules/database/src/std/rec/aaiRecord.dbd diff --git a/src/std/rec/aaoRecord.c b/modules/database/src/std/rec/aaoRecord.c similarity index 100% rename from src/std/rec/aaoRecord.c rename to modules/database/src/std/rec/aaoRecord.c diff --git a/src/std/rec/aaoRecord.dbd b/modules/database/src/std/rec/aaoRecord.dbd similarity index 100% rename from src/std/rec/aaoRecord.dbd rename to modules/database/src/std/rec/aaoRecord.dbd diff --git a/src/std/rec/aiRecord.c b/modules/database/src/std/rec/aiRecord.c similarity index 100% rename from src/std/rec/aiRecord.c rename to modules/database/src/std/rec/aiRecord.c diff --git a/src/std/rec/aiRecord.dbd.pod b/modules/database/src/std/rec/aiRecord.dbd.pod similarity index 100% rename from src/std/rec/aiRecord.dbd.pod rename to modules/database/src/std/rec/aiRecord.dbd.pod diff --git a/src/std/rec/aoRecord.c b/modules/database/src/std/rec/aoRecord.c similarity index 100% rename from src/std/rec/aoRecord.c rename to modules/database/src/std/rec/aoRecord.c diff --git a/src/std/rec/aoRecord.dbd.pod b/modules/database/src/std/rec/aoRecord.dbd.pod similarity index 100% rename from src/std/rec/aoRecord.dbd.pod rename to modules/database/src/std/rec/aoRecord.dbd.pod diff --git a/src/std/rec/biRecord.c b/modules/database/src/std/rec/biRecord.c similarity index 100% rename from src/std/rec/biRecord.c rename to modules/database/src/std/rec/biRecord.c diff --git a/src/std/rec/biRecord.dbd b/modules/database/src/std/rec/biRecord.dbd similarity index 100% rename from src/std/rec/biRecord.dbd rename to modules/database/src/std/rec/biRecord.dbd diff --git a/src/std/rec/boRecord.c b/modules/database/src/std/rec/boRecord.c similarity index 100% rename from src/std/rec/boRecord.c rename to modules/database/src/std/rec/boRecord.c diff --git a/src/std/rec/boRecord.dbd b/modules/database/src/std/rec/boRecord.dbd similarity index 100% rename from src/std/rec/boRecord.dbd rename to modules/database/src/std/rec/boRecord.dbd diff --git a/src/std/rec/calcRecord.c b/modules/database/src/std/rec/calcRecord.c similarity index 100% rename from src/std/rec/calcRecord.c rename to modules/database/src/std/rec/calcRecord.c diff --git a/src/std/rec/calcRecord.dbd b/modules/database/src/std/rec/calcRecord.dbd similarity index 100% rename from src/std/rec/calcRecord.dbd rename to modules/database/src/std/rec/calcRecord.dbd diff --git a/src/std/rec/calcoutRecord.c b/modules/database/src/std/rec/calcoutRecord.c similarity index 100% rename from src/std/rec/calcoutRecord.c rename to modules/database/src/std/rec/calcoutRecord.c diff --git a/src/std/rec/calcoutRecord.dbd b/modules/database/src/std/rec/calcoutRecord.dbd similarity index 100% rename from src/std/rec/calcoutRecord.dbd rename to modules/database/src/std/rec/calcoutRecord.dbd diff --git a/src/std/rec/compressRecord.c b/modules/database/src/std/rec/compressRecord.c similarity index 100% rename from src/std/rec/compressRecord.c rename to modules/database/src/std/rec/compressRecord.c diff --git a/src/std/rec/compressRecord.dbd.pod b/modules/database/src/std/rec/compressRecord.dbd.pod similarity index 100% rename from src/std/rec/compressRecord.dbd.pod rename to modules/database/src/std/rec/compressRecord.dbd.pod diff --git a/src/std/rec/dfanoutRecord.c b/modules/database/src/std/rec/dfanoutRecord.c similarity index 100% rename from src/std/rec/dfanoutRecord.c rename to modules/database/src/std/rec/dfanoutRecord.c diff --git a/src/std/rec/dfanoutRecord.dbd b/modules/database/src/std/rec/dfanoutRecord.dbd similarity index 100% rename from src/std/rec/dfanoutRecord.dbd rename to modules/database/src/std/rec/dfanoutRecord.dbd diff --git a/src/std/rec/eventRecord.c b/modules/database/src/std/rec/eventRecord.c similarity index 100% rename from src/std/rec/eventRecord.c rename to modules/database/src/std/rec/eventRecord.c diff --git a/src/std/rec/eventRecord.dbd b/modules/database/src/std/rec/eventRecord.dbd similarity index 100% rename from src/std/rec/eventRecord.dbd rename to modules/database/src/std/rec/eventRecord.dbd diff --git a/src/std/rec/fanoutRecord.c b/modules/database/src/std/rec/fanoutRecord.c similarity index 100% rename from src/std/rec/fanoutRecord.c rename to modules/database/src/std/rec/fanoutRecord.c diff --git a/src/std/rec/fanoutRecord.dbd b/modules/database/src/std/rec/fanoutRecord.dbd similarity index 100% rename from src/std/rec/fanoutRecord.dbd rename to modules/database/src/std/rec/fanoutRecord.dbd diff --git a/src/std/rec/histogramRecord.c b/modules/database/src/std/rec/histogramRecord.c similarity index 100% rename from src/std/rec/histogramRecord.c rename to modules/database/src/std/rec/histogramRecord.c diff --git a/src/std/rec/histogramRecord.dbd b/modules/database/src/std/rec/histogramRecord.dbd similarity index 100% rename from src/std/rec/histogramRecord.dbd rename to modules/database/src/std/rec/histogramRecord.dbd diff --git a/src/std/rec/int64inRecord.c b/modules/database/src/std/rec/int64inRecord.c similarity index 100% rename from src/std/rec/int64inRecord.c rename to modules/database/src/std/rec/int64inRecord.c diff --git a/src/std/rec/int64inRecord.dbd.pod b/modules/database/src/std/rec/int64inRecord.dbd.pod similarity index 100% rename from src/std/rec/int64inRecord.dbd.pod rename to modules/database/src/std/rec/int64inRecord.dbd.pod diff --git a/src/std/rec/int64outRecord.c b/modules/database/src/std/rec/int64outRecord.c similarity index 100% rename from src/std/rec/int64outRecord.c rename to modules/database/src/std/rec/int64outRecord.c diff --git a/src/std/rec/int64outRecord.dbd.pod b/modules/database/src/std/rec/int64outRecord.dbd.pod similarity index 100% rename from src/std/rec/int64outRecord.dbd.pod rename to modules/database/src/std/rec/int64outRecord.dbd.pod diff --git a/src/std/rec/longinRecord.c b/modules/database/src/std/rec/longinRecord.c similarity index 100% rename from src/std/rec/longinRecord.c rename to modules/database/src/std/rec/longinRecord.c diff --git a/src/std/rec/longinRecord.dbd b/modules/database/src/std/rec/longinRecord.dbd similarity index 100% rename from src/std/rec/longinRecord.dbd rename to modules/database/src/std/rec/longinRecord.dbd diff --git a/src/std/rec/longoutRecord.c b/modules/database/src/std/rec/longoutRecord.c similarity index 100% rename from src/std/rec/longoutRecord.c rename to modules/database/src/std/rec/longoutRecord.c diff --git a/src/std/rec/longoutRecord.dbd b/modules/database/src/std/rec/longoutRecord.dbd similarity index 100% rename from src/std/rec/longoutRecord.dbd rename to modules/database/src/std/rec/longoutRecord.dbd diff --git a/src/std/rec/lsiRecord.c b/modules/database/src/std/rec/lsiRecord.c similarity index 100% rename from src/std/rec/lsiRecord.c rename to modules/database/src/std/rec/lsiRecord.c diff --git a/src/std/rec/lsiRecord.dbd b/modules/database/src/std/rec/lsiRecord.dbd similarity index 100% rename from src/std/rec/lsiRecord.dbd rename to modules/database/src/std/rec/lsiRecord.dbd diff --git a/src/std/rec/lsoRecord.c b/modules/database/src/std/rec/lsoRecord.c similarity index 100% rename from src/std/rec/lsoRecord.c rename to modules/database/src/std/rec/lsoRecord.c diff --git a/src/std/rec/lsoRecord.dbd b/modules/database/src/std/rec/lsoRecord.dbd similarity index 100% rename from src/std/rec/lsoRecord.dbd rename to modules/database/src/std/rec/lsoRecord.dbd diff --git a/src/std/rec/mbbiDirectRecord.c b/modules/database/src/std/rec/mbbiDirectRecord.c similarity index 100% rename from src/std/rec/mbbiDirectRecord.c rename to modules/database/src/std/rec/mbbiDirectRecord.c diff --git a/src/std/rec/mbbiDirectRecord.dbd b/modules/database/src/std/rec/mbbiDirectRecord.dbd similarity index 100% rename from src/std/rec/mbbiDirectRecord.dbd rename to modules/database/src/std/rec/mbbiDirectRecord.dbd diff --git a/src/std/rec/mbbiRecord.c b/modules/database/src/std/rec/mbbiRecord.c similarity index 100% rename from src/std/rec/mbbiRecord.c rename to modules/database/src/std/rec/mbbiRecord.c diff --git a/src/std/rec/mbbiRecord.dbd b/modules/database/src/std/rec/mbbiRecord.dbd similarity index 100% rename from src/std/rec/mbbiRecord.dbd rename to modules/database/src/std/rec/mbbiRecord.dbd diff --git a/src/std/rec/mbboDirectRecord.c b/modules/database/src/std/rec/mbboDirectRecord.c similarity index 100% rename from src/std/rec/mbboDirectRecord.c rename to modules/database/src/std/rec/mbboDirectRecord.c diff --git a/src/std/rec/mbboDirectRecord.dbd b/modules/database/src/std/rec/mbboDirectRecord.dbd similarity index 100% rename from src/std/rec/mbboDirectRecord.dbd rename to modules/database/src/std/rec/mbboDirectRecord.dbd diff --git a/src/std/rec/mbboRecord.c b/modules/database/src/std/rec/mbboRecord.c similarity index 100% rename from src/std/rec/mbboRecord.c rename to modules/database/src/std/rec/mbboRecord.c diff --git a/src/std/rec/mbboRecord.dbd b/modules/database/src/std/rec/mbboRecord.dbd similarity index 100% rename from src/std/rec/mbboRecord.dbd rename to modules/database/src/std/rec/mbboRecord.dbd diff --git a/src/std/rec/permissiveRecord.c b/modules/database/src/std/rec/permissiveRecord.c similarity index 100% rename from src/std/rec/permissiveRecord.c rename to modules/database/src/std/rec/permissiveRecord.c diff --git a/src/std/rec/permissiveRecord.dbd b/modules/database/src/std/rec/permissiveRecord.dbd similarity index 100% rename from src/std/rec/permissiveRecord.dbd rename to modules/database/src/std/rec/permissiveRecord.dbd diff --git a/src/std/rec/printfRecord.c b/modules/database/src/std/rec/printfRecord.c similarity index 100% rename from src/std/rec/printfRecord.c rename to modules/database/src/std/rec/printfRecord.c diff --git a/src/std/rec/printfRecord.dbd b/modules/database/src/std/rec/printfRecord.dbd similarity index 100% rename from src/std/rec/printfRecord.dbd rename to modules/database/src/std/rec/printfRecord.dbd diff --git a/src/std/rec/selRecord.c b/modules/database/src/std/rec/selRecord.c similarity index 100% rename from src/std/rec/selRecord.c rename to modules/database/src/std/rec/selRecord.c diff --git a/src/std/rec/selRecord.dbd b/modules/database/src/std/rec/selRecord.dbd similarity index 100% rename from src/std/rec/selRecord.dbd rename to modules/database/src/std/rec/selRecord.dbd diff --git a/src/std/rec/seqRecord.c b/modules/database/src/std/rec/seqRecord.c similarity index 100% rename from src/std/rec/seqRecord.c rename to modules/database/src/std/rec/seqRecord.c diff --git a/src/std/rec/seqRecord.dbd b/modules/database/src/std/rec/seqRecord.dbd similarity index 100% rename from src/std/rec/seqRecord.dbd rename to modules/database/src/std/rec/seqRecord.dbd diff --git a/src/std/rec/stateRecord.c b/modules/database/src/std/rec/stateRecord.c similarity index 100% rename from src/std/rec/stateRecord.c rename to modules/database/src/std/rec/stateRecord.c diff --git a/src/std/rec/stateRecord.dbd b/modules/database/src/std/rec/stateRecord.dbd similarity index 100% rename from src/std/rec/stateRecord.dbd rename to modules/database/src/std/rec/stateRecord.dbd diff --git a/src/std/rec/stringinRecord.c b/modules/database/src/std/rec/stringinRecord.c similarity index 100% rename from src/std/rec/stringinRecord.c rename to modules/database/src/std/rec/stringinRecord.c diff --git a/src/std/rec/stringinRecord.dbd b/modules/database/src/std/rec/stringinRecord.dbd similarity index 100% rename from src/std/rec/stringinRecord.dbd rename to modules/database/src/std/rec/stringinRecord.dbd diff --git a/src/std/rec/stringoutRecord.c b/modules/database/src/std/rec/stringoutRecord.c similarity index 100% rename from src/std/rec/stringoutRecord.c rename to modules/database/src/std/rec/stringoutRecord.c diff --git a/src/std/rec/stringoutRecord.dbd b/modules/database/src/std/rec/stringoutRecord.dbd similarity index 100% rename from src/std/rec/stringoutRecord.dbd rename to modules/database/src/std/rec/stringoutRecord.dbd diff --git a/src/std/rec/subArrayRecord.c b/modules/database/src/std/rec/subArrayRecord.c similarity index 100% rename from src/std/rec/subArrayRecord.c rename to modules/database/src/std/rec/subArrayRecord.c diff --git a/src/std/rec/subArrayRecord.dbd b/modules/database/src/std/rec/subArrayRecord.dbd similarity index 100% rename from src/std/rec/subArrayRecord.dbd rename to modules/database/src/std/rec/subArrayRecord.dbd diff --git a/src/std/rec/subRecord.c b/modules/database/src/std/rec/subRecord.c similarity index 100% rename from src/std/rec/subRecord.c rename to modules/database/src/std/rec/subRecord.c diff --git a/src/std/rec/subRecord.dbd b/modules/database/src/std/rec/subRecord.dbd similarity index 100% rename from src/std/rec/subRecord.dbd rename to modules/database/src/std/rec/subRecord.dbd diff --git a/src/std/rec/waveformRecord.c b/modules/database/src/std/rec/waveformRecord.c similarity index 100% rename from src/std/rec/waveformRecord.c rename to modules/database/src/std/rec/waveformRecord.c diff --git a/src/std/rec/waveformRecord.dbd.pod b/modules/database/src/std/rec/waveformRecord.dbd.pod similarity index 100% rename from src/std/rec/waveformRecord.dbd.pod rename to modules/database/src/std/rec/waveformRecord.dbd.pod diff --git a/src/std/softIoc/Makefile b/modules/database/src/std/softIoc/Makefile similarity index 100% rename from src/std/softIoc/Makefile rename to modules/database/src/std/softIoc/Makefile diff --git a/src/std/softIoc/RULES b/modules/database/src/std/softIoc/RULES similarity index 100% rename from src/std/softIoc/RULES rename to modules/database/src/std/softIoc/RULES diff --git a/src/std/softIoc/asSub.dbd b/modules/database/src/std/softIoc/asSub.dbd similarity index 100% rename from src/std/softIoc/asSub.dbd rename to modules/database/src/std/softIoc/asSub.dbd diff --git a/src/std/softIoc/base.dbd b/modules/database/src/std/softIoc/base.dbd similarity index 100% rename from src/std/softIoc/base.dbd rename to modules/database/src/std/softIoc/base.dbd diff --git a/src/std/softIoc/makeInstallDir.pl b/modules/database/src/std/softIoc/makeInstallDir.pl similarity index 100% rename from src/std/softIoc/makeInstallDir.pl rename to modules/database/src/std/softIoc/makeInstallDir.pl diff --git a/src/std/softIoc/softIocExit.db b/modules/database/src/std/softIoc/softIocExit.db similarity index 100% rename from src/std/softIoc/softIocExit.db rename to modules/database/src/std/softIoc/softIocExit.db diff --git a/src/std/softIoc/softMain.cpp b/modules/database/src/std/softIoc/softMain.cpp similarity index 100% rename from src/std/softIoc/softMain.cpp rename to modules/database/src/std/softIoc/softMain.cpp diff --git a/src/template/Makefile b/modules/database/src/template/Makefile similarity index 100% rename from src/template/Makefile rename to modules/database/src/template/Makefile diff --git a/src/template/top/Makefile b/modules/database/src/template/top/Makefile similarity index 100% rename from src/template/top/Makefile rename to modules/database/src/template/top/Makefile diff --git a/src/template/top/exampleApp/Db/Makefile b/modules/database/src/template/top/exampleApp/Db/Makefile similarity index 100% rename from src/template/top/exampleApp/Db/Makefile rename to modules/database/src/template/top/exampleApp/Db/Makefile diff --git a/src/template/top/exampleApp/Db/_APPNAME_Version.db b/modules/database/src/template/top/exampleApp/Db/_APPNAME_Version.db similarity index 100% rename from src/template/top/exampleApp/Db/_APPNAME_Version.db rename to modules/database/src/template/top/exampleApp/Db/_APPNAME_Version.db diff --git a/src/template/top/exampleApp/Db/circle.db b/modules/database/src/template/top/exampleApp/Db/circle.db similarity index 100% rename from src/template/top/exampleApp/Db/circle.db rename to modules/database/src/template/top/exampleApp/Db/circle.db diff --git a/src/template/top/exampleApp/Db/dbExample1.db b/modules/database/src/template/top/exampleApp/Db/dbExample1.db similarity index 100% rename from src/template/top/exampleApp/Db/dbExample1.db rename to modules/database/src/template/top/exampleApp/Db/dbExample1.db diff --git a/src/template/top/exampleApp/Db/dbExample2.db b/modules/database/src/template/top/exampleApp/Db/dbExample2.db similarity index 100% rename from src/template/top/exampleApp/Db/dbExample2.db rename to modules/database/src/template/top/exampleApp/Db/dbExample2.db diff --git a/src/template/top/exampleApp/Db/dbSubExample.db b/modules/database/src/template/top/exampleApp/Db/dbSubExample.db similarity index 100% rename from src/template/top/exampleApp/Db/dbSubExample.db rename to modules/database/src/template/top/exampleApp/Db/dbSubExample.db diff --git a/src/template/top/exampleApp/Db/user.substitutions b/modules/database/src/template/top/exampleApp/Db/user.substitutions similarity index 100% rename from src/template/top/exampleApp/Db/user.substitutions rename to modules/database/src/template/top/exampleApp/Db/user.substitutions diff --git a/src/template/top/exampleApp/Makefile b/modules/database/src/template/top/exampleApp/Makefile similarity index 100% rename from src/template/top/exampleApp/Makefile rename to modules/database/src/template/top/exampleApp/Makefile diff --git a/src/template/top/exampleApp/src/Makefile b/modules/database/src/template/top/exampleApp/src/Makefile similarity index 100% rename from src/template/top/exampleApp/src/Makefile rename to modules/database/src/template/top/exampleApp/src/Makefile diff --git a/src/template/top/exampleApp/src/_APPNAME_Hello.c b/modules/database/src/template/top/exampleApp/src/_APPNAME_Hello.c similarity index 100% rename from src/template/top/exampleApp/src/_APPNAME_Hello.c rename to modules/database/src/template/top/exampleApp/src/_APPNAME_Hello.c diff --git a/src/template/top/exampleApp/src/_APPNAME_Hello.dbd b/modules/database/src/template/top/exampleApp/src/_APPNAME_Hello.dbd similarity index 100% rename from src/template/top/exampleApp/src/_APPNAME_Hello.dbd rename to modules/database/src/template/top/exampleApp/src/_APPNAME_Hello.dbd diff --git a/src/template/top/exampleApp/src/_APPNAME_Main.cpp b/modules/database/src/template/top/exampleApp/src/_APPNAME_Main.cpp similarity index 100% rename from src/template/top/exampleApp/src/_APPNAME_Main.cpp rename to modules/database/src/template/top/exampleApp/src/_APPNAME_Main.cpp diff --git a/src/template/top/exampleApp/src/dbSubExample.c b/modules/database/src/template/top/exampleApp/src/dbSubExample.c similarity index 100% rename from src/template/top/exampleApp/src/dbSubExample.c rename to modules/database/src/template/top/exampleApp/src/dbSubExample.c diff --git a/src/template/top/exampleApp/src/dbSubExample.dbd b/modules/database/src/template/top/exampleApp/src/dbSubExample.dbd similarity index 100% rename from src/template/top/exampleApp/src/dbSubExample.dbd rename to modules/database/src/template/top/exampleApp/src/dbSubExample.dbd diff --git a/src/template/top/exampleApp/src/devXxxSoft.c b/modules/database/src/template/top/exampleApp/src/devXxxSoft.c similarity index 100% rename from src/template/top/exampleApp/src/devXxxSoft.c rename to modules/database/src/template/top/exampleApp/src/devXxxSoft.c diff --git a/src/template/top/exampleApp/src/dev_APPNAME_Version.c b/modules/database/src/template/top/exampleApp/src/dev_APPNAME_Version.c similarity index 100% rename from src/template/top/exampleApp/src/dev_APPNAME_Version.c rename to modules/database/src/template/top/exampleApp/src/dev_APPNAME_Version.c diff --git a/src/template/top/exampleApp/src/dev_APPNAME_Version.dbd b/modules/database/src/template/top/exampleApp/src/dev_APPNAME_Version.dbd similarity index 100% rename from src/template/top/exampleApp/src/dev_APPNAME_Version.dbd rename to modules/database/src/template/top/exampleApp/src/dev_APPNAME_Version.dbd diff --git a/src/template/top/exampleApp/src/initTrace.c b/modules/database/src/template/top/exampleApp/src/initTrace.c similarity index 100% rename from src/template/top/exampleApp/src/initTrace.c rename to modules/database/src/template/top/exampleApp/src/initTrace.c diff --git a/src/template/top/exampleApp/src/initTrace.dbd b/modules/database/src/template/top/exampleApp/src/initTrace.dbd similarity index 100% rename from src/template/top/exampleApp/src/initTrace.dbd rename to modules/database/src/template/top/exampleApp/src/initTrace.dbd diff --git a/src/template/top/exampleApp/src/sncExample.dbd b/modules/database/src/template/top/exampleApp/src/sncExample.dbd similarity index 100% rename from src/template/top/exampleApp/src/sncExample.dbd rename to modules/database/src/template/top/exampleApp/src/sncExample.dbd diff --git a/src/template/top/exampleApp/src/sncExample.stt b/modules/database/src/template/top/exampleApp/src/sncExample.stt similarity index 100% rename from src/template/top/exampleApp/src/sncExample.stt rename to modules/database/src/template/top/exampleApp/src/sncExample.stt diff --git a/src/template/top/exampleApp/src/sncProgram.st b/modules/database/src/template/top/exampleApp/src/sncProgram.st similarity index 100% rename from src/template/top/exampleApp/src/sncProgram.st rename to modules/database/src/template/top/exampleApp/src/sncProgram.st diff --git a/src/template/top/exampleApp/src/xxxRecord.c b/modules/database/src/template/top/exampleApp/src/xxxRecord.c similarity index 100% rename from src/template/top/exampleApp/src/xxxRecord.c rename to modules/database/src/template/top/exampleApp/src/xxxRecord.c diff --git a/src/template/top/exampleApp/src/xxxRecord.dbd b/modules/database/src/template/top/exampleApp/src/xxxRecord.dbd similarity index 100% rename from src/template/top/exampleApp/src/xxxRecord.dbd rename to modules/database/src/template/top/exampleApp/src/xxxRecord.dbd diff --git a/src/template/top/exampleApp/src/xxxSupport.dbd b/modules/database/src/template/top/exampleApp/src/xxxSupport.dbd similarity index 100% rename from src/template/top/exampleApp/src/xxxSupport.dbd rename to modules/database/src/template/top/exampleApp/src/xxxSupport.dbd diff --git a/src/template/top/exampleBoot/Makefile b/modules/database/src/template/top/exampleBoot/Makefile similarity index 100% rename from src/template/top/exampleBoot/Makefile rename to modules/database/src/template/top/exampleBoot/Makefile diff --git a/src/template/top/exampleBoot/ioc/Makefile@Common b/modules/database/src/template/top/exampleBoot/ioc/Makefile@Common similarity index 100% rename from src/template/top/exampleBoot/ioc/Makefile@Common rename to modules/database/src/template/top/exampleBoot/ioc/Makefile@Common diff --git a/src/template/top/exampleBoot/ioc/Makefile@cygwin b/modules/database/src/template/top/exampleBoot/ioc/Makefile@cygwin similarity index 100% rename from src/template/top/exampleBoot/ioc/Makefile@cygwin rename to modules/database/src/template/top/exampleBoot/ioc/Makefile@cygwin diff --git a/src/template/top/exampleBoot/ioc/Makefile@vxWorks b/modules/database/src/template/top/exampleBoot/ioc/Makefile@vxWorks similarity index 100% rename from src/template/top/exampleBoot/ioc/Makefile@vxWorks rename to modules/database/src/template/top/exampleBoot/ioc/Makefile@vxWorks diff --git a/src/template/top/exampleBoot/ioc/Makefile@win32 b/modules/database/src/template/top/exampleBoot/ioc/Makefile@win32 similarity index 100% rename from src/template/top/exampleBoot/ioc/Makefile@win32 rename to modules/database/src/template/top/exampleBoot/ioc/Makefile@win32 diff --git a/src/template/top/exampleBoot/ioc/Makefile@windows b/modules/database/src/template/top/exampleBoot/ioc/Makefile@windows similarity index 100% rename from src/template/top/exampleBoot/ioc/Makefile@windows rename to modules/database/src/template/top/exampleBoot/ioc/Makefile@windows diff --git a/src/template/top/exampleBoot/ioc/README@Common b/modules/database/src/template/top/exampleBoot/ioc/README@Common similarity index 100% rename from src/template/top/exampleBoot/ioc/README@Common rename to modules/database/src/template/top/exampleBoot/ioc/README@Common diff --git a/src/template/top/exampleBoot/ioc/README@RTEMS b/modules/database/src/template/top/exampleBoot/ioc/README@RTEMS similarity index 100% rename from src/template/top/exampleBoot/ioc/README@RTEMS rename to modules/database/src/template/top/exampleBoot/ioc/README@RTEMS diff --git a/src/template/top/exampleBoot/ioc/README@vxWorks b/modules/database/src/template/top/exampleBoot/ioc/README@vxWorks similarity index 100% rename from src/template/top/exampleBoot/ioc/README@vxWorks rename to modules/database/src/template/top/exampleBoot/ioc/README@vxWorks diff --git a/src/template/top/exampleBoot/ioc/st.cmd@Common b/modules/database/src/template/top/exampleBoot/ioc/st.cmd@Common similarity index 100% rename from src/template/top/exampleBoot/ioc/st.cmd@Common rename to modules/database/src/template/top/exampleBoot/ioc/st.cmd@Common diff --git a/src/template/top/exampleBoot/ioc/st.cmd@RTEMS b/modules/database/src/template/top/exampleBoot/ioc/st.cmd@RTEMS similarity index 100% rename from src/template/top/exampleBoot/ioc/st.cmd@RTEMS rename to modules/database/src/template/top/exampleBoot/ioc/st.cmd@RTEMS diff --git a/src/template/top/exampleBoot/ioc/st.cmd@vxWorks b/modules/database/src/template/top/exampleBoot/ioc/st.cmd@vxWorks similarity index 100% rename from src/template/top/exampleBoot/ioc/st.cmd@vxWorks rename to modules/database/src/template/top/exampleBoot/ioc/st.cmd@vxWorks diff --git a/src/template/top/exampleBoot/nfsCommands@RTEMS b/modules/database/src/template/top/exampleBoot/nfsCommands@RTEMS similarity index 100% rename from src/template/top/exampleBoot/nfsCommands@RTEMS rename to modules/database/src/template/top/exampleBoot/nfsCommands@RTEMS diff --git a/src/template/top/exampleBoot/nfsCommands@vxWorks b/modules/database/src/template/top/exampleBoot/nfsCommands@vxWorks similarity index 100% rename from src/template/top/exampleBoot/nfsCommands@vxWorks rename to modules/database/src/template/top/exampleBoot/nfsCommands@vxWorks diff --git a/src/template/top/iocApp/Db/Makefile b/modules/database/src/template/top/iocApp/Db/Makefile similarity index 100% rename from src/template/top/iocApp/Db/Makefile rename to modules/database/src/template/top/iocApp/Db/Makefile diff --git a/src/template/top/iocApp/Makefile b/modules/database/src/template/top/iocApp/Makefile similarity index 100% rename from src/template/top/iocApp/Makefile rename to modules/database/src/template/top/iocApp/Makefile diff --git a/src/template/top/iocApp/src/Makefile b/modules/database/src/template/top/iocApp/src/Makefile similarity index 100% rename from src/template/top/iocApp/src/Makefile rename to modules/database/src/template/top/iocApp/src/Makefile diff --git a/src/template/top/iocApp/src/_APPNAME_Main.cpp b/modules/database/src/template/top/iocApp/src/_APPNAME_Main.cpp similarity index 100% rename from src/template/top/iocApp/src/_APPNAME_Main.cpp rename to modules/database/src/template/top/iocApp/src/_APPNAME_Main.cpp diff --git a/src/template/top/iocBoot/Makefile b/modules/database/src/template/top/iocBoot/Makefile similarity index 100% rename from src/template/top/iocBoot/Makefile rename to modules/database/src/template/top/iocBoot/Makefile diff --git a/src/template/top/iocBoot/ioc/Makefile@Common b/modules/database/src/template/top/iocBoot/ioc/Makefile@Common similarity index 100% rename from src/template/top/iocBoot/ioc/Makefile@Common rename to modules/database/src/template/top/iocBoot/ioc/Makefile@Common diff --git a/src/template/top/iocBoot/ioc/Makefile@cygwin b/modules/database/src/template/top/iocBoot/ioc/Makefile@cygwin similarity index 100% rename from src/template/top/iocBoot/ioc/Makefile@cygwin rename to modules/database/src/template/top/iocBoot/ioc/Makefile@cygwin diff --git a/src/template/top/iocBoot/ioc/Makefile@vxWorks b/modules/database/src/template/top/iocBoot/ioc/Makefile@vxWorks similarity index 100% rename from src/template/top/iocBoot/ioc/Makefile@vxWorks rename to modules/database/src/template/top/iocBoot/ioc/Makefile@vxWorks diff --git a/src/template/top/iocBoot/ioc/Makefile@win32 b/modules/database/src/template/top/iocBoot/ioc/Makefile@win32 similarity index 100% rename from src/template/top/iocBoot/ioc/Makefile@win32 rename to modules/database/src/template/top/iocBoot/ioc/Makefile@win32 diff --git a/src/template/top/iocBoot/ioc/Makefile@windows b/modules/database/src/template/top/iocBoot/ioc/Makefile@windows similarity index 100% rename from src/template/top/iocBoot/ioc/Makefile@windows rename to modules/database/src/template/top/iocBoot/ioc/Makefile@windows diff --git a/src/template/top/iocBoot/ioc/st.cmd@Common b/modules/database/src/template/top/iocBoot/ioc/st.cmd@Common similarity index 100% rename from src/template/top/iocBoot/ioc/st.cmd@Common rename to modules/database/src/template/top/iocBoot/ioc/st.cmd@Common diff --git a/src/template/top/iocBoot/ioc/st.cmd@Cross b/modules/database/src/template/top/iocBoot/ioc/st.cmd@Cross similarity index 100% rename from src/template/top/iocBoot/ioc/st.cmd@Cross rename to modules/database/src/template/top/iocBoot/ioc/st.cmd@Cross diff --git a/src/template/top/iocBoot/ioc/st.cmd@RTEMS b/modules/database/src/template/top/iocBoot/ioc/st.cmd@RTEMS similarity index 100% rename from src/template/top/iocBoot/ioc/st.cmd@RTEMS rename to modules/database/src/template/top/iocBoot/ioc/st.cmd@RTEMS diff --git a/src/template/top/iocBoot/ioc/st.cmd@vxWorks b/modules/database/src/template/top/iocBoot/ioc/st.cmd@vxWorks similarity index 100% rename from src/template/top/iocBoot/ioc/st.cmd@vxWorks rename to modules/database/src/template/top/iocBoot/ioc/st.cmd@vxWorks diff --git a/src/template/top/iocBoot/nfsCommands@RTEMS b/modules/database/src/template/top/iocBoot/nfsCommands@RTEMS similarity index 100% rename from src/template/top/iocBoot/nfsCommands@RTEMS rename to modules/database/src/template/top/iocBoot/nfsCommands@RTEMS diff --git a/src/template/top/iocBoot/nfsCommands@vxWorks b/modules/database/src/template/top/iocBoot/nfsCommands@vxWorks similarity index 100% rename from src/template/top/iocBoot/nfsCommands@vxWorks rename to modules/database/src/template/top/iocBoot/nfsCommands@vxWorks diff --git a/src/template/top/supportApp/Db/Makefile b/modules/database/src/template/top/supportApp/Db/Makefile similarity index 100% rename from src/template/top/supportApp/Db/Makefile rename to modules/database/src/template/top/supportApp/Db/Makefile diff --git a/src/template/top/supportApp/Makefile b/modules/database/src/template/top/supportApp/Makefile similarity index 100% rename from src/template/top/supportApp/Makefile rename to modules/database/src/template/top/supportApp/Makefile diff --git a/src/template/top/supportApp/src/Makefile b/modules/database/src/template/top/supportApp/src/Makefile similarity index 100% rename from src/template/top/supportApp/src/Makefile rename to modules/database/src/template/top/supportApp/src/Makefile diff --git a/src/template/top/supportApp/src/_APPNAME_.dbd b/modules/database/src/template/top/supportApp/src/_APPNAME_.dbd similarity index 100% rename from src/template/top/supportApp/src/_APPNAME_.dbd rename to modules/database/src/template/top/supportApp/src/_APPNAME_.dbd diff --git a/src/tools/DBD.pm b/modules/database/src/tools/DBD.pm similarity index 100% rename from src/tools/DBD.pm rename to modules/database/src/tools/DBD.pm diff --git a/src/tools/DBD/Base.pm b/modules/database/src/tools/DBD/Base.pm similarity index 100% rename from src/tools/DBD/Base.pm rename to modules/database/src/tools/DBD/Base.pm diff --git a/src/tools/DBD/Breaktable.pm b/modules/database/src/tools/DBD/Breaktable.pm similarity index 100% rename from src/tools/DBD/Breaktable.pm rename to modules/database/src/tools/DBD/Breaktable.pm diff --git a/src/tools/DBD/Device.pm b/modules/database/src/tools/DBD/Device.pm similarity index 100% rename from src/tools/DBD/Device.pm rename to modules/database/src/tools/DBD/Device.pm diff --git a/src/tools/DBD/Driver.pm b/modules/database/src/tools/DBD/Driver.pm similarity index 100% rename from src/tools/DBD/Driver.pm rename to modules/database/src/tools/DBD/Driver.pm diff --git a/src/tools/DBD/Function.pm b/modules/database/src/tools/DBD/Function.pm similarity index 100% rename from src/tools/DBD/Function.pm rename to modules/database/src/tools/DBD/Function.pm diff --git a/src/tools/DBD/Link.pm b/modules/database/src/tools/DBD/Link.pm similarity index 100% rename from src/tools/DBD/Link.pm rename to modules/database/src/tools/DBD/Link.pm diff --git a/src/tools/DBD/Menu.pm b/modules/database/src/tools/DBD/Menu.pm similarity index 100% rename from src/tools/DBD/Menu.pm rename to modules/database/src/tools/DBD/Menu.pm diff --git a/src/tools/DBD/Output.pm b/modules/database/src/tools/DBD/Output.pm similarity index 100% rename from src/tools/DBD/Output.pm rename to modules/database/src/tools/DBD/Output.pm diff --git a/src/tools/DBD/Parser.pm b/modules/database/src/tools/DBD/Parser.pm similarity index 100% rename from src/tools/DBD/Parser.pm rename to modules/database/src/tools/DBD/Parser.pm diff --git a/src/tools/DBD/Recfield.pm b/modules/database/src/tools/DBD/Recfield.pm similarity index 100% rename from src/tools/DBD/Recfield.pm rename to modules/database/src/tools/DBD/Recfield.pm diff --git a/src/tools/DBD/Record.pm b/modules/database/src/tools/DBD/Record.pm similarity index 100% rename from src/tools/DBD/Record.pm rename to modules/database/src/tools/DBD/Record.pm diff --git a/src/tools/DBD/Recordtype.pm b/modules/database/src/tools/DBD/Recordtype.pm similarity index 100% rename from src/tools/DBD/Recordtype.pm rename to modules/database/src/tools/DBD/Recordtype.pm diff --git a/src/tools/DBD/Registrar.pm b/modules/database/src/tools/DBD/Registrar.pm similarity index 100% rename from src/tools/DBD/Registrar.pm rename to modules/database/src/tools/DBD/Registrar.pm diff --git a/src/tools/DBD/Variable.pm b/modules/database/src/tools/DBD/Variable.pm similarity index 100% rename from src/tools/DBD/Variable.pm rename to modules/database/src/tools/DBD/Variable.pm diff --git a/src/tools/Makefile b/modules/database/src/tools/Makefile similarity index 100% rename from src/tools/Makefile rename to modules/database/src/tools/Makefile diff --git a/src/tools/dbExpand.pl b/modules/database/src/tools/dbExpand.pl similarity index 100% rename from src/tools/dbExpand.pl rename to modules/database/src/tools/dbExpand.pl diff --git a/src/tools/dbdExpand.pl b/modules/database/src/tools/dbdExpand.pl similarity index 100% rename from src/tools/dbdExpand.pl rename to modules/database/src/tools/dbdExpand.pl diff --git a/src/tools/dbdReport.pl b/modules/database/src/tools/dbdReport.pl similarity index 100% rename from src/tools/dbdReport.pl rename to modules/database/src/tools/dbdReport.pl diff --git a/src/tools/dbdToHtml.pl b/modules/database/src/tools/dbdToHtml.pl similarity index 100% rename from src/tools/dbdToHtml.pl rename to modules/database/src/tools/dbdToHtml.pl diff --git a/src/tools/dbdToMenuH.pl b/modules/database/src/tools/dbdToMenuH.pl similarity index 100% rename from src/tools/dbdToMenuH.pl rename to modules/database/src/tools/dbdToMenuH.pl diff --git a/src/tools/dbdToRecordtypeH.pl b/modules/database/src/tools/dbdToRecordtypeH.pl similarity index 100% rename from src/tools/dbdToRecordtypeH.pl rename to modules/database/src/tools/dbdToRecordtypeH.pl diff --git a/src/tools/makeIncludeDbd.pl b/modules/database/src/tools/makeIncludeDbd.pl similarity index 100% rename from src/tools/makeIncludeDbd.pl rename to modules/database/src/tools/makeIncludeDbd.pl diff --git a/src/tools/registerRecordDeviceDriver.pl b/modules/database/src/tools/registerRecordDeviceDriver.pl similarity index 100% rename from src/tools/registerRecordDeviceDriver.pl rename to modules/database/src/tools/registerRecordDeviceDriver.pl diff --git a/test/Makefile b/modules/database/test/Makefile similarity index 100% rename from test/Makefile rename to modules/database/test/Makefile diff --git a/test/ioc/db/Makefile b/modules/database/test/ioc/db/Makefile similarity index 100% rename from test/ioc/db/Makefile rename to modules/database/test/ioc/db/Makefile diff --git a/test/ioc/db/arrRecord.c b/modules/database/test/ioc/db/arrRecord.c similarity index 100% rename from test/ioc/db/arrRecord.c rename to modules/database/test/ioc/db/arrRecord.c diff --git a/test/ioc/db/arrRecord.dbd b/modules/database/test/ioc/db/arrRecord.dbd similarity index 100% rename from test/ioc/db/arrRecord.dbd rename to modules/database/test/ioc/db/arrRecord.dbd diff --git a/test/ioc/db/arrShorthandTest.c b/modules/database/test/ioc/db/arrShorthandTest.c similarity index 100% rename from test/ioc/db/arrShorthandTest.c rename to modules/database/test/ioc/db/arrShorthandTest.c diff --git a/test/ioc/db/benchdbConvert.c b/modules/database/test/ioc/db/benchdbConvert.c similarity index 100% rename from test/ioc/db/benchdbConvert.c rename to modules/database/test/ioc/db/benchdbConvert.c diff --git a/test/ioc/db/callbackParallelTest.c b/modules/database/test/ioc/db/callbackParallelTest.c similarity index 100% rename from test/ioc/db/callbackParallelTest.c rename to modules/database/test/ioc/db/callbackParallelTest.c diff --git a/test/ioc/db/callbackTest.c b/modules/database/test/ioc/db/callbackTest.c similarity index 100% rename from test/ioc/db/callbackTest.c rename to modules/database/test/ioc/db/callbackTest.c diff --git a/test/ioc/db/chfPluginTest.c b/modules/database/test/ioc/db/chfPluginTest.c similarity index 100% rename from test/ioc/db/chfPluginTest.c rename to modules/database/test/ioc/db/chfPluginTest.c diff --git a/test/ioc/db/dbBadLink.db b/modules/database/test/ioc/db/dbBadLink.db similarity index 100% rename from test/ioc/db/dbBadLink.db rename to modules/database/test/ioc/db/dbBadLink.db diff --git a/test/ioc/db/dbCACTest.cpp b/modules/database/test/ioc/db/dbCACTest.cpp similarity index 100% rename from test/ioc/db/dbCACTest.cpp rename to modules/database/test/ioc/db/dbCACTest.cpp diff --git a/test/ioc/db/dbCaLinkTest.c b/modules/database/test/ioc/db/dbCaLinkTest.c similarity index 100% rename from test/ioc/db/dbCaLinkTest.c rename to modules/database/test/ioc/db/dbCaLinkTest.c diff --git a/test/ioc/db/dbCaLinkTest1.db b/modules/database/test/ioc/db/dbCaLinkTest1.db similarity index 100% rename from test/ioc/db/dbCaLinkTest1.db rename to modules/database/test/ioc/db/dbCaLinkTest1.db diff --git a/test/ioc/db/dbCaLinkTest2.db b/modules/database/test/ioc/db/dbCaLinkTest2.db similarity index 100% rename from test/ioc/db/dbCaLinkTest2.db rename to modules/database/test/ioc/db/dbCaLinkTest2.db diff --git a/test/ioc/db/dbCaLinkTest3.db b/modules/database/test/ioc/db/dbCaLinkTest3.db similarity index 100% rename from test/ioc/db/dbCaLinkTest3.db rename to modules/database/test/ioc/db/dbCaLinkTest3.db diff --git a/test/ioc/db/dbCaStats.db b/modules/database/test/ioc/db/dbCaStats.db similarity index 100% rename from test/ioc/db/dbCaStats.db rename to modules/database/test/ioc/db/dbCaStats.db diff --git a/test/ioc/db/dbCaStatsTest.c b/modules/database/test/ioc/db/dbCaStatsTest.c similarity index 100% rename from test/ioc/db/dbCaStatsTest.c rename to modules/database/test/ioc/db/dbCaStatsTest.c diff --git a/test/ioc/db/dbChArrTest.cpp b/modules/database/test/ioc/db/dbChArrTest.cpp similarity index 100% rename from test/ioc/db/dbChArrTest.cpp rename to modules/database/test/ioc/db/dbChArrTest.cpp diff --git a/test/ioc/db/dbChArrTest.db b/modules/database/test/ioc/db/dbChArrTest.db similarity index 100% rename from test/ioc/db/dbChArrTest.db rename to modules/database/test/ioc/db/dbChArrTest.db diff --git a/test/ioc/db/dbChannelTest.c b/modules/database/test/ioc/db/dbChannelTest.c similarity index 100% rename from test/ioc/db/dbChannelTest.c rename to modules/database/test/ioc/db/dbChannelTest.c diff --git a/test/ioc/db/dbLinkdset.c b/modules/database/test/ioc/db/dbLinkdset.c similarity index 100% rename from test/ioc/db/dbLinkdset.c rename to modules/database/test/ioc/db/dbLinkdset.c diff --git a/test/ioc/db/dbLinkdset.dbd b/modules/database/test/ioc/db/dbLinkdset.dbd similarity index 100% rename from test/ioc/db/dbLinkdset.dbd rename to modules/database/test/ioc/db/dbLinkdset.dbd diff --git a/test/ioc/db/dbLockTest.c b/modules/database/test/ioc/db/dbLockTest.c similarity index 100% rename from test/ioc/db/dbLockTest.c rename to modules/database/test/ioc/db/dbLockTest.c diff --git a/test/ioc/db/dbLockTest.db b/modules/database/test/ioc/db/dbLockTest.db similarity index 100% rename from test/ioc/db/dbLockTest.db rename to modules/database/test/ioc/db/dbLockTest.db diff --git a/test/ioc/db/dbPutGetTest.c b/modules/database/test/ioc/db/dbPutGetTest.c similarity index 100% rename from test/ioc/db/dbPutGetTest.c rename to modules/database/test/ioc/db/dbPutGetTest.c diff --git a/test/ioc/db/dbPutGetTest.db b/modules/database/test/ioc/db/dbPutGetTest.db similarity index 100% rename from test/ioc/db/dbPutGetTest.db rename to modules/database/test/ioc/db/dbPutGetTest.db diff --git a/test/ioc/db/dbPutLinkTest.c b/modules/database/test/ioc/db/dbPutLinkTest.c similarity index 100% rename from test/ioc/db/dbPutLinkTest.c rename to modules/database/test/ioc/db/dbPutLinkTest.c diff --git a/test/ioc/db/dbPutLinkTest.db b/modules/database/test/ioc/db/dbPutLinkTest.db similarity index 100% rename from test/ioc/db/dbPutLinkTest.db rename to modules/database/test/ioc/db/dbPutLinkTest.db diff --git a/test/ioc/db/dbPutLinkTestJ.db b/modules/database/test/ioc/db/dbPutLinkTestJ.db similarity index 100% rename from test/ioc/db/dbPutLinkTestJ.db rename to modules/database/test/ioc/db/dbPutLinkTestJ.db diff --git a/test/ioc/db/dbScanTest.c b/modules/database/test/ioc/db/dbScanTest.c similarity index 100% rename from test/ioc/db/dbScanTest.c rename to modules/database/test/ioc/db/dbScanTest.c diff --git a/test/ioc/db/dbServerTest.c b/modules/database/test/ioc/db/dbServerTest.c similarity index 100% rename from test/ioc/db/dbServerTest.c rename to modules/database/test/ioc/db/dbServerTest.c diff --git a/test/ioc/db/dbShutdownTest.c b/modules/database/test/ioc/db/dbShutdownTest.c similarity index 100% rename from test/ioc/db/dbShutdownTest.c rename to modules/database/test/ioc/db/dbShutdownTest.c diff --git a/test/ioc/db/dbStateTest.c b/modules/database/test/ioc/db/dbStateTest.c similarity index 100% rename from test/ioc/db/dbStateTest.c rename to modules/database/test/ioc/db/dbStateTest.c diff --git a/test/ioc/db/dbStaticTest.c b/modules/database/test/ioc/db/dbStaticTest.c similarity index 100% rename from test/ioc/db/dbStaticTest.c rename to modules/database/test/ioc/db/dbStaticTest.c diff --git a/test/ioc/db/dbStaticTest.db b/modules/database/test/ioc/db/dbStaticTest.db similarity index 100% rename from test/ioc/db/dbStaticTest.db rename to modules/database/test/ioc/db/dbStaticTest.db diff --git a/test/ioc/db/dbStressLock.c b/modules/database/test/ioc/db/dbStressLock.c similarity index 100% rename from test/ioc/db/dbStressLock.c rename to modules/database/test/ioc/db/dbStressLock.c diff --git a/test/ioc/db/dbStressLock.db b/modules/database/test/ioc/db/dbStressLock.db similarity index 100% rename from test/ioc/db/dbStressLock.db rename to modules/database/test/ioc/db/dbStressLock.db diff --git a/test/ioc/db/devx.c b/modules/database/test/ioc/db/devx.c similarity index 100% rename from test/ioc/db/devx.c rename to modules/database/test/ioc/db/devx.c diff --git a/test/ioc/db/devx.dbd b/modules/database/test/ioc/db/devx.dbd similarity index 100% rename from test/ioc/db/devx.dbd rename to modules/database/test/ioc/db/devx.dbd diff --git a/test/ioc/db/devx.h b/modules/database/test/ioc/db/devx.h similarity index 100% rename from test/ioc/db/devx.h rename to modules/database/test/ioc/db/devx.h diff --git a/test/ioc/db/epicsRunDbTests.c b/modules/database/test/ioc/db/epicsRunDbTests.c similarity index 100% rename from test/ioc/db/epicsRunDbTests.c rename to modules/database/test/ioc/db/epicsRunDbTests.c diff --git a/test/ioc/db/jlinkz.c b/modules/database/test/ioc/db/jlinkz.c similarity index 100% rename from test/ioc/db/jlinkz.c rename to modules/database/test/ioc/db/jlinkz.c diff --git a/test/ioc/db/jlinkz.dbd b/modules/database/test/ioc/db/jlinkz.dbd similarity index 100% rename from test/ioc/db/jlinkz.dbd rename to modules/database/test/ioc/db/jlinkz.dbd diff --git a/test/ioc/db/jlinkz.h b/modules/database/test/ioc/db/jlinkz.h similarity index 100% rename from test/ioc/db/jlinkz.h rename to modules/database/test/ioc/db/jlinkz.h diff --git a/test/ioc/db/recGblCheckDeadbandTest.c b/modules/database/test/ioc/db/recGblCheckDeadbandTest.c similarity index 100% rename from test/ioc/db/recGblCheckDeadbandTest.c rename to modules/database/test/ioc/db/recGblCheckDeadbandTest.c diff --git a/test/ioc/db/rtemsTestHarness.c b/modules/database/test/ioc/db/rtemsTestHarness.c similarity index 100% rename from test/ioc/db/rtemsTestHarness.c rename to modules/database/test/ioc/db/rtemsTestHarness.c diff --git a/test/ioc/db/scanIoTest.c b/modules/database/test/ioc/db/scanIoTest.c similarity index 100% rename from test/ioc/db/scanIoTest.c rename to modules/database/test/ioc/db/scanIoTest.c diff --git a/test/ioc/db/scanIoTest.db b/modules/database/test/ioc/db/scanIoTest.db similarity index 100% rename from test/ioc/db/scanIoTest.db rename to modules/database/test/ioc/db/scanIoTest.db diff --git a/test/ioc/db/testdbConvert.c b/modules/database/test/ioc/db/testdbConvert.c similarity index 100% rename from test/ioc/db/testdbConvert.c rename to modules/database/test/ioc/db/testdbConvert.c diff --git a/test/ioc/db/xLink.c b/modules/database/test/ioc/db/xLink.c similarity index 100% rename from test/ioc/db/xLink.c rename to modules/database/test/ioc/db/xLink.c diff --git a/test/ioc/db/xLink.dbd b/modules/database/test/ioc/db/xLink.dbd similarity index 100% rename from test/ioc/db/xLink.dbd rename to modules/database/test/ioc/db/xLink.dbd diff --git a/test/ioc/db/xRecord.c b/modules/database/test/ioc/db/xRecord.c similarity index 100% rename from test/ioc/db/xRecord.c rename to modules/database/test/ioc/db/xRecord.c diff --git a/test/ioc/db/xRecord.db b/modules/database/test/ioc/db/xRecord.db similarity index 100% rename from test/ioc/db/xRecord.db rename to modules/database/test/ioc/db/xRecord.db diff --git a/test/ioc/db/xRecord.dbd b/modules/database/test/ioc/db/xRecord.dbd similarity index 100% rename from test/ioc/db/xRecord.dbd rename to modules/database/test/ioc/db/xRecord.dbd diff --git a/test/ioc/dbtemplate/Makefile b/modules/database/test/ioc/dbtemplate/Makefile similarity index 100% rename from test/ioc/dbtemplate/Makefile rename to modules/database/test/ioc/dbtemplate/Makefile diff --git a/test/ioc/dbtemplate/dbltExpand.c b/modules/database/test/ioc/dbtemplate/dbltExpand.c similarity index 100% rename from test/ioc/dbtemplate/dbltExpand.c rename to modules/database/test/ioc/dbtemplate/dbltExpand.c diff --git a/test/ioc/dbtemplate/msi.plt b/modules/database/test/ioc/dbtemplate/msi.plt similarity index 100% rename from test/ioc/dbtemplate/msi.plt rename to modules/database/test/ioc/dbtemplate/msi.plt diff --git a/test/ioc/dbtemplate/t1-include.txt b/modules/database/test/ioc/dbtemplate/t1-include.txt similarity index 100% rename from test/ioc/dbtemplate/t1-include.txt rename to modules/database/test/ioc/dbtemplate/t1-include.txt diff --git a/test/ioc/dbtemplate/t1-result.txt b/modules/database/test/ioc/dbtemplate/t1-result.txt similarity index 100% rename from test/ioc/dbtemplate/t1-result.txt rename to modules/database/test/ioc/dbtemplate/t1-result.txt diff --git a/test/ioc/dbtemplate/t1-template.txt b/modules/database/test/ioc/dbtemplate/t1-template.txt similarity index 100% rename from test/ioc/dbtemplate/t1-template.txt rename to modules/database/test/ioc/dbtemplate/t1-template.txt diff --git a/test/ioc/dbtemplate/t2-result.txt b/modules/database/test/ioc/dbtemplate/t2-result.txt similarity index 100% rename from test/ioc/dbtemplate/t2-result.txt rename to modules/database/test/ioc/dbtemplate/t2-result.txt diff --git a/test/ioc/dbtemplate/t2-substitution.txt b/modules/database/test/ioc/dbtemplate/t2-substitution.txt similarity index 100% rename from test/ioc/dbtemplate/t2-substitution.txt rename to modules/database/test/ioc/dbtemplate/t2-substitution.txt diff --git a/test/ioc/dbtemplate/t2-template.txt b/modules/database/test/ioc/dbtemplate/t2-template.txt similarity index 100% rename from test/ioc/dbtemplate/t2-template.txt rename to modules/database/test/ioc/dbtemplate/t2-template.txt diff --git a/test/ioc/dbtemplate/t3-result.txt b/modules/database/test/ioc/dbtemplate/t3-result.txt similarity index 100% rename from test/ioc/dbtemplate/t3-result.txt rename to modules/database/test/ioc/dbtemplate/t3-result.txt diff --git a/test/ioc/dbtemplate/t3-substitution.txt b/modules/database/test/ioc/dbtemplate/t3-substitution.txt similarity index 100% rename from test/ioc/dbtemplate/t3-substitution.txt rename to modules/database/test/ioc/dbtemplate/t3-substitution.txt diff --git a/test/ioc/dbtemplate/t3-template.txt b/modules/database/test/ioc/dbtemplate/t3-template.txt similarity index 100% rename from test/ioc/dbtemplate/t3-template.txt rename to modules/database/test/ioc/dbtemplate/t3-template.txt diff --git a/test/ioc/dbtemplate/t4-result.txt b/modules/database/test/ioc/dbtemplate/t4-result.txt similarity index 100% rename from test/ioc/dbtemplate/t4-result.txt rename to modules/database/test/ioc/dbtemplate/t4-result.txt diff --git a/test/ioc/dbtemplate/t4-substitution.txt b/modules/database/test/ioc/dbtemplate/t4-substitution.txt similarity index 100% rename from test/ioc/dbtemplate/t4-substitution.txt rename to modules/database/test/ioc/dbtemplate/t4-substitution.txt diff --git a/test/ioc/dbtemplate/t5-result.txt b/modules/database/test/ioc/dbtemplate/t5-result.txt similarity index 100% rename from test/ioc/dbtemplate/t5-result.txt rename to modules/database/test/ioc/dbtemplate/t5-result.txt diff --git a/test/ioc/dbtemplate/t5-substitute.txt b/modules/database/test/ioc/dbtemplate/t5-substitute.txt similarity index 100% rename from test/ioc/dbtemplate/t5-substitute.txt rename to modules/database/test/ioc/dbtemplate/t5-substitute.txt diff --git a/test/ioc/dbtemplate/t5-template.txt b/modules/database/test/ioc/dbtemplate/t5-template.txt similarity index 100% rename from test/ioc/dbtemplate/t5-template.txt rename to modules/database/test/ioc/dbtemplate/t5-template.txt diff --git a/test/ioc/dbtemplate/t6-result.txt b/modules/database/test/ioc/dbtemplate/t6-result.txt similarity index 100% rename from test/ioc/dbtemplate/t6-result.txt rename to modules/database/test/ioc/dbtemplate/t6-result.txt diff --git a/test/ioc/dbtemplate/t6-substitute.txt b/modules/database/test/ioc/dbtemplate/t6-substitute.txt similarity index 100% rename from test/ioc/dbtemplate/t6-substitute.txt rename to modules/database/test/ioc/dbtemplate/t6-substitute.txt diff --git a/test/ioc/dbtemplate/t6-template.txt b/modules/database/test/ioc/dbtemplate/t6-template.txt similarity index 100% rename from test/ioc/dbtemplate/t6-template.txt rename to modules/database/test/ioc/dbtemplate/t6-template.txt diff --git a/test/ioc/dbtemplate/t8-result.txt b/modules/database/test/ioc/dbtemplate/t8-result.txt similarity index 100% rename from test/ioc/dbtemplate/t8-result.txt rename to modules/database/test/ioc/dbtemplate/t8-result.txt diff --git a/test/ioc/dbtemplate/t9-result.txt b/modules/database/test/ioc/dbtemplate/t9-result.txt similarity index 100% rename from test/ioc/dbtemplate/t9-result.txt rename to modules/database/test/ioc/dbtemplate/t9-result.txt diff --git a/test/std/filters/Makefile b/modules/database/test/std/filters/Makefile similarity index 100% rename from test/std/filters/Makefile rename to modules/database/test/std/filters/Makefile diff --git a/test/std/filters/arrRecord.c b/modules/database/test/std/filters/arrRecord.c similarity index 100% rename from test/std/filters/arrRecord.c rename to modules/database/test/std/filters/arrRecord.c diff --git a/test/std/filters/arrRecord.dbd b/modules/database/test/std/filters/arrRecord.dbd similarity index 100% rename from test/std/filters/arrRecord.dbd rename to modules/database/test/std/filters/arrRecord.dbd diff --git a/test/std/filters/arrTest.cpp b/modules/database/test/std/filters/arrTest.cpp similarity index 100% rename from test/std/filters/arrTest.cpp rename to modules/database/test/std/filters/arrTest.cpp diff --git a/test/std/filters/arrTest.db b/modules/database/test/std/filters/arrTest.db similarity index 100% rename from test/std/filters/arrTest.db rename to modules/database/test/std/filters/arrTest.db diff --git a/test/std/filters/dbndTest.c b/modules/database/test/std/filters/dbndTest.c similarity index 100% rename from test/std/filters/dbndTest.c rename to modules/database/test/std/filters/dbndTest.c diff --git a/test/std/filters/epicsRunFilterTests.c b/modules/database/test/std/filters/epicsRunFilterTests.c similarity index 100% rename from test/std/filters/epicsRunFilterTests.c rename to modules/database/test/std/filters/epicsRunFilterTests.c diff --git a/test/std/filters/rtemsTestHarness.c b/modules/database/test/std/filters/rtemsTestHarness.c similarity index 100% rename from test/std/filters/rtemsTestHarness.c rename to modules/database/test/std/filters/rtemsTestHarness.c diff --git a/test/std/filters/syncTest.c b/modules/database/test/std/filters/syncTest.c similarity index 100% rename from test/std/filters/syncTest.c rename to modules/database/test/std/filters/syncTest.c diff --git a/test/std/filters/tsTest.c b/modules/database/test/std/filters/tsTest.c similarity index 100% rename from test/std/filters/tsTest.c rename to modules/database/test/std/filters/tsTest.c diff --git a/test/std/filters/xRecord.c b/modules/database/test/std/filters/xRecord.c similarity index 100% rename from test/std/filters/xRecord.c rename to modules/database/test/std/filters/xRecord.c diff --git a/test/std/filters/xRecord.db b/modules/database/test/std/filters/xRecord.db similarity index 100% rename from test/std/filters/xRecord.db rename to modules/database/test/std/filters/xRecord.db diff --git a/test/std/filters/xRecord.dbd b/modules/database/test/std/filters/xRecord.dbd similarity index 100% rename from test/std/filters/xRecord.dbd rename to modules/database/test/std/filters/xRecord.dbd diff --git a/test/std/rec/Makefile b/modules/database/test/std/rec/Makefile similarity index 100% rename from test/std/rec/Makefile rename to modules/database/test/std/rec/Makefile diff --git a/test/std/rec/analogMonitorTest.c b/modules/database/test/std/rec/analogMonitorTest.c similarity index 100% rename from test/std/rec/analogMonitorTest.c rename to modules/database/test/std/rec/analogMonitorTest.c diff --git a/test/std/rec/analogMonitorTest.db b/modules/database/test/std/rec/analogMonitorTest.db similarity index 100% rename from test/std/rec/analogMonitorTest.db rename to modules/database/test/std/rec/analogMonitorTest.db diff --git a/test/std/rec/arrayOpTest.c b/modules/database/test/std/rec/arrayOpTest.c similarity index 100% rename from test/std/rec/arrayOpTest.c rename to modules/database/test/std/rec/arrayOpTest.c diff --git a/test/std/rec/arrayOpTest.db b/modules/database/test/std/rec/arrayOpTest.db similarity index 100% rename from test/std/rec/arrayOpTest.db rename to modules/database/test/std/rec/arrayOpTest.db diff --git a/test/std/rec/asTest.c b/modules/database/test/std/rec/asTest.c similarity index 100% rename from test/std/rec/asTest.c rename to modules/database/test/std/rec/asTest.c diff --git a/test/std/rec/asTest.db b/modules/database/test/std/rec/asTest.db similarity index 100% rename from test/std/rec/asTest.db rename to modules/database/test/std/rec/asTest.db diff --git a/test/std/rec/asTest.dbd b/modules/database/test/std/rec/asTest.dbd similarity index 100% rename from test/std/rec/asTest.dbd rename to modules/database/test/std/rec/asTest.dbd diff --git a/test/std/rec/asTestLib.c b/modules/database/test/std/rec/asTestLib.c similarity index 100% rename from test/std/rec/asTestLib.c rename to modules/database/test/std/rec/asTestLib.c diff --git a/test/std/rec/asyncSoftTest.c b/modules/database/test/std/rec/asyncSoftTest.c similarity index 100% rename from test/std/rec/asyncSoftTest.c rename to modules/database/test/std/rec/asyncSoftTest.c diff --git a/test/std/rec/asyncSoftTest.db b/modules/database/test/std/rec/asyncSoftTest.db similarity index 100% rename from test/std/rec/asyncSoftTest.db rename to modules/database/test/std/rec/asyncSoftTest.db diff --git a/test/std/rec/compressTest.c b/modules/database/test/std/rec/compressTest.c similarity index 100% rename from test/std/rec/compressTest.c rename to modules/database/test/std/rec/compressTest.c diff --git a/test/std/rec/compressTest.db b/modules/database/test/std/rec/compressTest.db similarity index 100% rename from test/std/rec/compressTest.db rename to modules/database/test/std/rec/compressTest.db diff --git a/test/std/rec/epicsRunRecordTests.c b/modules/database/test/std/rec/epicsRunRecordTests.c similarity index 100% rename from test/std/rec/epicsRunRecordTests.c rename to modules/database/test/std/rec/epicsRunRecordTests.c diff --git a/test/std/rec/linkInitTest.c b/modules/database/test/std/rec/linkInitTest.c similarity index 100% rename from test/std/rec/linkInitTest.c rename to modules/database/test/std/rec/linkInitTest.c diff --git a/test/std/rec/linkInitTest.db b/modules/database/test/std/rec/linkInitTest.db similarity index 100% rename from test/std/rec/linkInitTest.db rename to modules/database/test/std/rec/linkInitTest.db diff --git a/test/std/rec/linkRetargetLink.db b/modules/database/test/std/rec/linkRetargetLink.db similarity index 100% rename from test/std/rec/linkRetargetLink.db rename to modules/database/test/std/rec/linkRetargetLink.db diff --git a/test/std/rec/linkRetargetLinkTest.c b/modules/database/test/std/rec/linkRetargetLinkTest.c similarity index 100% rename from test/std/rec/linkRetargetLinkTest.c rename to modules/database/test/std/rec/linkRetargetLinkTest.c diff --git a/test/std/rec/recMiscTest.c b/modules/database/test/std/rec/recMiscTest.c similarity index 100% rename from test/std/rec/recMiscTest.c rename to modules/database/test/std/rec/recMiscTest.c diff --git a/test/std/rec/recMiscTest.db b/modules/database/test/std/rec/recMiscTest.db similarity index 100% rename from test/std/rec/recMiscTest.db rename to modules/database/test/std/rec/recMiscTest.db diff --git a/test/std/rec/regressArray1.db b/modules/database/test/std/rec/regressArray1.db similarity index 100% rename from test/std/rec/regressArray1.db rename to modules/database/test/std/rec/regressArray1.db diff --git a/test/std/rec/regressHex.db b/modules/database/test/std/rec/regressHex.db similarity index 100% rename from test/std/rec/regressHex.db rename to modules/database/test/std/rec/regressHex.db diff --git a/test/std/rec/regressLinkMS.db b/modules/database/test/std/rec/regressLinkMS.db similarity index 100% rename from test/std/rec/regressLinkMS.db rename to modules/database/test/std/rec/regressLinkMS.db diff --git a/test/std/rec/regressTest.c b/modules/database/test/std/rec/regressTest.c similarity index 100% rename from test/std/rec/regressTest.c rename to modules/database/test/std/rec/regressTest.c diff --git a/test/std/rec/rtemsTestHarness.c b/modules/database/test/std/rec/rtemsTestHarness.c similarity index 100% rename from test/std/rec/rtemsTestHarness.c rename to modules/database/test/std/rec/rtemsTestHarness.c diff --git a/test/std/rec/simmSetup.db b/modules/database/test/std/rec/simmSetup.db similarity index 100% rename from test/std/rec/simmSetup.db rename to modules/database/test/std/rec/simmSetup.db diff --git a/test/std/rec/simmSimlFail.db b/modules/database/test/std/rec/simmSimlFail.db similarity index 100% rename from test/std/rec/simmSimlFail.db rename to modules/database/test/std/rec/simmSimlFail.db diff --git a/test/std/rec/simmTest.c b/modules/database/test/std/rec/simmTest.c similarity index 100% rename from test/std/rec/simmTest.c rename to modules/database/test/std/rec/simmTest.c diff --git a/test/std/rec/simmTest.substitutions b/modules/database/test/std/rec/simmTest.substitutions similarity index 100% rename from test/std/rec/simmTest.substitutions rename to modules/database/test/std/rec/simmTest.substitutions diff --git a/test/std/rec/simmTestArray.template b/modules/database/test/std/rec/simmTestArray.template similarity index 100% rename from test/std/rec/simmTestArray.template rename to modules/database/test/std/rec/simmTestArray.template diff --git a/test/std/rec/simmTestHistogram.template b/modules/database/test/std/rec/simmTestHistogram.template similarity index 100% rename from test/std/rec/simmTestHistogram.template rename to modules/database/test/std/rec/simmTestHistogram.template diff --git a/test/std/rec/simmTestSimple.template b/modules/database/test/std/rec/simmTestSimple.template similarity index 100% rename from test/std/rec/simmTestSimple.template rename to modules/database/test/std/rec/simmTestSimple.template diff --git a/test/std/rec/softTest.c b/modules/database/test/std/rec/softTest.c similarity index 100% rename from test/std/rec/softTest.c rename to modules/database/test/std/rec/softTest.c diff --git a/test/std/rec/softTest.db b/modules/database/test/std/rec/softTest.db similarity index 100% rename from test/std/rec/softTest.db rename to modules/database/test/std/rec/softTest.db diff --git a/test/tools/Base.plt b/modules/database/test/tools/Base.plt similarity index 100% rename from test/tools/Base.plt rename to modules/database/test/tools/Base.plt diff --git a/test/tools/Breaktable.plt b/modules/database/test/tools/Breaktable.plt similarity index 100% rename from test/tools/Breaktable.plt rename to modules/database/test/tools/Breaktable.plt diff --git a/test/tools/DBD.plt b/modules/database/test/tools/DBD.plt similarity index 100% rename from test/tools/DBD.plt rename to modules/database/test/tools/DBD.plt diff --git a/test/tools/Device.plt b/modules/database/test/tools/Device.plt similarity index 100% rename from test/tools/Device.plt rename to modules/database/test/tools/Device.plt diff --git a/test/tools/Driver.plt b/modules/database/test/tools/Driver.plt similarity index 100% rename from test/tools/Driver.plt rename to modules/database/test/tools/Driver.plt diff --git a/test/tools/Function.plt b/modules/database/test/tools/Function.plt similarity index 100% rename from test/tools/Function.plt rename to modules/database/test/tools/Function.plt diff --git a/test/tools/Makefile b/modules/database/test/tools/Makefile similarity index 100% rename from test/tools/Makefile rename to modules/database/test/tools/Makefile diff --git a/test/tools/Menu.plt b/modules/database/test/tools/Menu.plt similarity index 100% rename from test/tools/Menu.plt rename to modules/database/test/tools/Menu.plt diff --git a/test/tools/Recfield.plt b/modules/database/test/tools/Recfield.plt similarity index 100% rename from test/tools/Recfield.plt rename to modules/database/test/tools/Recfield.plt diff --git a/test/tools/Recordtype.plt b/modules/database/test/tools/Recordtype.plt similarity index 100% rename from test/tools/Recordtype.plt rename to modules/database/test/tools/Recordtype.plt diff --git a/test/tools/Registrar.plt b/modules/database/test/tools/Registrar.plt similarity index 100% rename from test/tools/Registrar.plt rename to modules/database/test/tools/Registrar.plt diff --git a/test/tools/Variable.plt b/modules/database/test/tools/Variable.plt similarity index 100% rename from test/tools/Variable.plt rename to modules/database/test/tools/Variable.plt