diff --git a/cde/lib/DtSvc/DtUtil1/Action.h b/cde/include/Dt/Action.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/Action.h
rename to cde/include/Dt/Action.h
diff --git a/cde/lib/DtSvc/DtUtil1/ActionDb.h b/cde/include/Dt/ActionDb.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/ActionDb.h
rename to cde/include/Dt/ActionDb.h
diff --git a/cde/lib/DtSvc/DtUtil1/ActionDbP.h b/cde/include/Dt/ActionDbP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/ActionDbP.h
rename to cde/include/Dt/ActionDbP.h
diff --git a/cde/lib/DtSvc/DtUtil1/ActionFind.h b/cde/include/Dt/ActionFind.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/ActionFind.h
rename to cde/include/Dt/ActionFind.h
diff --git a/cde/lib/DtSvc/DtUtil1/ActionP.h b/cde/include/Dt/ActionP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/ActionP.h
rename to cde/include/Dt/ActionP.h
diff --git a/cde/lib/DtSvc/DtUtil1/ActionUtilP.h b/cde/include/Dt/ActionUtilP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/ActionUtilP.h
rename to cde/include/Dt/ActionUtilP.h
diff --git a/cde/lib/DtHelp/CanvasP.h b/cde/include/Dt/CanvasP.h
similarity index 100%
rename from cde/lib/DtHelp/CanvasP.h
rename to cde/include/Dt/CanvasP.h
diff --git a/cde/lib/DtHelp/CanvasSegP.h b/cde/include/Dt/CanvasSegP.h
similarity index 100%
rename from cde/lib/DtHelp/CanvasSegP.h
rename to cde/include/Dt/CanvasSegP.h
diff --git a/cde/lib/DtSvc/DtUtil2/ChkpntP.h b/cde/include/Dt/ChkpntP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/ChkpntP.h
rename to cde/include/Dt/ChkpntP.h
diff --git a/cde/lib/DtSvc/DtUtil1/CmdInv.h b/cde/include/Dt/CmdInv.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/CmdInv.h
rename to cde/include/Dt/CmdInv.h
diff --git a/cde/lib/DtSvc/DtUtil1/CmdInvP.h b/cde/include/Dt/CmdInvP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/CmdInvP.h
rename to cde/include/Dt/CmdInvP.h
diff --git a/cde/lib/DtSvc/DtUtil2/Collate.h b/cde/include/Dt/Collate.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Collate.h
rename to cde/include/Dt/Collate.h
diff --git a/cde/lib/DtWidget/ComboBox.h b/cde/include/Dt/ComboBox.h
similarity index 100%
rename from cde/lib/DtWidget/ComboBox.h
rename to cde/include/Dt/ComboBox.h
diff --git a/cde/lib/DtWidget/ComboBoxP.h b/cde/include/Dt/ComboBoxP.h
similarity index 100%
rename from cde/lib/DtWidget/ComboBoxP.h
rename to cde/include/Dt/ComboBoxP.h
diff --git a/cde/lib/DtSvc/DtUtil2/CommandM.h b/cde/include/Dt/CommandM.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/CommandM.h
rename to cde/include/Dt/CommandM.h
diff --git a/cde/lib/DtSvc/DtUtil2/Connect.h b/cde/include/Dt/Connect.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Connect.h
rename to cde/include/Dt/Connect.h
diff --git a/cde/lib/DtWidget/Control.h b/cde/include/Dt/Control.h
similarity index 100%
rename from cde/lib/DtWidget/Control.h
rename to cde/include/Dt/Control.h
diff --git a/cde/lib/DtWidget/ControlP.h b/cde/include/Dt/ControlP.h
similarity index 100%
rename from cde/lib/DtWidget/ControlP.h
rename to cde/include/Dt/ControlP.h
diff --git a/cde/lib/DtSvc/DtUtil2/DataTypes.h b/cde/include/Dt/DataTypes.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/DataTypes.h
rename to cde/include/Dt/DataTypes.h
diff --git a/cde/lib/DtSvc/DtUtil1/DbReader.h b/cde/include/Dt/DbReader.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/DbReader.h
rename to cde/include/Dt/DbReader.h
diff --git a/cde/lib/DtSvc/DtUtil1/DbUtil.h b/cde/include/Dt/DbUtil.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/DbUtil.h
rename to cde/include/Dt/DbUtil.h
diff --git a/cde/lib/DtWidget/DialogBox.h b/cde/include/Dt/DialogBox.h
similarity index 100%
rename from cde/lib/DtWidget/DialogBox.h
rename to cde/include/Dt/DialogBox.h
diff --git a/cde/lib/DtWidget/DialogBoxP.h b/cde/include/Dt/DialogBoxP.h
similarity index 100%
rename from cde/lib/DtWidget/DialogBoxP.h
rename to cde/include/Dt/DialogBoxP.h
diff --git a/cde/lib/DtSvc/DtUtil1/Dnd.h b/cde/include/Dt/Dnd.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/Dnd.h
rename to cde/include/Dt/Dnd.h
diff --git a/cde/lib/DtSvc/DtUtil1/DndIconI.h b/cde/include/Dt/DndIconI.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/DndIconI.h
rename to cde/include/Dt/DndIconI.h
diff --git a/cde/lib/DtSvc/DtUtil1/DndP.h b/cde/include/Dt/DndP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/DndP.h
rename to cde/include/Dt/DndP.h
diff --git a/cde/lib/DtSvc/DtUtil1/Dt.h b/cde/include/Dt/Dt.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/Dt.h
rename to cde/include/Dt/Dt.h
diff --git a/cde/lib/DtSvc/DtUtil2/DtGetMessageP.h b/cde/include/Dt/DtGetMessageP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/DtGetMessageP.h
rename to cde/include/Dt/DtGetMessageP.h
diff --git a/cde/lib/DtSvc/DtUtil1/DtHash.h b/cde/include/Dt/DtHash.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/DtHash.h
rename to cde/include/Dt/DtHash.h
diff --git a/cde/lib/DtWidget/DtMsgsP.h b/cde/include/Dt/DtMsgsP.h
similarity index 100%
rename from cde/lib/DtWidget/DtMsgsP.h
rename to cde/include/Dt/DtMsgsP.h
diff --git a/cde/lib/DtSvc/DtUtil2/DtNlUtils.h b/cde/include/Dt/DtNlUtils.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/DtNlUtils.h
rename to cde/include/Dt/DtNlUtils.h
diff --git a/cde/lib/DtSvc/DtUtil2/DtP.h b/cde/include/Dt/DtP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/DtP.h
rename to cde/include/Dt/DtP.h
diff --git a/cde/lib/DtSvc/DtUtil2/DtPStrings.h b/cde/include/Dt/DtPStrings.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/DtPStrings.h
rename to cde/include/Dt/DtPStrings.h
diff --git a/cde/lib/DtSvc/DtUtil1/DtShmDb.h b/cde/include/Dt/DtShmDb.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/DtShmDb.h
rename to cde/include/Dt/DtShmDb.h
diff --git a/cde/lib/DtWidget/DtStrDefs.h b/cde/include/Dt/DtStrDefs.h
similarity index 100%
rename from cde/lib/DtWidget/DtStrDefs.h
rename to cde/include/Dt/DtStrDefs.h
diff --git a/cde/lib/DtSvc/DtUtil2/DtosP.h b/cde/include/Dt/DtosP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/DtosP.h
rename to cde/include/Dt/DtosP.h
diff --git a/cde/lib/DtSvc/DtUtil2/DtpadM.h b/cde/include/Dt/DtpadM.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/DtpadM.h
rename to cde/include/Dt/DtpadM.h
diff --git a/cde/lib/DtSvc/DtUtil1/Dts.h b/cde/include/Dt/Dts.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/Dts.h
rename to cde/include/Dt/Dts.h
diff --git a/cde/lib/DtSvc/DtUtil1/DtsDb.h b/cde/include/Dt/DtsDb.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/DtsDb.h
rename to cde/include/Dt/DtsDb.h
diff --git a/cde/lib/DtSvc/DtUtil1/DtsMM.h b/cde/include/Dt/DtsMM.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/DtsMM.h
rename to cde/include/Dt/DtsMM.h
diff --git a/cde/lib/DtWidget/Editor.h b/cde/include/Dt/Editor.h
similarity index 100%
rename from cde/lib/DtWidget/Editor.h
rename to cde/include/Dt/Editor.h
diff --git a/cde/lib/DtWidget/EditorP.h b/cde/include/Dt/EditorP.h
similarity index 100%
rename from cde/lib/DtWidget/EditorP.h
rename to cde/include/Dt/EditorP.h
diff --git a/cde/lib/DtSvc/DtUtil2/EnvControlI.h b/cde/include/Dt/EnvControlI.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/EnvControlI.h
rename to cde/include/Dt/EnvControlI.h
diff --git a/cde/lib/DtSvc/DtUtil2/EnvControlP.h b/cde/include/Dt/EnvControlP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/EnvControlP.h
rename to cde/include/Dt/EnvControlP.h
diff --git a/cde/lib/DtSvc/DtUtil2/FileM.h b/cde/include/Dt/FileM.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/FileM.h
rename to cde/include/Dt/FileM.h
diff --git a/cde/lib/DtSvc/DtUtil2/FileUtil.h b/cde/include/Dt/FileUtil.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/FileUtil.h
rename to cde/include/Dt/FileUtil.h
diff --git a/cde/lib/DtSvc/DtUtil2/GetDispRes.h b/cde/include/Dt/GetDispRes.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/GetDispRes.h
rename to cde/include/Dt/GetDispRes.h
diff --git a/cde/lib/DtSvc/DtUtil2/HashP.h b/cde/include/Dt/HashP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/HashP.h
rename to cde/include/Dt/HashP.h
diff --git a/cde/lib/DtHelp/Help.h b/cde/include/Dt/Help.h
similarity index 100%
rename from cde/lib/DtHelp/Help.h
rename to cde/include/Dt/Help.h
diff --git a/cde/lib/DtHelp/HelpDialog.h b/cde/include/Dt/HelpDialog.h
similarity index 100%
rename from cde/lib/DtHelp/HelpDialog.h
rename to cde/include/Dt/HelpDialog.h
diff --git a/cde/lib/DtHelp/HelpDialogP.h b/cde/include/Dt/HelpDialogP.h
similarity index 100%
rename from cde/lib/DtHelp/HelpDialogP.h
rename to cde/include/Dt/HelpDialogP.h
diff --git a/cde/lib/DtHelp/HelpP.h b/cde/include/Dt/HelpP.h
similarity index 100%
rename from cde/lib/DtHelp/HelpP.h
rename to cde/include/Dt/HelpP.h
diff --git a/cde/lib/DtHelp/HelpQuickD.h b/cde/include/Dt/HelpQuickD.h
similarity index 100%
rename from cde/lib/DtHelp/HelpQuickD.h
rename to cde/include/Dt/HelpQuickD.h
diff --git a/cde/lib/DtHelp/HelpQuickDP.h b/cde/include/Dt/HelpQuickDP.h
similarity index 100%
rename from cde/lib/DtHelp/HelpQuickDP.h
rename to cde/include/Dt/HelpQuickDP.h
diff --git a/cde/lib/DtSvc/DtUtil2/HourGlass.h b/cde/include/Dt/HourGlass.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/HourGlass.h
rename to cde/include/Dt/HourGlass.h
diff --git a/cde/lib/DtWidget/Icon.h b/cde/include/Dt/Icon.h
similarity index 100%
rename from cde/lib/DtWidget/Icon.h
rename to cde/include/Dt/Icon.h
diff --git a/cde/lib/DtSvc/DtUtil2/IconFile.h b/cde/include/Dt/IconFile.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/IconFile.h
rename to cde/include/Dt/IconFile.h
diff --git a/cde/lib/DtWidget/IconP.h b/cde/include/Dt/IconP.h
similarity index 100%
rename from cde/lib/DtWidget/IconP.h
rename to cde/include/Dt/IconP.h
diff --git a/cde/lib/DtSvc/DtUtil2/Indicator.h b/cde/include/Dt/Indicator.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Indicator.h
rename to cde/include/Dt/Indicator.h
diff --git a/cde/lib/DtSvc/DtUtil2/IndicatorM.h b/cde/include/Dt/IndicatorM.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/IndicatorM.h
rename to cde/include/Dt/IndicatorM.h
diff --git a/cde/lib/DtSvc/DtUtil2/Info.h b/cde/include/Dt/Info.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Info.h
rename to cde/include/Dt/Info.h
diff --git a/cde/lib/DtSvc/DtUtil2/LocaleXlate.h b/cde/include/Dt/LocaleXlate.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/LocaleXlate.h
rename to cde/include/Dt/LocaleXlate.h
diff --git a/cde/lib/DtSvc/DtUtil2/Lock.h b/cde/include/Dt/Lock.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Lock.h
rename to cde/include/Dt/Lock.h
diff --git a/cde/lib/DtWidget/MacrosP.h b/cde/include/Dt/MacrosP.h
similarity index 100%
rename from cde/lib/DtWidget/MacrosP.h
rename to cde/include/Dt/MacrosP.h
diff --git a/cde/lib/DtWidget/MenuButton.h b/cde/include/Dt/MenuButton.h
similarity index 100%
rename from cde/lib/DtWidget/MenuButton.h
rename to cde/include/Dt/MenuButton.h
diff --git a/cde/lib/DtWidget/MenuButtonP.h b/cde/include/Dt/MenuButtonP.h
similarity index 100%
rename from cde/lib/DtWidget/MenuButtonP.h
rename to cde/include/Dt/MenuButtonP.h
diff --git a/cde/lib/DtSvc/DtUtil2/Message.h b/cde/include/Dt/Message.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Message.h
rename to cde/include/Dt/Message.h
diff --git a/cde/lib/DtMrm/Mrm.h b/cde/include/Dt/Mrm.h
similarity index 100%
rename from cde/lib/DtMrm/Mrm.h
rename to cde/include/Dt/Mrm.h
diff --git a/cde/lib/DtSvc/DtUtil2/Msg.h b/cde/include/Dt/Msg.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Msg.h
rename to cde/include/Dt/Msg.h
diff --git a/cde/lib/DtSvc/DtUtil2/MsgCatP.h b/cde/include/Dt/MsgCatP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/MsgCatP.h
rename to cde/include/Dt/MsgCatP.h
diff --git a/cde/lib/DtSvc/DtUtil2/MsgLog.h b/cde/include/Dt/MsgLog.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/MsgLog.h
rename to cde/include/Dt/MsgLog.h
diff --git a/cde/lib/DtSvc/DtUtil2/MsgLogI.h b/cde/include/Dt/MsgLogI.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/MsgLogI.h
rename to cde/include/Dt/MsgLogI.h
diff --git a/cde/lib/DtSvc/DtUtil2/MsgP.h b/cde/include/Dt/MsgP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/MsgP.h
rename to cde/include/Dt/MsgP.h
diff --git a/cde/lib/DtPrint/Print.h b/cde/include/Dt/Print.h
similarity index 100%
rename from cde/lib/DtPrint/Print.h
rename to cde/include/Dt/Print.h
diff --git a/cde/lib/DtPrint/PrintDlgMgrP.h b/cde/include/Dt/PrintDlgMgrP.h
similarity index 100%
rename from cde/lib/DtPrint/PrintDlgMgrP.h
rename to cde/include/Dt/PrintDlgMgrP.h
diff --git a/cde/lib/DtPrint/PrintI.h b/cde/include/Dt/PrintI.h
similarity index 100%
rename from cde/lib/DtPrint/PrintI.h
rename to cde/include/Dt/PrintI.h
diff --git a/cde/lib/DtPrint/PrintMsgsP.h b/cde/include/Dt/PrintMsgsP.h
similarity index 100%
rename from cde/lib/DtPrint/PrintMsgsP.h
rename to cde/include/Dt/PrintMsgsP.h
diff --git a/cde/lib/DtPrint/PrintOptionsP.h b/cde/include/Dt/PrintOptionsP.h
similarity index 100%
rename from cde/lib/DtPrint/PrintOptionsP.h
rename to cde/include/Dt/PrintOptionsP.h
diff --git a/cde/lib/DtPrint/PrintSetupBP.h b/cde/include/Dt/PrintSetupBP.h
similarity index 100%
rename from cde/lib/DtPrint/PrintSetupBP.h
rename to cde/include/Dt/PrintSetupBP.h
diff --git a/cde/lib/DtPrint/PsubDefProcI.h b/cde/include/Dt/PsubDefProcI.h
similarity index 100%
rename from cde/lib/DtPrint/PsubDefProcI.h
rename to cde/include/Dt/PsubDefProcI.h
diff --git a/cde/lib/DtPrint/PsubUtilI.h b/cde/include/Dt/PsubUtilI.h
similarity index 100%
rename from cde/lib/DtPrint/PsubUtilI.h
rename to cde/include/Dt/PsubUtilI.h
diff --git a/cde/lib/DtSvc/DtUtil1/Qualify.h b/cde/include/Dt/Qualify.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/Qualify.h
rename to cde/include/Dt/Qualify.h
diff --git a/cde/lib/DtSvc/DtUtil1/Saver.h b/cde/include/Dt/Saver.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/Saver.h
rename to cde/include/Dt/Saver.h
diff --git a/cde/lib/DtSvc/DtUtil1/SaverP.h b/cde/include/Dt/SaverP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/SaverP.h
rename to cde/include/Dt/SaverP.h
diff --git a/cde/lib/DtSearch/Search.h b/cde/include/Dt/Search.h
similarity index 100%
rename from cde/lib/DtSearch/Search.h
rename to cde/include/Dt/Search.h
diff --git a/cde/lib/DtSearch/SearchE.h b/cde/include/Dt/SearchE.h
similarity index 100%
rename from cde/lib/DtSearch/SearchE.h
rename to cde/include/Dt/SearchE.h
diff --git a/cde/lib/DtSearch/SearchP.h b/cde/include/Dt/SearchP.h
similarity index 100%
rename from cde/lib/DtSearch/SearchP.h
rename to cde/include/Dt/SearchP.h
diff --git a/cde/lib/DtSvc/DtUtil2/Service.h b/cde/include/Dt/Service.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Service.h
rename to cde/include/Dt/Service.h
diff --git a/cde/lib/DtSvc/DtUtil1/Session.h b/cde/include/Dt/Session.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/Session.h
rename to cde/include/Dt/Session.h
diff --git a/cde/lib/DtSvc/DtUtil1/SessionM.h b/cde/include/Dt/SessionM.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/SessionM.h
rename to cde/include/Dt/SessionM.h
diff --git a/cde/lib/DtSvc/DtUtil1/SessionP.h b/cde/include/Dt/SessionP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/SessionP.h
rename to cde/include/Dt/SessionP.h
diff --git a/cde/lib/DtSvc/DtUtil2/Setlocale.h b/cde/include/Dt/Setlocale.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Setlocale.h
rename to cde/include/Dt/Setlocale.h
diff --git a/cde/lib/DtSvc/DtUtil2/SharedProcs.h b/cde/include/Dt/SharedProcs.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/SharedProcs.h
rename to cde/include/Dt/SharedProcs.h
diff --git a/cde/lib/DtSvc/DtUtil2/SmCreateDirs.h b/cde/include/Dt/SmCreateDirs.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/SmCreateDirs.h
rename to cde/include/Dt/SmCreateDirs.h
diff --git a/cde/lib/DtSvc/DtUtil2/Spc.h b/cde/include/Dt/Spc.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Spc.h
rename to cde/include/Dt/Spc.h
diff --git a/cde/lib/DtWidget/SpinBox.h b/cde/include/Dt/SpinBox.h
similarity index 100%
rename from cde/lib/DtWidget/SpinBox.h
rename to cde/include/Dt/SpinBox.h
diff --git a/cde/lib/DtWidget/SpinBoxP.h b/cde/include/Dt/SpinBoxP.h
similarity index 100%
rename from cde/lib/DtWidget/SpinBoxP.h
rename to cde/include/Dt/SpinBoxP.h
diff --git a/cde/lib/DtSvc/DtUtil2/SvcTT.h b/cde/include/Dt/SvcTT.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/SvcTT.h
rename to cde/include/Dt/SvcTT.h
diff --git a/cde/lib/DtTerm/Term/Term.h b/cde/include/Dt/Term.h
similarity index 100%
rename from cde/lib/DtTerm/Term/Term.h
rename to cde/include/Dt/Term.h
diff --git a/cde/lib/DtTerm/Term/TermP.h b/cde/include/Dt/TermP.h
similarity index 100%
rename from cde/lib/DtTerm/Term/TermP.h
rename to cde/include/Dt/TermP.h
diff --git a/cde/lib/DtTerm/TermPrim/TermPrim.h b/cde/include/Dt/TermPrim.h
similarity index 100%
rename from cde/lib/DtTerm/TermPrim/TermPrim.h
rename to cde/include/Dt/TermPrim.h
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimP.h b/cde/include/Dt/TermPrimP.h
similarity index 100%
rename from cde/lib/DtTerm/TermPrim/TermPrimP.h
rename to cde/include/Dt/TermPrimP.h
diff --git a/cde/lib/DtWidget/TitleBox.h b/cde/include/Dt/TitleBox.h
similarity index 100%
rename from cde/lib/DtWidget/TitleBox.h
rename to cde/include/Dt/TitleBox.h
diff --git a/cde/lib/DtWidget/TitleBoxP.h b/cde/include/Dt/TitleBoxP.h
similarity index 100%
rename from cde/lib/DtWidget/TitleBoxP.h
rename to cde/include/Dt/TitleBoxP.h
diff --git a/cde/lib/DtSvc/DtUtil2/Unistd.h b/cde/include/Dt/Unistd.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Unistd.h
rename to cde/include/Dt/Unistd.h
diff --git a/cde/lib/DtSvc/DtUtil2/UserMsg.h b/cde/include/Dt/UserMsg.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/UserMsg.h
rename to cde/include/Dt/UserMsg.h
diff --git a/cde/lib/DtSvc/DtUtil2/Utility.h b/cde/include/Dt/Utility.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/Utility.h
rename to cde/include/Dt/Utility.h
diff --git a/cde/lib/DtSvc/DtUtil2/UtilityP.h b/cde/include/Dt/UtilityP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/UtilityP.h
rename to cde/include/Dt/UtilityP.h
diff --git a/cde/lib/DtWidget/View.h b/cde/include/Dt/View.h
similarity index 100%
rename from cde/lib/DtWidget/View.h
rename to cde/include/Dt/View.h
diff --git a/cde/lib/DtWidget/ViewP.h b/cde/include/Dt/ViewP.h
similarity index 100%
rename from cde/lib/DtWidget/ViewP.h
rename to cde/include/Dt/ViewP.h
diff --git a/cde/lib/DtSvc/DtUtil1/Wsm.h b/cde/include/Dt/Wsm.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/Wsm.h
rename to cde/include/Dt/Wsm.h
diff --git a/cde/lib/DtSvc/DtUtil1/WsmM.h b/cde/include/Dt/WsmM.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/WsmM.h
rename to cde/include/Dt/WsmM.h
diff --git a/cde/lib/DtSvc/DtUtil1/WsmP.h b/cde/include/Dt/WsmP.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil1/WsmP.h
rename to cde/include/Dt/WsmP.h
diff --git a/cde/lib/DtSvc/DtUtil2/XlationSvc.h b/cde/include/Dt/XlationSvc.h
similarity index 100%
rename from cde/lib/DtSvc/DtUtil2/XlationSvc.h
rename to cde/include/Dt/XlationSvc.h
diff --git a/cde/lib/DtSearch/boolpars.h b/cde/include/Dt/boolpars.h
similarity index 100%
rename from cde/lib/DtSearch/boolpars.h
rename to cde/include/Dt/boolpars.h
diff --git a/cde/lib/DtSearch/dberr.h b/cde/include/Dt/dberr.h
similarity index 100%
rename from cde/lib/DtSearch/dberr.h
rename to cde/include/Dt/dberr.h
diff --git a/cde/lib/DtSearch/raima/dblock.h b/cde/include/Dt/dblock.h
similarity index 100%
rename from cde/lib/DtSearch/raima/dblock.h
rename to cde/include/Dt/dblock.h
diff --git a/cde/lib/DtSearch/raima/dbtype.h b/cde/include/Dt/dbtype.h
similarity index 100%
rename from cde/lib/DtSearch/raima/dbtype.h
rename to cde/include/Dt/dbtype.h
diff --git a/cde/lib/DtSearch/raima/dbxtrn.h b/cde/include/Dt/dbxtrn.h
similarity index 100%
rename from cde/lib/DtSearch/raima/dbxtrn.h
rename to cde/include/Dt/dbxtrn.h
diff --git a/cde/lib/DtSearch/dproto.h b/cde/include/Dt/dproto.h
similarity index 100%
rename from cde/lib/DtSearch/dproto.h
rename to cde/include/Dt/dproto.h
diff --git a/cde/lib/DtSearch/raima/dtcover.h b/cde/include/Dt/dtcover.h
similarity index 100%
rename from cde/lib/DtSearch/raima/dtcover.h
rename to cde/include/Dt/dtcover.h
diff --git a/cde/lib/DtPrint/dtpdmd.h b/cde/include/Dt/dtpdmd.h
similarity index 100%
rename from cde/lib/DtPrint/dtpdmd.h
rename to cde/include/Dt/dtpdmd.h
diff --git a/cde/lib/DtSearch/raima/inittab.h b/cde/include/Dt/inittab.h
similarity index 100%
rename from cde/lib/DtSearch/raima/inittab.h
rename to cde/include/Dt/inittab.h
diff --git a/cde/lib/DtSearch/raima/ll.h b/cde/include/Dt/ll.h
similarity index 100%
rename from cde/lib/DtSearch/raima/ll.h
rename to cde/include/Dt/ll.h
diff --git a/cde/lib/DtSearch/raima/ncb.h b/cde/include/Dt/ncb.h
similarity index 100%
rename from cde/lib/DtSearch/raima/ncb.h
rename to cde/include/Dt/ncb.h
diff --git a/cde/lib/DtSearch/raima/proto.h b/cde/include/Dt/proto.h
similarity index 100%
rename from cde/lib/DtSearch/raima/proto.h
rename to cde/include/Dt/proto.h
diff --git a/cde/lib/DtSearch/raima/task.h b/cde/include/Dt/task.h
similarity index 100%
rename from cde/lib/DtSearch/raima/task.h
rename to cde/include/Dt/task.h
diff --git a/cde/lib/DtSearch/raima/trxlog.h b/cde/include/Dt/trxlog.h
similarity index 100%
rename from cde/lib/DtSearch/raima/trxlog.h
rename to cde/include/Dt/trxlog.h
diff --git a/cde/lib/DtSearch/raima/vista.h b/cde/include/Dt/vista.h
similarity index 100%
rename from cde/lib/DtSearch/raima/vista.h
rename to cde/include/Dt/vista.h
diff --git a/cde/lib/DtSvc/DtXpm/xpm.h b/cde/include/Dt/xpm.h
similarity index 100%
rename from cde/lib/DtSvc/DtXpm/xpm.h
rename to cde/include/Dt/xpm.h
diff --git a/cde/lib/DtHelp/Access.h b/cde/include/DtI/Access.h
similarity index 100%
rename from cde/lib/DtHelp/Access.h
rename to cde/include/DtI/Access.h
diff --git a/cde/lib/DtHelp/AccessI.h b/cde/include/DtI/AccessI.h
similarity index 100%
rename from cde/lib/DtHelp/AccessI.h
rename to cde/include/DtI/AccessI.h
diff --git a/cde/lib/DtHelp/AccessP.h b/cde/include/DtI/AccessP.h
similarity index 100%
rename from cde/lib/DtHelp/AccessP.h
rename to cde/include/DtI/AccessP.h
diff --git a/cde/lib/DtHelp/ActionsI.h b/cde/include/DtI/ActionsI.h
similarity index 100%
rename from cde/lib/DtHelp/ActionsI.h
rename to cde/include/DtI/ActionsI.h
diff --git a/cde/lib/DtHelp/CallbacksI.h b/cde/include/DtI/CallbacksI.h
similarity index 100%
rename from cde/lib/DtHelp/CallbacksI.h
rename to cde/include/DtI/CallbacksI.h
diff --git a/cde/lib/DtHelp/CanvasI.h b/cde/include/DtI/CanvasI.h
similarity index 100%
rename from cde/lib/DtHelp/CanvasI.h
rename to cde/include/DtI/CanvasI.h
diff --git a/cde/lib/DtHelp/DisplayAreaI.h b/cde/include/DtI/DisplayAreaI.h
similarity index 100%
rename from cde/lib/DtHelp/DisplayAreaI.h
rename to cde/include/DtI/DisplayAreaI.h
diff --git a/cde/lib/DtHelp/DisplayAreaP.h b/cde/include/DtI/DisplayAreaP.h
similarity index 100%
rename from cde/lib/DtHelp/DisplayAreaP.h
rename to cde/include/DtI/DisplayAreaP.h
diff --git a/cde/lib/DtHelp/FileUtilsI.h b/cde/include/DtI/FileUtilsI.h
similarity index 100%
rename from cde/lib/DtHelp/FileUtilsI.h
rename to cde/include/DtI/FileUtilsI.h
diff --git a/cde/lib/DtHelp/FontAttrI.h b/cde/include/DtI/FontAttrI.h
similarity index 100%
rename from cde/lib/DtHelp/FontAttrI.h
rename to cde/include/DtI/FontAttrI.h
diff --git a/cde/lib/DtHelp/FontI.h b/cde/include/DtI/FontI.h
similarity index 100%
rename from cde/lib/DtHelp/FontI.h
rename to cde/include/DtI/FontI.h
diff --git a/cde/lib/DtHelp/GifUtilsI.h b/cde/include/DtI/GifUtilsI.h
similarity index 100%
rename from cde/lib/DtHelp/GifUtilsI.h
rename to cde/include/DtI/GifUtilsI.h
diff --git a/cde/lib/DtHelp/GraphicsP.h b/cde/include/DtI/GraphicsP.h
similarity index 100%
rename from cde/lib/DtHelp/GraphicsP.h
rename to cde/include/DtI/GraphicsP.h
diff --git a/cde/lib/DtHelp/HelpTermP.h b/cde/include/DtI/HelpTermP.h
similarity index 100%
rename from cde/lib/DtHelp/HelpTermP.h
rename to cde/include/DtI/HelpTermP.h
diff --git a/cde/lib/DtHelp/HelposI.h b/cde/include/DtI/HelposI.h
similarity index 100%
rename from cde/lib/DtHelp/HelposI.h
rename to cde/include/DtI/HelposI.h
diff --git a/cde/lib/DtHelp/HourGlassI.h b/cde/include/DtI/HourGlassI.h
similarity index 100%
rename from cde/lib/DtHelp/HourGlassI.h
rename to cde/include/DtI/HourGlassI.h
diff --git a/cde/lib/DtHelp/JpegUtilsI.h b/cde/include/DtI/JpegUtilsI.h
similarity index 100%
rename from cde/lib/DtHelp/JpegUtilsI.h
rename to cde/include/DtI/JpegUtilsI.h
diff --git a/cde/lib/DtHelp/LinkMgrP.h b/cde/include/DtI/LinkMgrP.h
similarity index 100%
rename from cde/lib/DtHelp/LinkMgrP.h
rename to cde/include/DtI/LinkMgrP.h
diff --git a/cde/lib/DtHelp/RegionI.h b/cde/include/DtI/RegionI.h
similarity index 100%
rename from cde/lib/DtHelp/RegionI.h
rename to cde/include/DtI/RegionI.h
diff --git a/cde/lib/DtHelp/SetListI.h b/cde/include/DtI/SetListI.h
similarity index 100%
rename from cde/lib/DtHelp/SetListI.h
rename to cde/include/DtI/SetListI.h
diff --git a/cde/lib/DtHelp/XUICreateI.h b/cde/include/DtI/XUICreateI.h
similarity index 100%
rename from cde/lib/DtHelp/XUICreateI.h
rename to cde/include/DtI/XUICreateI.h
diff --git a/cde/lib/DtHelp/XbmUtilsI.h b/cde/include/DtI/XbmUtilsI.h
similarity index 100%
rename from cde/lib/DtHelp/XbmUtilsI.h
rename to cde/include/DtI/XbmUtilsI.h
diff --git a/cde/lib/DtHelp/bufioI.h b/cde/include/DtI/bufioI.h
similarity index 100%
rename from cde/lib/DtHelp/bufioI.h
rename to cde/include/DtI/bufioI.h
diff --git a/cde/lib/DtSvc/include/SPC/chars.h b/cde/include/SPC/chars.h
similarity index 100%
rename from cde/lib/DtSvc/include/SPC/chars.h
rename to cde/include/SPC/chars.h
diff --git a/cde/lib/DtSvc/include/SPC/spc-obj.h b/cde/include/SPC/spc-obj.h
similarity index 100%
rename from cde/lib/DtSvc/include/SPC/spc-obj.h
rename to cde/include/SPC/spc-obj.h
diff --git a/cde/lib/DtSvc/include/SPC/spc-proto.h b/cde/include/SPC/spc-proto.h
similarity index 100%
rename from cde/lib/DtSvc/include/SPC/spc-proto.h
rename to cde/include/SPC/spc-proto.h
diff --git a/cde/lib/DtSvc/include/SPC/spcE.h b/cde/include/SPC/spcE.h
similarity index 100%
rename from cde/lib/DtSvc/include/SPC/spcE.h
rename to cde/include/SPC/spcE.h
diff --git a/cde/lib/DtSvc/include/SPC/spcP.h b/cde/include/SPC/spcP.h
similarity index 100%
rename from cde/lib/DtSvc/include/SPC/spcP.h
rename to cde/include/SPC/spcP.h
diff --git a/cde/lib/tt/lib/api/c/tt_c.h b/cde/include/Tt/tt_c.h
similarity index 100%
rename from cde/lib/tt/lib/api/c/tt_c.h
rename to cde/include/Tt/tt_c.h
diff --git a/cde/lib/tt/lib/tttk/tttk.h b/cde/include/Tt/tttk.h
similarity index 100%
rename from cde/lib/tt/lib/tttk/tttk.h
rename to cde/include/Tt/tttk.h
diff --git a/cde/lib/DtSvc/include/bms/MemoryMgr.h b/cde/include/bms/MemoryMgr.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/MemoryMgr.h
rename to cde/include/bms/MemoryMgr.h
diff --git a/cde/lib/DtSvc/include/bms/SbEvent.h b/cde/include/bms/SbEvent.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/SbEvent.h
rename to cde/include/bms/SbEvent.h
diff --git a/cde/lib/DtSvc/include/bms/Symbolic.h b/cde/include/bms/Symbolic.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/Symbolic.h
rename to cde/include/bms/Symbolic.h
diff --git a/cde/lib/DtSvc/include/bms/XeUserMsg.h b/cde/include/bms/XeUserMsg.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/XeUserMsg.h
rename to cde/include/bms/XeUserMsg.h
diff --git a/cde/lib/DtSvc/include/bms/bms.h b/cde/include/bms/bms.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/bms.h
rename to cde/include/bms/bms.h
diff --git a/cde/lib/DtSvc/include/bms/connect.h b/cde/include/bms/connect.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/connect.h
rename to cde/include/bms/connect.h
diff --git a/cde/lib/DtSvc/include/bms/pathwexp.h b/cde/include/bms/pathwexp.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/pathwexp.h
rename to cde/include/bms/pathwexp.h
diff --git a/cde/lib/DtSvc/include/bms/sbport.h b/cde/include/bms/sbport.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/sbport.h
rename to cde/include/bms/sbport.h
diff --git a/cde/lib/DtSvc/include/bms/sbstdinc.h b/cde/include/bms/sbstdinc.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/sbstdinc.h
rename to cde/include/bms/sbstdinc.h
diff --git a/cde/lib/DtSvc/include/bms/scoop.h b/cde/include/bms/scoop.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/scoop.h
rename to cde/include/bms/scoop.h
diff --git a/cde/lib/DtSvc/include/bms/spc.h b/cde/include/bms/spc.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/spc.h
rename to cde/include/bms/spc.h
diff --git a/cde/lib/DtSvc/include/bms/stringbuf.h b/cde/include/bms/stringbuf.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/stringbuf.h
rename to cde/include/bms/stringbuf.h
diff --git a/cde/lib/DtSvc/include/bms/usersig.h b/cde/include/bms/usersig.h
similarity index 100%
rename from cde/lib/DtSvc/include/bms/usersig.h
rename to cde/include/bms/usersig.h
diff --git a/cde/lib/DtSvc/include/codelibs/boolean.h b/cde/include/codelibs/boolean.h
similarity index 100%
rename from cde/lib/DtSvc/include/codelibs/boolean.h
rename to cde/include/codelibs/boolean.h
diff --git a/cde/lib/DtSvc/include/codelibs/pathutils.h b/cde/include/codelibs/pathutils.h
similarity index 100%
rename from cde/lib/DtSvc/include/codelibs/pathutils.h
rename to cde/include/codelibs/pathutils.h
diff --git a/cde/lib/DtSvc/include/codelibs/shellutils.h b/cde/include/codelibs/shellutils.h
similarity index 100%
rename from cde/lib/DtSvc/include/codelibs/shellutils.h
rename to cde/include/codelibs/shellutils.h
diff --git a/cde/lib/csa/csa.h b/cde/include/csa/csa.h
similarity index 100%
rename from cde/lib/csa/csa.h
rename to cde/include/csa/csa.h
diff --git a/cde/lib/DtSvc/include/Imakefile b/cde/lib/DtSvc/include/Imakefile
index 033a42a29..414b96621 100644
--- a/cde/lib/DtSvc/include/Imakefile
+++ b/cde/lib/DtSvc/include/Imakefile
@@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/3 1998/08/10 18:02:40 mgreess $
 #define IHaveSubdirs
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' 'CXXDEBUGFLAGS=$(CXXDEBUGFLAGS)'
 
-SUBDIRS = bms codelibs SPC
+SUBDIRS = codelibs
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
diff --git a/cde/lib/DtSvc/include/SPC/Imakefile b/cde/lib/DtSvc/include/SPC/Imakefile
deleted file mode 100644
index d335abab4..000000000
--- a/cde/lib/DtSvc/include/SPC/Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:09:55 drk $
-
-HEADERS = chars.h spc-obj.h spc-proto.h spcE.h spcP.h
-
-all::
-
-BuildIncludes($(HEADERS),SPC,..)
-InstallMultipleFlags($(HEADERS),$(INCDIR)/SPC,$(INSTINCFLAGS))
-
-depend::
-
-clean::
diff --git a/cde/lib/DtSvc/include/bms/Imakefile b/cde/lib/DtSvc/include/bms/Imakefile
deleted file mode 100644
index 078d6d224..000000000
--- a/cde/lib/DtSvc/include/bms/Imakefile
+++ /dev/null
@@ -1,17 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:09:58 drk $
-
-HEADERS = \
-	MemoryMgr.h 	SbEvent.h 	Symbolic.h \
-	XeUserMsg.h 	bms.h		connect.h \
-	pathwexp.h 	sbport.h 	sbstdinc.h \
-	scoop.h 	spc.h		stringbuf.h \
-	usersig.h
-
-all::
-
-BuildIncludes($(HEADERS),bms,..)
-InstallMultipleFlags($(HEADERS),$(INCDIR)/bms,$(INSTINCFLAGS))
-
-depend::
-
-clean::