Thu Sep 23 20:41:48 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

        * dance:

          Moved most DAnCE code under this directory to match ACE+TAO layout. 
        
        * rules.dance.GNU:

          Updated case of pat to version file. 
        
        * tests/DeploymentPlanDump/test.cpp:
        * tests/DeploymentPlanTestReferences/test.cpp:
        * tests/DeploymentTest1/test.cpp:
        * tests/NameServiceTest/clt_main.cpp:
        * tests/NameServiceTest/srv_main.cpp:
        * tests/NodeApplicationManager-NodeApplication/test.cpp:
        * tests/NodeManager-NodeApplicationManager/test.cpp:
        * tests/Parsing/domain.cpp:
        * tests/Parsing/test.cpp:
        * tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp:
        * tools/Artifact_Installation/Artifact_Installation_Impl.h:
        * tools/Artifact_Installation/Artifact_Installation_Impl.cpp:
        * tools/Artifact_Installation/Artifact_Installation_exec.cpp:
        * tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl:
        * tools/Artifact_Installation/File_Installation_Handler.cpp:
        * tools/Artifact_Installation/Http_Installation_Handler.cpp:
        * tools/Artifact_Installation/Installation_Repository_Manager.cpp:
        * tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp:
        * tools/Config_Handlers/ADD_Handler.cpp:
        * tools/Config_Handlers/Any_Handler.cpp:
        * tools/Config_Handlers/CCD_Handler.cpp:
        * tools/Config_Handlers/CEPE_Handler.cpp:
        * tools/Config_Handlers/CPD_Handler.cpp:
        * tools/Config_Handlers/CRDD_Handler.cpp:
        * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp:
        * tools/Config_Handlers/DD_Handler.cpp:
        * tools/Config_Handlers/DP_Handler.cpp:
        * tools/Config_Handlers/DP_PCD_Handler.cpp:
        * tools/Config_Handlers/DataType_Handler.h:
        * tools/Config_Handlers/DataType_Handler.cpp:
        * tools/Config_Handlers/DnC_Dump.h:
        * tools/Config_Handlers/DnC_Dump.cpp:
        * tools/Config_Handlers/DnC_Dump_T.cpp:
        * tools/Config_Handlers/Dump_Obj.h:
        * tools/Config_Handlers/Dump_Obj.cpp:
        * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp:
        * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp:
        * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp:
        * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp:
        * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp:
        * tools/Config_Handlers/ERE_Handler.cpp:
        * tools/Config_Handlers/ESD_Handler.cpp:
        * tools/Config_Handlers/IDD_Handler.cpp:
        * tools/Config_Handlers/IDREF_Base.cpp:
        * tools/Config_Handlers/ID_Handler.cpp:
        * tools/Config_Handlers/IRDD_Handler.cpp:
        * tools/Config_Handlers/MDD_Handler.cpp:
        * tools/Config_Handlers/PCD_Handler.cpp:
        * tools/Config_Handlers/PL_Handler.cpp:
        * tools/Config_Handlers/PSPE_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/CAD_Handler.h:
        * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h:
        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h:
        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp:
        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp:
        * tools/Config_Handlers/Property_Handler.cpp:
        * tools/Config_Handlers/RDD_Handler.cpp:
        * tools/Config_Handlers/Req_Handler.cpp:
        * tools/Config_Handlers/STD_CID_Handler.h:
        * tools/Config_Handlers/STD_CID_Handler.cpp:
        * tools/Config_Handlers/STD_CPD_Handler.cpp:
        * tools/Config_Handlers/STD_PC_Intf.cpp:
        * tools/Config_Handlers/SatisfierProperty_Handler.cpp:
        * tools/Config_Handlers/XML_File_Intf.cpp:
        * tools/Convert_Plan/Convert_Plan.cpp:
        * tools/Convert_Plan/Convert_Plan_Impl.h:
        * tools/Convert_Plan/Convert_Plan_Impl.cpp:
        * tools/Split_Plan/Locality_Splitter.h:
        * tools/Split_Plan/Locality_Splitter.cpp:
        * tools/Split_Plan/Node_Splitter.h:
        * tools/Split_Plan/Node_Splitter.cpp:
        * tools/Split_Plan/Split_Plan.h:
        * tools/Split_Plan/Split_Plan.cpp:
        * tools/Split_Plan/Split_Plan_exec.cpp:
        * tools/Split_Plan/Sub_UUID_Generator.h:
        * tools/System_Health/Daemon/SHS_Daemon.cpp:
        * tools/System_Health/Daemon/SHS_Daemon_Impl.cpp:
        * tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp:
        * tools/System_Health/Interceptors/SHS_Interceptor.h:
        * tools/System_Health/Interceptors/SHS_Interceptor.cpp:
        * tools/System_Health/Interceptors/SHS_Transport.h:
        * tools/System_Health/SHS_DataModel.idl:

          Updates from the re-arrangement.

79 files changed, 118 insertions, 118 deletions

diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp
index 0c98979498f..8bc15c3e468 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp
@@ -2,7 +2,7 @@
 
 #include "Artifact_Installation_Handler_Svc.h"
 #include "Artifact_Installation_Impl.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp
index bc7e59ac407..7473ec177ee 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Artifact_Installation_Impl.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 #if !defined (__ACE_INLINE__)
 #include "Artifact_Installation_Impl.inl"
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h
index 246db133af7..5b302efa1f8 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h
@@ -16,7 +16,7 @@
 #include "ace/Service_Object.h"
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Synch.h"
-#include "DAnCE/DAnCE_ArtifactInstallationS.h"
+#include "dance/DAnCE_ArtifactInstallationS.h"
 #include "DAnCE_Artifact_Installation_export.h"
 #include "DAnCE_Artifact_Installation_Handler.h"
 #include <map>
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp b/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp
index 96e84e10efa..9f1db997d09 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp
@@ -3,9 +3,9 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
-#include "Deployment/Deployment_DeploymentPlanC.h"
-#include "Logger/Log_Macros.h"
-#include "Logger/Logger_Service.h"
+#include "dance/Deployment/Deployment_DeploymentPlanC.h"
+#include "dance/Logger/Log_Macros.h"
+#include "dance/Logger/Logger_Service.h"
 #include "Config_Handlers/XML_File_Intf.h"
 #include "tools/Convert_Plan/Convert_Plan_Impl.h"
 #include "Artifact_Installation_Impl.h"
diff --git a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl
index f23e11e6c1d..ec03afc241a 100644
--- a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl
+++ b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl
@@ -3,7 +3,7 @@
 #ifndef DANCE_ARTIFACT_INSTALLATION_HANDLER_IDL
 #define DANCE_ARTIFACT_INSTALLATION_HANDLER_IDL
 
-#include "Deployment/Deployment_PlanError.idl"
+#include "dance/Deployment/Deployment_PlanError.idl"
 
 module DAnCE
 {
diff --git a/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp b/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp
index 35b8065636e..7eb97d66379 100644
--- a/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp
+++ b/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "File_Installation_Handler.h"
 #include "Installation_Repository_Manager.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "ace/ACE.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp b/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp
index f45924b85de..d8d9cbbbf28 100644
--- a/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp
+++ b/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "Http_Installation_Handler.h"
 #include "Installation_Repository_Manager.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/INet/HTTP_URL.h"
 #include "ace/INet/HTTP_ClientRequestHandler.h"
diff --git a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp
index 885b54c9b6c..3628f8d908d 100644
--- a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp
+++ b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Installation_Repository_Manager.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp
index 394bf33c3ec..c83aa7e5770 100644
--- a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp
+++ b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Installation_Repository_Manager_Impl.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "ace/Service_Config.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/Dirent.h"
diff --git a/DAnCE/tools/Config_Handlers/ADD_Handler.cpp b/DAnCE/tools/Config_Handlers/ADD_Handler.cpp
index fe5ab795f58..2383af8c47c 100644
--- a/DAnCE/tools/Config_Handlers/ADD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/ADD_Handler.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "ADD_Handler.h"
 #include "cdp.hpp"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
 #include "ace/UUID.h"
 
diff --git a/DAnCE/tools/Config_Handlers/Any_Handler.cpp b/DAnCE/tools/Config_Handlers/Any_Handler.cpp
index 08562e4c3ef..48c0d24f5a3 100644
--- a/DAnCE/tools/Config_Handlers/Any_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Any_Handler.cpp
@@ -6,7 +6,7 @@
 #include "DataType_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "tao/AnyTypeCode/Any.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "DynAny_Handler/DynAny_Handler.h"
 
 #include "ace/Null_Mutex.h"
diff --git a/DAnCE/tools/Config_Handlers/CCD_Handler.cpp b/DAnCE/tools/Config_Handlers/CCD_Handler.cpp
index 2c3442a61f9..2566b0d12c6 100644
--- a/DAnCE/tools/Config_Handlers/CCD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/CCD_Handler.cpp
@@ -2,13 +2,13 @@
 
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "CCD_Handler.h"
 #include "ccd.hpp"
 #include "Property_Handler.h"
 #include "CPD_Handler.h"
 #include "ComponentPropertyDescription_Handler.h"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Config_Handlers/CEPE_Handler.cpp b/DAnCE/tools/Config_Handlers/CEPE_Handler.cpp
index 2605d7698d8..581a2052044 100644
--- a/DAnCE/tools/Config_Handlers/CEPE_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/CEPE_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "CEPE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_DataC.h"
+#include "dance/Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/tools/Config_Handlers/CPD_Handler.cpp b/DAnCE/tools/Config_Handlers/CPD_Handler.cpp
index 583d27dc775..1dfe76bb24f 100644
--- a/DAnCE/tools/Config_Handlers/CPD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/CPD_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "CPD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_DataC.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Config_Handlers/CRDD_Handler.cpp b/DAnCE/tools/Config_Handlers/CRDD_Handler.cpp
index 2c1773d5aec..1be516142f1 100644
--- a/DAnCE/tools/Config_Handlers/CRDD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/CRDD_Handler.cpp
@@ -3,10 +3,10 @@
 #include "CRDD_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
 
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/DAnCE/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
index 78b2ee49a83..01695933f49 100644
--- a/DAnCE/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "ComponentPropertyDescription_Handler.h"
 #include "DataType_Handler.h"
-#include "Deployment/Deployment_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_DataC.h"
+#include "dance/Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/tools/Config_Handlers/DD_Handler.cpp b/DAnCE/tools/Config_Handlers/DD_Handler.cpp
index 07f999ce7bb..22f8685f811 100644
--- a/DAnCE/tools/Config_Handlers/DD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DD_Handler.cpp
@@ -5,8 +5,8 @@
 #include "DD_Handler.h"
 #include "Any_Handler.h"
 #include "Deployment.hpp"
-#include "Deployment/Deployment_TargetDataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_TargetDataC.h"
+#include "dance/Logger/Log_Macros.h"
 
 using namespace std;
 
diff --git a/DAnCE/tools/Config_Handlers/DP_Handler.cpp b/DAnCE/tools/Config_Handlers/DP_Handler.cpp
index acd3de84046..79246d36290 100644
--- a/DAnCE/tools/Config_Handlers/DP_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DP_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DP_Handler.h"
 #include "ace/UUID.h"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 
 #include "CCD_Handler.h"
 #include "ADD_Handler.h"
@@ -220,7 +220,7 @@ namespace DAnCE
 
       // We are assuming there is a realizes for the moment
       // @@ We may want to change this at a later date by creating a sequence of
-      // @@ ComponentInterfaceDescriptions in the DeploymentPlan in ../Deployment/Deployment_Data.idl
+      // @@ ComponentInterfaceDescriptions in the DeploymentPlan in ../dance/Deployment/Deployment_Data.idl
       // @@ so we can check for length
       this->xsc_dp_->realizes(CCD_Handler::component_interface_descr(plan.realizes));
       if (!this->xsc_dp_->realizes_p())
diff --git a/DAnCE/tools/Config_Handlers/DP_PCD_Handler.cpp b/DAnCE/tools/Config_Handlers/DP_PCD_Handler.cpp
index ef112a782f0..1ee39b924b0 100644
--- a/DAnCE/tools/Config_Handlers/DP_PCD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DP_PCD_Handler.cpp
@@ -8,8 +8,8 @@
 #include "PCD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "cdp.hpp"
-#include "Deployment/Deployment_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_DataC.h"
+#include "dance/Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/tools/Config_Handlers/DataType_Handler.cpp b/DAnCE/tools/Config_Handlers/DataType_Handler.cpp
index 655af6e79d0..b0c8d449e22 100644
--- a/DAnCE/tools/Config_Handlers/DataType_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DataType_Handler.cpp
@@ -3,7 +3,7 @@
 #include "DataType_Handler.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/tools/Config_Handlers/DataType_Handler.h b/DAnCE/tools/Config_Handlers/DataType_Handler.h
index 66713e99008..f924f319ffa 100644
--- a/DAnCE/tools/Config_Handlers/DataType_Handler.h
+++ b/DAnCE/tools/Config_Handlers/DataType_Handler.h
@@ -13,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Deployment/DeploymentC.h"
+#include "dance/Deployment/DeploymentC.h"
 #include "Basic_Deployment_Data.hpp"
 
 #include "Config_Handlers_Common_Export.h"
diff --git a/DAnCE/tools/Config_Handlers/DnC_Dump.cpp b/DAnCE/tools/Config_Handlers/DnC_Dump.cpp
index 3e4d1a0043f..add026aeedd 100644
--- a/DAnCE/tools/Config_Handlers/DnC_Dump.cpp
+++ b/DAnCE/tools/Config_Handlers/DnC_Dump.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/Log_Msg.h"
 #include "tao/SystemException.h"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 #include "DnC_Dump.h"
 #include "DnC_Dump_T.h"
 #include <iostream>
diff --git a/DAnCE/tools/Config_Handlers/DnC_Dump.h b/DAnCE/tools/Config_Handlers/DnC_Dump.h
index d82dc2936c6..8a534d7f647 100644
--- a/DAnCE/tools/Config_Handlers/DnC_Dump.h
+++ b/DAnCE/tools/Config_Handlers/DnC_Dump.h
@@ -12,8 +12,8 @@
 #define DNC_DUMP_H
 #include /**/ "ace/pre.h"
 
-#include "Deployment/Deployment_Packaging_DataC.h"
-#include "Deployment/Deployment_TargetDataC.h"
+#include "dance/Deployment/Deployment_Packaging_DataC.h"
+#include "dance/Deployment/Deployment_TargetDataC.h"
 #include "Config_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/DAnCE/tools/Config_Handlers/DnC_Dump_T.cpp b/DAnCE/tools/Config_Handlers/DnC_Dump_T.cpp
index 7523febbbee..c42004720bd 100644
--- a/DAnCE/tools/Config_Handlers/DnC_Dump_T.cpp
+++ b/DAnCE/tools/Config_Handlers/DnC_Dump_T.cpp
@@ -5,7 +5,7 @@
 #include "DnC_Dump.h"
 #include "DnC_Dump_T.h"
 #include "Dump_Obj.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace Deployment
 {
diff --git a/DAnCE/tools/Config_Handlers/Dump_Obj.cpp b/DAnCE/tools/Config_Handlers/Dump_Obj.cpp
index f893f1ee927..2497bb12abd 100644
--- a/DAnCE/tools/Config_Handlers/Dump_Obj.cpp
+++ b/DAnCE/tools/Config_Handlers/Dump_Obj.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "Dump_Obj.h"
 #include "ace/Log_Msg.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace Deployment
 {
diff --git a/DAnCE/tools/Config_Handlers/Dump_Obj.h b/DAnCE/tools/Config_Handlers/Dump_Obj.h
index b2312677399..49663867862 100644
--- a/DAnCE/tools/Config_Handlers/Dump_Obj.h
+++ b/DAnCE/tools/Config_Handlers/Dump_Obj.h
@@ -12,7 +12,7 @@
 #define CIAO_DUMP_OBJ_H
 #include /**/ "ace/pre.h"
 
-#include "Deployment/DeploymentC.h"
+#include "dance/Deployment/DeploymentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
index 7ccb6b10989..48f6880b35d 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DynAlias_Handler.h"
 #include "DynAny_Handler.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "Basic_Deployment_Data.hpp"
 #include "Common.h"
 
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
index 97e7996ecc6..5c075336de0 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "DynAny_Handler.h"
 #include "DynEnum_Handler.h"
 #include "DynSequence_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
index ef203d3f057..fef1bfed9fb 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DynEnum_Handler.h"
 #include "DynAny_Handler.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "Basic_Deployment_Data.hpp"
 #include "Common.h"
 
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
index 65c19b029f9..8f5066a0df4 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DynSequence_Handler.h"
 #include "DynAny_Handler.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "Basic_Deployment_Data.hpp"
 #include "Common.h"
 
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp
index 6c8a449fd7c..85a2c65ba68 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DynStruct_Handler.h"
 #include "DynAny_Handler.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "Basic_Deployment_Data.hpp"
 #include "Common.h"
 
diff --git a/DAnCE/tools/Config_Handlers/ERE_Handler.cpp b/DAnCE/tools/Config_Handlers/ERE_Handler.cpp
index eb1ccf0b937..d92a3bade4d 100644
--- a/DAnCE/tools/Config_Handlers/ERE_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/ERE_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "ERE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_DataC.h"
+#include "dance/Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/tools/Config_Handlers/ESD_Handler.cpp b/DAnCE/tools/Config_Handlers/ESD_Handler.cpp
index becdf5d3a4c..66031020197 100644
--- a/DAnCE/tools/Config_Handlers/ESD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/ESD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "ESD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 #include "cdp.hpp"
 
 namespace DAnCE
diff --git a/DAnCE/tools/Config_Handlers/IDD_Handler.cpp b/DAnCE/tools/Config_Handlers/IDD_Handler.cpp
index 7165dbe679e..0dfb16d2bf8 100644
--- a/DAnCE/tools/Config_Handlers/IDD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/IDD_Handler.cpp
@@ -7,7 +7,7 @@
 #include "Property_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 #include "cdp.hpp"
 
 namespace DAnCE
diff --git a/DAnCE/tools/Config_Handlers/IDREF_Base.cpp b/DAnCE/tools/Config_Handlers/IDREF_Base.cpp
index a6196358881..b6ee0c61478 100644
--- a/DAnCE/tools/Config_Handlers/IDREF_Base.cpp
+++ b/DAnCE/tools/Config_Handlers/IDREF_Base.cpp
@@ -3,7 +3,7 @@
 #ifndef IDREF_BASE_CPP
 #define IDREF_BASE_CPP
 
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "IDREF_Base.h"
 #include <iostream>
 
diff --git a/DAnCE/tools/Config_Handlers/ID_Handler.cpp b/DAnCE/tools/Config_Handlers/ID_Handler.cpp
index 62da0271157..3a6f11afa07 100644
--- a/DAnCE/tools/Config_Handlers/ID_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/ID_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "ID_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_DataC.h"
+#include "dance/Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/tools/Config_Handlers/IRDD_Handler.cpp b/DAnCE/tools/Config_Handlers/IRDD_Handler.cpp
index 3aaf045919e..4ea0b03d435 100644
--- a/DAnCE/tools/Config_Handlers/IRDD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/IRDD_Handler.cpp
@@ -2,9 +2,9 @@
 
 #include "IRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 
 namespace DAnCE
diff --git a/DAnCE/tools/Config_Handlers/MDD_Handler.cpp b/DAnCE/tools/Config_Handlers/MDD_Handler.cpp
index b89014c7a5e..70421e78bb1 100644
--- a/DAnCE/tools/Config_Handlers/MDD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/MDD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "MDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 #include "ADD_Handler.h"
 #include "Property_Handler.h"
 #include "Req_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/PCD_Handler.cpp b/DAnCE/tools/Config_Handlers/PCD_Handler.cpp
index 1c6a57ee64e..ec9d57c9326 100644
--- a/DAnCE/tools/Config_Handlers/PCD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/PCD_Handler.cpp
@@ -7,8 +7,8 @@
 #include "ERE_Handler.h"
 #include "CRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_DataC.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Config_Handlers/PL_Handler.cpp b/DAnCE/tools/Config_Handlers/PL_Handler.cpp
index 610566f1903..d77769d5b17 100644
--- a/DAnCE/tools/Config_Handlers/PL_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/PL_Handler.cpp
@@ -3,8 +3,8 @@
 #include "PL_Handler.h"
 #include "IDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_DataC.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Config_Handlers/PSPE_Handler.cpp b/DAnCE/tools/Config_Handlers/PSPE_Handler.cpp
index 84dbe5a017d..2ef1763347a 100644
--- a/DAnCE/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/PSPE_Handler.cpp
@@ -3,7 +3,7 @@
 #include "PSPE_Handler.h"
 #include "IDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
index b7b235f2267..96b838d33dc 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
@@ -4,7 +4,7 @@
 #include "Package_Handlers/CAD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "cid.hpp"
-#include "Deployment/Deployment_Packaging_DataC.h"
+#include "dance/Deployment/Deployment_Packaging_DataC.h"
 #include "Req_Handler.h"
 #include "CEPE_Handler.h"
 #include "ERE_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.h b/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
index 8fb6ccbf68a..4819edeafc0 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
@@ -11,7 +11,7 @@
 #include /**/ "ace/pre.h"
 
 #include "XML_Typedefs.h"
-#include "Deployment/DeploymentC.h"
+#include "dance/Deployment/DeploymentC.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
index 544a6bb802c..4716906f8ab 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
@@ -10,7 +10,7 @@
 #include "Req_Handler.h"
 
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 #include "XML_Typedefs.h"
 #include "Utils/Exceptions.h"
 
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
index 58d6825314e..08674d8b795 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
@@ -4,7 +4,7 @@
 #include "Package_Handlers/CID_Handler.h"
 #include "Package_Handlers/Comp_Intf_Descr_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_Packaging_DataC.h"
+#include "dance/Deployment/Deployment_Packaging_DataC.h"
 #include "Deployment.hpp"
 #include "Utils/Exceptions.h"
 #include "Property_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
index af8e3402c21..80354a30742 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
@@ -9,7 +9,7 @@
 #include "Deployment.hpp"
 #include "Package_Handlers/CPD_Handler.h"
 #include "Config_Handlers/CPD_Handler.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h b/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
index 75364a69097..286725f4de5 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
@@ -11,7 +11,7 @@
 #include /**/ "ace/pre.h"
 
 #include "XML_Typedefs.h"
-#include "Deployment/Deployment_Packaging_DataC.h"
+#include "dance/Deployment/Deployment_Packaging_DataC.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
index b004d118f31..5bcc2a0b373 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
@@ -9,7 +9,7 @@
 #include "XML_Typedefs.h"
 
 #include "Deployment.hpp"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/DAnCE/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
index ff6018e199e..8dd6bb5c489 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
@@ -10,7 +10,7 @@
 #include /**/ "ace/pre.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 #include "Utils/Functors.h"
-#include "Deployment/Deployment_Packaging_DataC.h"
+#include "dance/Deployment/Deployment_Packaging_DataC.h"
 #include "iad.hpp"
 
 namespace Deployment
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
index 145507f8bc6..c839173f31a 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "Logger/Log_Macros.h"
-#include "Deployment/Deployment_Packaging_DataC.h"
+#include "dance/Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_Packaging_DataC.h"
 #include "XML_Typedefs.h"
 #include "XML/XercesString.h"
 #include "Utils/Exceptions.h"
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
index 331ec9a0380..fb22cdd1535 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
@@ -5,7 +5,7 @@
 #include "Deployment.hpp"
 #include "STD_PCD_Handler.h"
 #include "ciao/Packaging_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/DAnCE/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
index 12eb82d6aa7..71fc44591bb 100644
--- a/DAnCE/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
@@ -2,7 +2,7 @@
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "Package_Handlers/SID_Handler.h"
 #include "cid.hpp"
-#include "Deployment/DeploymentC.h"
+#include "dance/Deployment/DeploymentC.h"
 #include "Package_Handlers/CPD_Handler.h"
 #include "Package_Handlers/PCD_Handler.h"
 #include "Package_Handlers/Comp_Intf_Descr_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/Property_Handler.cpp b/DAnCE/tools/Config_Handlers/Property_Handler.cpp
index f3a24e90b90..ef397139183 100644
--- a/DAnCE/tools/Config_Handlers/Property_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Property_Handler.cpp
@@ -3,8 +3,8 @@
 #include "Property_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_DataC.h"
+#include "dance/Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/tools/Config_Handlers/RDD_Handler.cpp b/DAnCE/tools/Config_Handlers/RDD_Handler.cpp
index c18413892bc..03a9c7165e1 100644
--- a/DAnCE/tools/Config_Handlers/RDD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/RDD_Handler.cpp
@@ -2,9 +2,9 @@
 
 #include "RDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 #include "Any_Handler.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 #include "Property_Handler.h"
 
 namespace DAnCE
diff --git a/DAnCE/tools/Config_Handlers/Req_Handler.cpp b/DAnCE/tools/Config_Handlers/Req_Handler.cpp
index db47fefb195..f6f23763b02 100644
--- a/DAnCE/tools/Config_Handlers/Req_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Req_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "Req_Handler.h"
 #include "Property_Handler.h"
-#include "Deployment/Deployment_BaseC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_BaseC.h"
+#include "dance/Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/tools/Config_Handlers/STD_CID_Handler.cpp b/DAnCE/tools/Config_Handlers/STD_CID_Handler.cpp
index 23c4c6505fd..01566e0b913 100644
--- a/DAnCE/tools/Config_Handlers/STD_CID_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/STD_CID_Handler.cpp
@@ -3,7 +3,7 @@
 #include "STD_CPD_Handler.h"
 #include "STD_IAD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
 #include "Property_Handler.h"
diff --git a/DAnCE/tools/Config_Handlers/STD_CID_Handler.h b/DAnCE/tools/Config_Handlers/STD_CID_Handler.h
index b176f5d0656..fd1c4c1db0f 100644
--- a/DAnCE/tools/Config_Handlers/STD_CID_Handler.h
+++ b/DAnCE/tools/Config_Handlers/STD_CID_Handler.h
@@ -15,7 +15,7 @@
 
 #include "IDREF_Base.h"
 #include "Config_Handlers_Export.h"
-#include "Deployment/DeploymentC.h"
+#include "dance/Deployment/DeploymentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/DAnCE/tools/Config_Handlers/STD_CPD_Handler.cpp b/DAnCE/tools/Config_Handlers/STD_CPD_Handler.cpp
index 6414b6970a1..53ed48038f3 100644
--- a/DAnCE/tools/Config_Handlers/STD_CPD_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/STD_CPD_Handler.cpp
@@ -2,7 +2,7 @@
 #include "STD_CPD_Handler.h"
 #include "STD_CID_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_DataC.h"
 #include "Deployment.hpp"
 #include "Utils/XML_Typedefs.h"
 
diff --git a/DAnCE/tools/Config_Handlers/STD_PC_Intf.cpp b/DAnCE/tools/Config_Handlers/STD_PC_Intf.cpp
index 0f8a9352066..9853bbeb2f8 100644
--- a/DAnCE/tools/Config_Handlers/STD_PC_Intf.cpp
+++ b/DAnCE/tools/Config_Handlers/STD_PC_Intf.cpp
@@ -5,7 +5,7 @@
 #include "Deployment.hpp"
 #include "STD_PCD_Handler.h"
 #include "ciao/Packaging_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/DAnCE/tools/Config_Handlers/SatisfierProperty_Handler.cpp
index 6304d0c6797..d585f8ef37b 100644
--- a/DAnCE/tools/Config_Handlers/SatisfierProperty_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/SatisfierProperty_Handler.cpp
@@ -3,10 +3,10 @@
 #include "SatisfierProperty_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "Deployment/Deployment_DataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_DataC.h"
+#include "dance/Logger/Log_Macros.h"
 #include "Utils/Exceptions.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp b/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp
index b0d2b0fc5c3..84a2b6015b4 100644
--- a/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp
@@ -7,9 +7,9 @@
 #include "DD_Handler.h"
 #include "Common.h"
 
-#include "Deployment/Deployment_DataC.h"
-#include "Deployment/Deployment_TargetDataC.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_DataC.h"
+#include "dance/Deployment/Deployment_TargetDataC.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Convert_Plan/Convert_Plan.cpp b/DAnCE/tools/Convert_Plan/Convert_Plan.cpp
index 71c377eeb0d..d4c0eaafbb8 100644
--- a/DAnCE/tools/Convert_Plan/Convert_Plan.cpp
+++ b/DAnCE/tools/Convert_Plan/Convert_Plan.cpp
@@ -4,10 +4,10 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 #include "tao/ORB.h"
-#include "Deployment/Deployment_DeploymentPlanC.h"
-#include "Deployment/Deployment_PlanErrorC.h"
-#include "Logger/Log_Macros.h"
-#include "Logger/Logger_Service.h"
+#include "dance/Deployment/Deployment_DeploymentPlanC.h"
+#include "dance/Deployment/Deployment_PlanErrorC.h"
+#include "dance/Logger/Log_Macros.h"
+#include "dance/Logger/Logger_Service.h"
 #include "Convert_Plan_Impl.h"
 
 
diff --git a/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp b/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp
index 7f6970125a1..dbe0f827b18 100644
--- a/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp
+++ b/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp
@@ -3,10 +3,10 @@
 #include "Convert_Plan_Impl.h"
 #include "ace/OS_NS_stdio.h"
 #include "tao/CDR.h"
-#include "Deployment/Deployment_PlanErrorC.h"
+#include "dance/Deployment/Deployment_PlanErrorC.h"
 #include "Config_Handlers/XML_File_Intf.h"
 #include "Config_Handlers/Common.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h b/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h
index 114450cf59c..982048210b7 100644
--- a/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h
+++ b/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h
@@ -10,7 +10,7 @@
 #define DANCE_CONVERT_PLAN_H
 
 #include "Convert_Plan/DAnCE_Convert_Plan_export.h"
-#include "Deployment/Deployment_DeploymentPlanC.h"
+#include "dance/Deployment/Deployment_DeploymentPlanC.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Split_Plan/Locality_Splitter.cpp b/DAnCE/tools/Split_Plan/Locality_Splitter.cpp
index d1a0bf82b06..70d928d39e8 100644
--- a/DAnCE/tools/Split_Plan/Locality_Splitter.cpp
+++ b/DAnCE/tools/Split_Plan/Locality_Splitter.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
 #include "Locality_Splitter.h"
-#include "Logger/Log_Macros.h"
-#include "DAnCE/DAnCE_PropertiesC.h"
-#include "DAnCE/DAnCE_Utility.h"
+#include "dance/Logger/Log_Macros.h"
+#include "dance/DAnCE_PropertiesC.h"
+#include "dance/DAnCE_Utility.h"
 #include "ace/UUID.h"
 #include <algorithm>
 
diff --git a/DAnCE/tools/Split_Plan/Locality_Splitter.h b/DAnCE/tools/Split_Plan/Locality_Splitter.h
index 1ea13c6a49d..256bf409d0c 100644
--- a/DAnCE/tools/Split_Plan/Locality_Splitter.h
+++ b/DAnCE/tools/Split_Plan/Locality_Splitter.h
@@ -10,7 +10,7 @@
 #define DANCE_LOCALITY_SPLITTER_H
 
 #include "ace/SStringfwd.h"
-#include "Deployment/Deployment_DeploymentPlanC.h"
+#include "dance/Deployment/Deployment_DeploymentPlanC.h"
 #include "Split_Plan/DAnCE_Split_Plan_export.h"
 #include <vector>
 
diff --git a/DAnCE/tools/Split_Plan/Node_Splitter.cpp b/DAnCE/tools/Split_Plan/Node_Splitter.cpp
index df24098694e..87ae7d5d7ab 100644
--- a/DAnCE/tools/Split_Plan/Node_Splitter.cpp
+++ b/DAnCE/tools/Split_Plan/Node_Splitter.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Node_Splitter.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Split_Plan/Node_Splitter.h b/DAnCE/tools/Split_Plan/Node_Splitter.h
index acd5eff764b..89311d61408 100644
--- a/DAnCE/tools/Split_Plan/Node_Splitter.h
+++ b/DAnCE/tools/Split_Plan/Node_Splitter.h
@@ -10,7 +10,7 @@
 #define DANCE_NODE_SPLITTER_H
 
 #include "ace/SStringfwd.h"
-#include "Deployment/Deployment_DeploymentPlanC.h"
+#include "dance/Deployment/Deployment_DeploymentPlanC.h"
 #include "Split_Plan/DAnCE_Split_Plan_export.h"
 
 namespace DAnCE
diff --git a/DAnCE/tools/Split_Plan/Split_Plan.cpp b/DAnCE/tools/Split_Plan/Split_Plan.cpp
index c75f03e25e9..32ed1e80f11 100644
--- a/DAnCE/tools/Split_Plan/Split_Plan.cpp
+++ b/DAnCE/tools/Split_Plan/Split_Plan.cpp
@@ -8,7 +8,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Split_Plan.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Split_Plan/Split_Plan.h b/DAnCE/tools/Split_Plan/Split_Plan.h
index 2789e31f6db..aba0f71c0a8 100644
--- a/DAnCE/tools/Split_Plan/Split_Plan.h
+++ b/DAnCE/tools/Split_Plan/Split_Plan.h
@@ -19,7 +19,7 @@
 
 #include "ace/Map_Manager.h"
 #include "ace/SStringfwd.h"
-#include "Deployment/Deployment_DeploymentPlanC.h"
+#include "dance/Deployment/Deployment_DeploymentPlanC.h"
 #include "Split_Plan/DAnCE_Split_Plan_export.h"
 #include "Sub_UUID_Generator.h"
 
diff --git a/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp b/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp
index 8a316f7e8f3..ce40e3a21f8 100644
--- a/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp
+++ b/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp
@@ -4,9 +4,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 //#include "tao/ORB.h"
-#include "Deployment/Deployment_DeploymentPlanC.h"
-#include "Logger/Log_Macros.h"
-#include "Logger/Logger_Service.h"
+#include "dance/Deployment/Deployment_DeploymentPlanC.h"
+#include "dance/Logger/Log_Macros.h"
+#include "dance/Logger/Logger_Service.h"
 #include "Config_Handlers/XML_File_Intf.h"
 #include "tools/Convert_Plan/Convert_Plan_Impl.h"
 #include "Split_Plan.h"
diff --git a/DAnCE/tools/Split_Plan/Sub_UUID_Generator.h b/DAnCE/tools/Split_Plan/Sub_UUID_Generator.h
index 3bd9b9be4ff..7e2b319e321 100644
--- a/DAnCE/tools/Split_Plan/Sub_UUID_Generator.h
+++ b/DAnCE/tools/Split_Plan/Sub_UUID_Generator.h
@@ -9,7 +9,7 @@
 #ifndef DANCE_SUB_UUID_GENERATOR_H
 #define DANCE_SUB_UUID_GENERATOR_H
 
-#include "Deployment/Deployment_DeploymentPlanC.h"
+#include "dance/Deployment/Deployment_DeploymentPlanC.h"
 #include "Split_Plan/DAnCE_Split_Plan_export.h"
 
 namespace DAnCE
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp
index ab3e8f3e243..4b7285d274b 100644
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp
+++ b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp
@@ -5,9 +5,9 @@
 #include "tao/Utils/ORB_Destroyer.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/CosNamingC.h"
-#include "Logger/Log_Macros.h"
-#include "Logger/Logger_Service.h"
-#include "DAnCE/DAnCE_Utility.h"
+#include "dance/Logger/Log_Macros.h"
+#include "dance/Logger/Logger_Service.h"
+#include "dance/DAnCE_Utility.h"
 
 #include "SHS_Daemon_Impl.h"
 
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp
index a6f5bb02cae..8a72c64ad63 100644
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp
+++ b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp
@@ -6,7 +6,7 @@
 
 #include "SHS_Daemon_Impl.h"
 
-#include "Logger/Log_Macros.h"
+#include "dance/Logger/Log_Macros.h"
 
 #include <sstream>
 
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
index 3109a4d098a..85805f88c8d 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
@@ -2,9 +2,9 @@
 
 #include "SHS_CORBA_Transport.h"
 #include "orbsvcs/CosNamingC.h"
-#include "DAnCE/DAnCE_PropertiesC.h"
-#include "Logger/Log_Macros.h"
-#include "LocalityManager/Scheduler/Plugin_Manager.h"
+#include "dance/DAnCE_PropertiesC.h"
+#include "dance/Logger/Log_Macros.h"
+#include "dance/LocalityManager/Scheduler/Plugin_Manager.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
index 13b265453ec..714baeae1f0 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
 #include "SHS_Interceptor.h"
-#include "Deployment/Deployment_StartErrorC.h"
-#include "DAnCE/DAnCE_PropertiesC.h"
-#include "DAnCE/DAnCE_Utility.h"
-#include "Logger/Log_Macros.h"
+#include "dance/Deployment/Deployment_StartErrorC.h"
+#include "dance/DAnCE_PropertiesC.h"
+#include "dance/DAnCE_Utility.h"
+#include "dance/Logger/Log_Macros.h"
 #include "System_Health/SHS_DataModelC.h"
 #include "System_Health/Interceptors/SHS_CORBA_Transport.h"
 
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h
index abfc872b4c1..64331e88f9f 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h
@@ -9,7 +9,7 @@
 #ifndef DEPLOYMENT_INTERCEPTORS_H
 #define DEPLOYMENT_INTERCEPTORS_H
 
-#include "DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h"
+#include "dance/DAnCE_DeploymentInterceptors_Base_Impl.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h b/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h
index 6d17e3ad83c..55e43dc0058 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h
@@ -11,7 +11,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Deployment/Deployment_DeploymentPlanC.h"
+#include "dance/Deployment/Deployment_DeploymentPlanC.h"
 #include "System_Health/SHS_DataModelC.h"
 
 namespace DAnCE
diff --git a/DAnCE/tools/System_Health/SHS_DataModel.idl b/DAnCE/tools/System_Health/SHS_DataModel.idl
index 5f40243269b..64b0815bff0 100644
--- a/DAnCE/tools/System_Health/SHS_DataModel.idl
+++ b/DAnCE/tools/System_Health/SHS_DataModel.idl
@@ -2,7 +2,7 @@
 #ifndef SHS_DataModel_IDL
 #define SHS_DataModel_IDL
 
-#include "Deployment/Deployment_Base.idl"
+#include "dance/Deployment/Deployment_Base.idl"
 
 module DAnCE
 {