ported to latest ciao/dance

174 files changed, 1971 insertions, 5208 deletions

diff --git a/Allocator/Base/Allocator_Base.mpc b/Allocator/Base/Allocator_Base.mpc
index 8a8d34b1099..c7f9b61e6fb 100644
--- a/Allocator/Base/Allocator_Base.mpc
+++ b/Allocator/Base/Allocator_Base.mpc
@@ -1,27 +1,61 @@
-project(Allocator_Base_idl_gen) : taoidldefaults, anytypecode, race_idl {
-  avoids += ace_for_tao
+// $Id$
+// This file is generated with "generate_component_mpc.pl -b race_common, dance_deployment_stub Allocator_Base"
+
+project(Allocator_Base_idl_gen) : componentidldefaults , race_idl  {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=ALLOCATOR_BASE_STUB_Export \
               -Wb,stub_export_include=Allocator_Base_stub_export.h \
               -Wb,skel_export_macro=ALLOCATOR_BASE_SVNT_Export \
-              -Wb,skel_export_include=Allocator_Base_svnt_export.h
+              -Wb,skel_export_include=Allocator_Base_svnt_export.h \
+              -Wb,exec_export_macro=ALLOCATOR_BASE_EXEC_Export \
+              -Wb,exec_export_include=Allocator_Base_exec_export.h
 
   IDL_Files {
     Allocator_Base.idl
   }
 }
 
-project(Allocator_Base_stub) : ccm_stub, race_common {
-  avoids += ace_for_tao
-  after += Allocator_Base_idl_gen \
-           OpString_stub \
-           RACE_common_stub \
-           TM_Proxy_stub 
+project(Allocator_Base_lem_gen) : ciaoidldefaults , race_idl  {
+  after += Allocator_Base_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=ALLOCATOR_BASE_LEM_STUB_Export \
+              -Wb,stub_export_include=Allocator_Base_lem_stub_export.h \
+              -SS -Gxhst
 
-  libs  += OpString_stub \
-           RACE_common_stub \
-           TM_Proxy_Component_stub 
+  IDL_Files {
+    Allocator_BaseE.idl
+  }
+}
 
+project(Allocator_Base_lem_stub) : ccm_svnt , race_common, dance_deployment_stub, tm_proxy_stub, race_opstring  {
+  after += Allocator_Base_lem_gen Allocator_Base_stub 
+  libs  +=  Allocator_Base_stub
+  
+  
+  sharedname = Allocator_Base_lem_stub
+  dynamicflags   = ALLOCATOR_BASE_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Allocator_BaseEC.cpp
+  }
+
+  Header_Files {
+    Allocator_BaseEC.h
+    Allocator_Base_lem_stub_export.h
+  }
+
+  Inline_Files {
+    Allocator_BaseEC.inl
+  }
+}
+
+project(Allocator_Base_stub) : ccm_stub, race_common, dance_deployment_stub, tm_proxy_stub, race_opstring   {
+  after += Allocator_Base_idl_gen 
+  libs  += 
+  
   
   sharedname = Allocator_Base_stub
   dynamicflags   = ALLOCATOR_BASE_STUB_BUILD_DLL
@@ -43,31 +77,28 @@ project(Allocator_Base_stub) : ccm_stub, race_common {
   }
 }
 
-project(Allocator_Base_svnt) : ciao_servant, race_common {
-  avoids += ace_for_tao
-  after      +=  Allocator_Base_exec
-  sharedname  = Allocator_Base_svnt
-  libs       += Allocator_Base_stub \
-                OpString_stub \
-                RACE_common_stub \
-                TM_Proxy_Component_stub
+project(Allocator_Base_skel) : ciao_servant, race_common,  dance_deployment_stub, tm_proxy_stub, race_opstring   {
+  after      +=   Allocator_Base_lem_stub
+  sharedname  = Allocator_Base_skel
+  libs       += Allocator_Base_stub Allocator_Base_lem_stub  
+  
   
   dynamicflags = ALLOCATOR_BASE_SVNT_BUILD_DLL
   
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
   Source_Files {
     Allocator_BaseS.cpp
+    Allocator_Base_svnt.cpp
   }
-  
+
   Header_Files {
     Allocator_BaseS.h
+    Allocator_Base_svnt.h
+    Allocator_Base_svnt_export.h
   }
-  
+
   Inline_Files {
     Allocator_BaseS.inl
   }
diff --git a/Allocator/Base/Allocator_Base_exec_export.h b/Allocator/Base/Allocator_Base_exec_export.h
deleted file mode 100644
index eae10ae1ab2..00000000000
--- a/Allocator/Base/Allocator_Base_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ALLOCATOR_BASE_EXEC
-// ------------------------------
-#ifndef ALLOCATOR_BASE_EXEC_EXPORT_H
-#define ALLOCATOR_BASE_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ALLOCATOR_BASE_EXEC_HAS_DLL)
-#  define ALLOCATOR_BASE_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ALLOCATOR_BASE_EXEC_HAS_DLL */
-
-#if !defined (ALLOCATOR_BASE_EXEC_HAS_DLL)
-#  define ALLOCATOR_BASE_EXEC_HAS_DLL 1
-#endif /* ! ALLOCATOR_BASE_EXEC_HAS_DLL */
-
-#if defined (ALLOCATOR_BASE_EXEC_HAS_DLL) && (ALLOCATOR_BASE_EXEC_HAS_DLL == 1)
-#  if defined (ALLOCATOR_BASE_EXEC_BUILD_DLL)
-#    define ALLOCATOR_BASE_EXEC_Export ACE_Proper_Export_Flag
-#    define ALLOCATOR_BASE_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ALLOCATOR_BASE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ALLOCATOR_BASE_EXEC_BUILD_DLL */
-#    define ALLOCATOR_BASE_EXEC_Export ACE_Proper_Import_Flag
-#    define ALLOCATOR_BASE_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ALLOCATOR_BASE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ALLOCATOR_BASE_EXEC_BUILD_DLL */
-#else /* ALLOCATOR_BASE_EXEC_HAS_DLL == 1 */
-#  define ALLOCATOR_BASE_EXEC_Export
-#  define ALLOCATOR_BASE_EXEC_SINGLETON_DECLARATION(T)
-#  define ALLOCATOR_BASE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ALLOCATOR_BASE_EXEC_HAS_DLL == 1 */
-
-// Set ALLOCATOR_BASE_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ALLOCATOR_BASE_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ALLOCATOR_BASE_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ALLOCATOR_BASE_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ALLOCATOR_BASE_EXEC_NTRACE */
-
-#if (ALLOCATOR_BASE_EXEC_NTRACE == 1)
-#  define ALLOCATOR_BASE_EXEC_TRACE(X)
-#else /* (ALLOCATOR_BASE_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ALLOCATOR_BASE_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ALLOCATOR_BASE_EXEC_NTRACE == 1) */
-
-#endif /* ALLOCATOR_BASE_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Allocator/Base/Allocator_Base_stub_export.h b/Allocator/Base/Allocator_Base_stub_export.h
deleted file mode 100644
index 93c3cc87e39..00000000000
--- a/Allocator/Base/Allocator_Base_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ALLOCATOR_BASE_STUB
-// ------------------------------
-#ifndef ALLOCATOR_BASE_STUB_EXPORT_H
-#define ALLOCATOR_BASE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ALLOCATOR_BASE_STUB_HAS_DLL)
-#  define ALLOCATOR_BASE_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ALLOCATOR_BASE_STUB_HAS_DLL */
-
-#if !defined (ALLOCATOR_BASE_STUB_HAS_DLL)
-#  define ALLOCATOR_BASE_STUB_HAS_DLL 1
-#endif /* ! ALLOCATOR_BASE_STUB_HAS_DLL */
-
-#if defined (ALLOCATOR_BASE_STUB_HAS_DLL) && (ALLOCATOR_BASE_STUB_HAS_DLL == 1)
-#  if defined (ALLOCATOR_BASE_STUB_BUILD_DLL)
-#    define ALLOCATOR_BASE_STUB_Export ACE_Proper_Export_Flag
-#    define ALLOCATOR_BASE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ALLOCATOR_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ALLOCATOR_BASE_STUB_BUILD_DLL */
-#    define ALLOCATOR_BASE_STUB_Export ACE_Proper_Import_Flag
-#    define ALLOCATOR_BASE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ALLOCATOR_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ALLOCATOR_BASE_STUB_BUILD_DLL */
-#else /* ALLOCATOR_BASE_STUB_HAS_DLL == 1 */
-#  define ALLOCATOR_BASE_STUB_Export
-#  define ALLOCATOR_BASE_STUB_SINGLETON_DECLARATION(T)
-#  define ALLOCATOR_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ALLOCATOR_BASE_STUB_HAS_DLL == 1 */
-
-// Set ALLOCATOR_BASE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ALLOCATOR_BASE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ALLOCATOR_BASE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ALLOCATOR_BASE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ALLOCATOR_BASE_STUB_NTRACE */
-
-#if (ALLOCATOR_BASE_STUB_NTRACE == 1)
-#  define ALLOCATOR_BASE_STUB_TRACE(X)
-#else /* (ALLOCATOR_BASE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ALLOCATOR_BASE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ALLOCATOR_BASE_STUB_NTRACE == 1) */
-
-#endif /* ALLOCATOR_BASE_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Allocator/Base/Allocator_Base_svnt_export.h b/Allocator/Base/Allocator_Base_svnt_export.h
deleted file mode 100644
index 6f082431f32..00000000000
--- a/Allocator/Base/Allocator_Base_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ALLOCATOR_BASE_SVNT
-// ------------------------------
-#ifndef ALLOCATOR_BASE_SVNT_EXPORT_H
-#define ALLOCATOR_BASE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ALLOCATOR_BASE_SVNT_HAS_DLL)
-#  define ALLOCATOR_BASE_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ALLOCATOR_BASE_SVNT_HAS_DLL */
-
-#if !defined (ALLOCATOR_BASE_SVNT_HAS_DLL)
-#  define ALLOCATOR_BASE_SVNT_HAS_DLL 1
-#endif /* ! ALLOCATOR_BASE_SVNT_HAS_DLL */
-
-#if defined (ALLOCATOR_BASE_SVNT_HAS_DLL) && (ALLOCATOR_BASE_SVNT_HAS_DLL == 1)
-#  if defined (ALLOCATOR_BASE_SVNT_BUILD_DLL)
-#    define ALLOCATOR_BASE_SVNT_Export ACE_Proper_Export_Flag
-#    define ALLOCATOR_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ALLOCATOR_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ALLOCATOR_BASE_SVNT_BUILD_DLL */
-#    define ALLOCATOR_BASE_SVNT_Export ACE_Proper_Import_Flag
-#    define ALLOCATOR_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ALLOCATOR_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ALLOCATOR_BASE_SVNT_BUILD_DLL */
-#else /* ALLOCATOR_BASE_SVNT_HAS_DLL == 1 */
-#  define ALLOCATOR_BASE_SVNT_Export
-#  define ALLOCATOR_BASE_SVNT_SINGLETON_DECLARATION(T)
-#  define ALLOCATOR_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ALLOCATOR_BASE_SVNT_HAS_DLL == 1 */
-
-// Set ALLOCATOR_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ALLOCATOR_BASE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ALLOCATOR_BASE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ALLOCATOR_BASE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ALLOCATOR_BASE_SVNT_NTRACE */
-
-#if (ALLOCATOR_BASE_SVNT_NTRACE == 1)
-#  define ALLOCATOR_BASE_SVNT_TRACE(X)
-#else /* (ALLOCATOR_BASE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ALLOCATOR_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ALLOCATOR_BASE_SVNT_NTRACE == 1) */
-
-#endif /* ALLOCATOR_BASE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Allocator/FirstFit/FirstFit.cidl b/Allocator/FirstFit/FirstFit.cidl
deleted file mode 100644
index 687dbc5f032..00000000000
--- a/Allocator/FirstFit/FirstFit.cidl
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-#ifndef RACE_FIRST_FIT_ALLOCATOR_CIDL
-#define RACE_FIRST_FIT_ALLOCATOR_CIDL
-
-/*
- * @file EUCON_Controller.cidl
- *
- * @brief This file contains the EUCON Controller component implementation
- * defination.
- */
-
-#include "FirstFit.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    module Allocator
-    {
-      composition session First_Fit_Allocator_Impl
-      {
-        home executor First_Fit_Allocator_Home_Exec
-        {
-          implements First_Fit_Allocator_Home;
-          manages    First_Fit_Allocator_Exec;
-        };
-      };
-    };
-  };
-};
-
-
-#endif /* RACE_FIRST_FIT_ALLOCATOR_CIDL */
diff --git a/Allocator/FirstFit/FirstFit.idl b/Allocator/FirstFit/FirstFit.idl
index 14b9e52e579..cf0f48ce32c 100644
--- a/Allocator/FirstFit/FirstFit.idl
+++ b/Allocator/FirstFit/FirstFit.idl
@@ -13,6 +13,7 @@
 
 #include <Components.idl>
 #include "Allocator/Base/Allocator_Base.idl"
+#include "Allocator/Base/Allocator_BaseE.idl"
 
 
 module CIAO
diff --git a/Allocator/FirstFit/FirstFit.mpc b/Allocator/FirstFit/FirstFit.mpc
index c872f17f3de..9130320da2d 100644
--- a/Allocator/FirstFit/FirstFit.mpc
+++ b/Allocator/FirstFit/FirstFit.mpc
@@ -1,41 +1,65 @@
-project(FirstFit_idl_gen) : taoidldefaults, anytypecode, race_idl {
-  avoids += ace_for_tao
+// $Id$
+// This file is generated with "generate_component_mpc.pl -b race_common -p Allocator_Base FirstFit"
+
+project(Allocator_Base_FirstFit_idl_gen) : componentidldefaults , race_idl  {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=FIRSTFIT_STUB_Export \
               -Wb,stub_export_include=FirstFit_stub_export.h \
               -Wb,skel_export_macro=FIRSTFIT_SVNT_Export \
-              -Wb,skel_export_include=FirstFit_svnt_export.h
+              -Wb,skel_export_include=FirstFit_svnt_export.h \
+              -Wb,exec_export_macro=FIRSTFIT_EXEC_Export \
+              -Wb,exec_export_include=FirstFit_exec_export.h 
+             
+
+  idlflags -= -Gsv
 
   IDL_Files {
     FirstFit.idl
   }
 }
 
-project(FirstFit_cidl_gen) : ciaocidldefaults, taoidldefaults, race_idl {
-  avoids += ace_for_tao
+project(Allocator_Base_FirstFit_lem_gen) : ciaoidldefaults , race_idl  {
+  after += Allocator_Base_FirstFit_idl_gen
   custom_only = 1
-  cidlflags += --svnt-export-macro FIRSTFIT_SVNT_Export \
-               --svnt-export-include FirstFit_svnt_export.h
+  idlflags += -Wb,stub_export_macro=FIRSTFIT_LEM_STUB_Export \
+              -Wb,stub_export_include=FirstFit_lem_stub_export.h \
+              -SS -Gxhst
 
-	
-  idlflags += -Wb,export_macro=FIRSTFIT_EXEC_Export \
-              -Wb,export_include=FirstFit_exec_export.h \
-              -SS
-              
-  CIDL_Files {
-    FirstFit.cidl
-  }
-  
   IDL_Files {
     FirstFitE.idl
   }
 }
 
-project(FirstFit_stub) : ccm_stub, race_common {
-  avoids += ace_for_tao
-  after += FirstFit_idl_gen 
-  libs  += Allocator_Base_stub  
+project(Allocator_Base_FirstFit_lem_stub) : ccm_svnt , race_common, race_allocator_lem  {
+  after += Allocator_Base_FirstFit_lem_gen Allocator_Base_FirstFit_stub Allocator_Base_stub
+  libs  += Allocator_Base_stub FirstFit_stub
+  
+  
+  sharedname = FirstFit_lem_stub
+  dynamicflags   = FIRSTFIT_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    FirstFitEC.cpp
+  }
+
+  Header_Files {
+    FirstFitEC.h
+    FirstFit_lem_stub_export.h
+  }
+
+  Inline_Files {
+    FirstFitEC.inl
+  }
+}
 
+project(Allocator_Base_FirstFit_stub) : ccm_stub , race_common, race_allocator_stub  {
+  after += Allocator_Base_FirstFit_idl_gen Allocator_Base_stub
+  libs  += Allocator_Base_stub
+  
+  
   sharedname = FirstFit_stub
   dynamicflags   = FIRSTFIT_STUB_BUILD_DLL
 
@@ -56,16 +80,11 @@ project(FirstFit_stub) : ccm_stub, race_common {
   }
 }
 
-project(FirstFit_exec) : ciao_executor, ciao_config_handlers, race_common {
-  avoids += ace_for_tao
-  after   += FirstFit_cidl_gen FirstFit_stub
+project(Allocator_Base_FirstFit_exec) : ciao_executor , race_common, race_allocator_lem, ciao_config_handlers  {
+  after   += Allocator_Base_FirstFit_lem_stub Allocator_Base_FirstFit_stub
   sharedname = FirstFit_exec
-  libs += FirstFit_stub \
-          Allocator_Base_stub \
-          RACE_utils \
-          OpString_stub \
-          RACE_common_stub \
-          TM_Proxy_Component_stub 
+  libs += FirstFit_stub FirstFit_lem_stub Allocator_Base_stub
+  
   
   dynamicflags   = FIRSTFIT_EXEC_BUILD_DLL
 
@@ -73,40 +92,30 @@ project(FirstFit_exec) : ciao_executor, ciao_config_handlers, race_common {
   }
 
   Source_Files {
-    FirstFitEC.cpp
     FirstFit_exec.cpp
+    Single_D_BP.cpp
   }
-  
+
   Header_Files {
-    FirstFitEC.h
     FirstFit_exec.h
     FirstFit_exec_export.h
   }
-  
+
   Inline_Files {
-    FirstFitEC.inl
   }
 }
 
 
-project(FirstFit_svnt) : ciao_servant, race_common {
-  avoids += ace_for_tao
-  after      +=  FirstFit_exec
+project(Allocator_Base_FirstFit_svnt) : ciao_servant , race_common, race_allocator_skel  {
+  after      += Allocator_Base_skel  Allocator_Base_FirstFit_lem_stub
   sharedname  = FirstFit_svnt
-  libs       += FirstFit_exec \
-                FirstFit_stub \
-                Allocator_Base_svnt \
-                Allocator_Base_stub \
-                OpString_stub \
-                RACE_common_stub \
-                TM_Proxy_Component_stub 
-
+  libs       += FirstFit_stub FirstFit_lem_stub  \
+                Allocator_Base_skel \
+                Allocator_Base_stub
+  
   
   dynamicflags = FIRSTFIT_SVNT_BUILD_DLL
   
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
@@ -114,13 +123,13 @@ project(FirstFit_svnt) : ciao_servant, race_common {
     FirstFitS.cpp
     FirstFit_svnt.cpp
   }
-  
+
   Header_Files {
     FirstFitS.h
     FirstFit_svnt.h
     FirstFit_svnt_export.h
   }
-  
+
   Inline_Files {
     FirstFitS.inl
   }
diff --git a/Allocator/FirstFit/FirstFitE.idl b/Allocator/FirstFit/FirstFitE.idl
index 9c1dbaf1afb..d1c8e35b299 100644
--- a/Allocator/FirstFit/FirstFitE.idl
+++ b/Allocator/FirstFit/FirstFitE.idl
@@ -1,97 +1,101 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
+// -*- C++ -*-
 //
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
+// $Id$
+
+/**
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.2
+ * TAO and the TAO IDL Compiler have been developed by:
+ *       Center for Distributed Object Computing
+ *       Washington University
+ *       St. Louis, MO
+ *       USA
+ *       http://www.cs.wustl.edu/~schmidt/doc-center.html
+ * and
+ *       Distributed Object Computing Laboratory
+ *       University of California at Irvine
+ *       Irvine, CA
+ *       USA
+ *       http://doc.ece.uci.edu/
+ * and
+ *       Institute for Software Integrated Systems
+ *       Vanderbilt University
+ *       Nashville, TN
+ *       USA
+ *       http://www.isis.vanderbilt.edu/
+ *
+ * Information about TAO is available at:
+ *     http://www.cs.wustl.edu/~schmidt/TAO.html
+ **/
 
-#include "ciao/CCM_Container.idl"
+#ifndef _CIAO_FIRSTFITE_IDL_
+#define _CIAO_FIRSTFITE_IDL_
+
+#include "ccm/CCM_Container.idl"
 #include "FirstFit.idl"
+
 module CIAO
 {
   module RACE
   {
     module Allocator
     {
-      local interface CCM_Allocation : Allocation
-      {
-      };
-
-      local interface CCM_Allocator_Base : ::Components::EnterpriseComponent
+      local interface CCM_First_Fit_Allocator
+        : ::CIAO::RACE::Allocator::CCM_Allocator_Base
       {
-        ::CIAO::RACE::Allocator::CCM_Allocation get_allocation ();
       };
-
-      local interface CCM_Allocator_Base_Context : ::Components::SessionContext
+      
+      local interface CCM_First_Fit_Allocator_Context
+        : ::CIAO::RACE::Allocator::CCM_Allocator_Base_Context
       {
-        ::CIAO::RACE::TM_Proxy::SystemSnapshot get_connection_system_monitor ();
-        ::CIAO::RACE::TM_Proxy::Utility get_connection_system_utils ();
       };
     };
   };
 };
 
+module CIAO_CIAO_RACE_Allocator_First_Fit_Allocator_Impl
+{
+  typedef ::CIAO::RACE::Allocator::CCM_First_Fit_Allocator_Context First_Fit_Allocator_Exec_Context;
+  
+  local interface First_Fit_Allocator_Exec
+    : ::CIAO::RACE::Allocator::CCM_First_Fit_Allocator,
+      ::Components::SessionComponent
+  {
+  };
+};
+
 module CIAO
 {
   module RACE
   {
     module Allocator
     {
-      local interface CCM_First_Fit_Allocator : ::CIAO::RACE::Allocator::CCM_Allocator_Base
-      {
-      };
-
-      local interface CCM_First_Fit_Allocator_Context : ::CIAO::RACE::Allocator::CCM_Allocator_Base_Context
-      {
-      };
-
       local interface CCM_First_Fit_Allocator_HomeImplicit
       {
-        ::Components::EnterpriseComponent create () raises (::Components::CCMException);
+        ::Components::EnterpriseComponent create ()
+          raises ( ::Components::CCMException);
       };
-
-      local interface CCM_First_Fit_Allocator_HomeExplicit : ::Components::HomeExecutorBase
+      
+      local interface CCM_First_Fit_Allocator_HomeExplicit
+        : ::Components::HomeExecutorBase
       {
       };
-
-      local interface CCM_First_Fit_Allocator_Home : CCM_First_Fit_Allocator_HomeExplicit, CCM_First_Fit_Allocator_HomeImplicit
+      
+      local interface CCM_First_Fit_Allocator_Home
+        : CCM_First_Fit_Allocator_HomeExplicit,
+          CCM_First_Fit_Allocator_HomeImplicit
       {
       };
     };
   };
 };
 
-module CIAO
+module CIAO_CIAO_RACE_Allocator_First_Fit_Allocator_Impl
 {
-  module RACE
+  local interface First_Fit_Allocator_Home_Exec
+    : ::CIAO::RACE::Allocator::CCM_First_Fit_Allocator_Home
   {
-    module Allocator
-    {
-      module CIDL_First_Fit_Allocator_Impl
-      {
-        typedef ::CIAO::RACE::Allocator::CCM_First_Fit_Allocator_Context First_Fit_Allocator_Exec_Context;
-        local interface First_Fit_Allocator_Exec : ::CIAO::RACE::Allocator::CCM_First_Fit_Allocator, ::Components::SessionComponent
-        {
-        };
-
-        local interface First_Fit_Allocator_Home_Exec : ::CIAO::RACE::Allocator::CCM_First_Fit_Allocator_Home
-        {
-        };
-      };
-    };
   };
 };
 
+#endif /* ifndef */
+
diff --git a/Allocator/FirstFit/FirstFit_exec.h b/Allocator/FirstFit/FirstFit_exec.h
index e91bd40b395..39a20339b30 100644
--- a/Allocator/FirstFit/FirstFit_exec.h
+++ b/Allocator/FirstFit/FirstFit_exec.h
@@ -84,7 +84,7 @@ namespace CIAO
         };
 
         class FIRSTFIT_EXEC_Export First_Fit_Allocator_exec_i
-          : public virtual First_Fit_Allocator_Exec,
+          : public virtual CIAO_CIAO_RACE_Allocator_First_Fit_Allocator_Impl::First_Fit_Allocator_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
@@ -121,7 +121,7 @@ namespace CIAO
         };
 
         class FIRSTFIT_EXEC_Export First_Fit_Allocator_Home_exec_i
-          : public virtual First_Fit_Allocator_Home_Exec,
+          : public virtual CIAO_CIAO_RACE_Allocator_First_Fit_Allocator_Impl::First_Fit_Allocator_Home_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
diff --git a/Allocator/FirstFit/FirstFit_exec_export.h b/Allocator/FirstFit/FirstFit_exec_export.h
deleted file mode 100644
index 9f42c715b8d..00000000000
--- a/Allocator/FirstFit/FirstFit_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl FIRSTFIT_EXEC
-// ------------------------------
-#ifndef FIRSTFIT_EXEC_EXPORT_H
-#define FIRSTFIT_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (FIRSTFIT_EXEC_HAS_DLL)
-#  define FIRSTFIT_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && FIRSTFIT_EXEC_HAS_DLL */
-
-#if !defined (FIRSTFIT_EXEC_HAS_DLL)
-#  define FIRSTFIT_EXEC_HAS_DLL 1
-#endif /* ! FIRSTFIT_EXEC_HAS_DLL */
-
-#if defined (FIRSTFIT_EXEC_HAS_DLL) && (FIRSTFIT_EXEC_HAS_DLL == 1)
-#  if defined (FIRSTFIT_EXEC_BUILD_DLL)
-#    define FIRSTFIT_EXEC_Export ACE_Proper_Export_Flag
-#    define FIRSTFIT_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define FIRSTFIT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* FIRSTFIT_EXEC_BUILD_DLL */
-#    define FIRSTFIT_EXEC_Export ACE_Proper_Import_Flag
-#    define FIRSTFIT_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define FIRSTFIT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* FIRSTFIT_EXEC_BUILD_DLL */
-#else /* FIRSTFIT_EXEC_HAS_DLL == 1 */
-#  define FIRSTFIT_EXEC_Export
-#  define FIRSTFIT_EXEC_SINGLETON_DECLARATION(T)
-#  define FIRSTFIT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* FIRSTFIT_EXEC_HAS_DLL == 1 */
-
-// Set FIRSTFIT_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (FIRSTFIT_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define FIRSTFIT_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define FIRSTFIT_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !FIRSTFIT_EXEC_NTRACE */
-
-#if (FIRSTFIT_EXEC_NTRACE == 1)
-#  define FIRSTFIT_EXEC_TRACE(X)
-#else /* (FIRSTFIT_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define FIRSTFIT_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (FIRSTFIT_EXEC_NTRACE == 1) */
-
-#endif /* FIRSTFIT_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Allocator/FirstFit/FirstFit_stub_export.h b/Allocator/FirstFit/FirstFit_stub_export.h
deleted file mode 100644
index 87d16e946a8..00000000000
--- a/Allocator/FirstFit/FirstFit_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl FIRSTFIT_STUB
-// ------------------------------
-#ifndef FIRSTFIT_STUB_EXPORT_H
-#define FIRSTFIT_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (FIRSTFIT_STUB_HAS_DLL)
-#  define FIRSTFIT_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && FIRSTFIT_STUB_HAS_DLL */
-
-#if !defined (FIRSTFIT_STUB_HAS_DLL)
-#  define FIRSTFIT_STUB_HAS_DLL 1
-#endif /* ! FIRSTFIT_STUB_HAS_DLL */
-
-#if defined (FIRSTFIT_STUB_HAS_DLL) && (FIRSTFIT_STUB_HAS_DLL == 1)
-#  if defined (FIRSTFIT_STUB_BUILD_DLL)
-#    define FIRSTFIT_STUB_Export ACE_Proper_Export_Flag
-#    define FIRSTFIT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define FIRSTFIT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* FIRSTFIT_STUB_BUILD_DLL */
-#    define FIRSTFIT_STUB_Export ACE_Proper_Import_Flag
-#    define FIRSTFIT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define FIRSTFIT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* FIRSTFIT_STUB_BUILD_DLL */
-#else /* FIRSTFIT_STUB_HAS_DLL == 1 */
-#  define FIRSTFIT_STUB_Export
-#  define FIRSTFIT_STUB_SINGLETON_DECLARATION(T)
-#  define FIRSTFIT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* FIRSTFIT_STUB_HAS_DLL == 1 */
-
-// Set FIRSTFIT_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (FIRSTFIT_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define FIRSTFIT_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define FIRSTFIT_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !FIRSTFIT_STUB_NTRACE */
-
-#if (FIRSTFIT_STUB_NTRACE == 1)
-#  define FIRSTFIT_STUB_TRACE(X)
-#else /* (FIRSTFIT_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define FIRSTFIT_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (FIRSTFIT_STUB_NTRACE == 1) */
-
-#endif /* FIRSTFIT_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Allocator/FirstFit/FirstFit_svnt_export.h b/Allocator/FirstFit/FirstFit_svnt_export.h
deleted file mode 100644
index 3757769a418..00000000000
--- a/Allocator/FirstFit/FirstFit_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl FIRSTFIT_SVNT
-// ------------------------------
-#ifndef FIRSTFIT_SVNT_EXPORT_H
-#define FIRSTFIT_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (FIRSTFIT_SVNT_HAS_DLL)
-#  define FIRSTFIT_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && FIRSTFIT_SVNT_HAS_DLL */
-
-#if !defined (FIRSTFIT_SVNT_HAS_DLL)
-#  define FIRSTFIT_SVNT_HAS_DLL 1
-#endif /* ! FIRSTFIT_SVNT_HAS_DLL */
-
-#if defined (FIRSTFIT_SVNT_HAS_DLL) && (FIRSTFIT_SVNT_HAS_DLL == 1)
-#  if defined (FIRSTFIT_SVNT_BUILD_DLL)
-#    define FIRSTFIT_SVNT_Export ACE_Proper_Export_Flag
-#    define FIRSTFIT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define FIRSTFIT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* FIRSTFIT_SVNT_BUILD_DLL */
-#    define FIRSTFIT_SVNT_Export ACE_Proper_Import_Flag
-#    define FIRSTFIT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define FIRSTFIT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* FIRSTFIT_SVNT_BUILD_DLL */
-#else /* FIRSTFIT_SVNT_HAS_DLL == 1 */
-#  define FIRSTFIT_SVNT_Export
-#  define FIRSTFIT_SVNT_SINGLETON_DECLARATION(T)
-#  define FIRSTFIT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* FIRSTFIT_SVNT_HAS_DLL == 1 */
-
-// Set FIRSTFIT_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (FIRSTFIT_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define FIRSTFIT_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define FIRSTFIT_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !FIRSTFIT_SVNT_NTRACE */
-
-#if (FIRSTFIT_SVNT_NTRACE == 1)
-#  define FIRSTFIT_SVNT_TRACE(X)
-#else /* (FIRSTFIT_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define FIRSTFIT_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (FIRSTFIT_SVNT_NTRACE == 1) */
-
-#endif /* FIRSTFIT_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Conductor/Admin_exec.h b/Conductor/Admin_exec.h
index 3d0e0d8e33e..4f5ba3a1db1 100644
--- a/Conductor/Admin_exec.h
+++ b/Conductor/Admin_exec.h
@@ -4,7 +4,7 @@
 #include "ConductorEC.h"
 #include "Conductor_exec_export.h"
 #include "tao/LocalObject.h"
-#include "Logger.h"
+#include "utils/Logger.h"
 
 namespace CIAO
 {
diff --git a/Conductor/Conductor.cidl b/Conductor/Conductor.cidl
deleted file mode 100644
index 539ef2dd5d7..00000000000
--- a/Conductor/Conductor.cidl
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef RACE_CONDUCTOR_CIDL
-#define RACE_CONDUCTOR_CIDL
-#include "Conductor.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    module Conductor
-    {
-      composition session Conductor_Component_Impl
-      {
-        home executor Conductor_Component_Home_Exec
-        {
-          implements Conductor_Component_Home;
-          manages    Conductor_Component_Exec;
-        };
-      };
-    };
-  };
-};
-
-#endif /* RACE_CONDUCTOR_CIDL */
diff --git a/Conductor/Conductor.mpc b/Conductor/Conductor.mpc
index ea1f3db99c3..c1a70ecf347 100644
--- a/Conductor/Conductor.mpc
+++ b/Conductor/Conductor.mpc
@@ -1,54 +1,63 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl Conductor"
+// This file is generated with "generate_component_mpc.pl -b race_common Conductor"
 
-project(Conductor_idl_gen) : taoidldefaults, anytypecode, race_idl {
-  avoids += ace_for_tao
+project(Conductor_idl_gen) : componentidldefaults , race_idl  {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CONDUCTOR_STUB_Export \
               -Wb,stub_export_include=Conductor_stub_export.h \
               -Wb,skel_export_macro=CONDUCTOR_SVNT_Export \
-              -Wb,skel_export_include=Conductor_svnt_export.h
+              -Wb,skel_export_include=Conductor_svnt_export.h \
+              -Wb,exec_export_macro=CONDUCTOR_EXEC_Export \
+              -Wb,exec_export_include=Conductor_exec_export.h
 
   IDL_Files {
     Conductor.idl
   }
 }
 
-project(Conductor_cidl_gen) : ciaocidldefaults, taoidldefaults, race_idl {
-  avoids += ace_for_tao
+project(Conductor_lem_gen) : ciaoidldefaults , race_idl  {
+  after += Conductor_idl_gen
   custom_only = 1
-  cidlflags += --svnt-export-macro CONDUCTOR_SVNT_Export \
-               --svnt-export-include Conductor_svnt_export.h
+  idlflags += -Wb,stub_export_macro=CONDUCTOR_LEM_STUB_Export \
+              -Wb,stub_export_include=Conductor_lem_stub_export.h \
+              -SS -Gxhst
 
-  idlflags += -Wb,export_macro=CONDUCTOR_EXEC_Export \
-              -Wb,export_include=Conductor_exec_export.h \
-              -SS
-
-  CIDL_Files {
-    Conductor.cidl
+  IDL_Files {
+    ConductorE.idl
   }
+}
+
+project(Conductor_lem_stub) : ccm_svnt , race_opstring, race_controller_stub  {
+  after += Conductor_lem_gen Conductor_stub 
+  libs  +=  Conductor_stub
+  
+  
+  sharedname = Conductor_lem_stub
+  dynamicflags   = CONDUCTOR_LEM_STUB_BUILD_DLL
 
   IDL_Files {
-    ConductorE.idl
+  }
+
+  Source_Files {
+    ConductorEC.cpp
+  }
+
+  Header_Files {
+    ConductorEC.h
+    Conductor_lem_stub_export.h
+  }
+
+  Inline_Files {
+    ConductorEC.inl
   }
 }
 
-project(Conductor_stub) : ccm_stub, race_common {
-  avoids += ace_for_tao
-  after += Conductor_idl_gen \
-           OpString_stub \
-           Data_Base_stub \
-           DAnCE_Output_Adapter_stub \
-           RACE_common_stub \
-           Controller_Base_stub
-
-  libs += OpString_stub \
-          Data_Base_Component_stub\
-          DAnCE_OA_Component_stub \
-          RACE_common_stub \
-          Controller_Base_stub
-
-  sharedname = Conductor_Component_stub
+project(Conductor_stub) : ccm_stub , race_opstring, race_controller_stub, race_dance_oa_stub, race_data_base_stub  {
+  after += Conductor_idl_gen 
+  libs  += 
+  
+  
+  sharedname = Conductor_stub
   dynamicflags   = CONDUCTOR_STUB_BUILD_DLL
 
   IDL_Files {
@@ -68,61 +77,41 @@ project(Conductor_stub) : ccm_stub, race_common {
   }
 }
 
-project(Conductor_exec) : ciao_executor, ciao_config_handlers, race_common {
-  avoids += ace_for_tao
-  after   += Conductor_cidl_gen Conductor_stub RACE_utils
-  sharedname = Conductor_Component_exec
-  libs += Conductor_Component_stub \
-           RACE_utils \
-           OpString_stub \
-           Data_Base_Component_stub \
-           DAnCE_OA_Component_stub \
-           RACE_common_stub \
-           Controller_Base_stub
-
-  includes += $(RACE_ROOT)/utils
+project(Conductor_exec) : ciao_executor , race_opstring, race_utils, ciao_config_handlers, race_controller_stub, \
+   race_dance_oa_stub, race_data_base_stub  {
+  after   += Conductor_lem_stub Conductor_stub
+  sharedname = Conductor_exec
+  libs += Conductor_stub Conductor_lem_stub 
+  
+  
   dynamicflags   = CONDUCTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Admin_exec.cpp
-    ConductorEC.cpp
     Conductor_exec.cpp
+    Admin_exec.cpp
   }
 
   Header_Files {
-    Admin_exec.h
-    ConductorEC.h
     Conductor_exec.h
     Conductor_exec_export.h
   }
 
   Inline_Files {
-    ConductorEC.inl
   }
 }
 
 
-project(Conductor_svnt) : ciao_servant, race_common, dance_deployment_stub {
-  avoids += ace_for_tao
-  after += Conductor_exec
-
-  libs += OpString_stub \
-	  Data_Base_Component_stub\
-	  DAnCE_OA_Component_stub \
-	  RACE_common_stub \
-          Conductor_Component_exec \
-          Conductor_Component_stub \
-          Controller_Base_stub
-
-  sharedname  = Conductor_Component_svnt
+project(Conductor_svnt) : ciao_servant , race_opstring, race_controller_stub, race_dance_oa_stub, race_data_base_stub  {
+  after      +=   Conductor_lem_stub
+  sharedname  = Conductor_svnt
+  libs       += Conductor_stub Conductor_lem_stub  
+  
+  
   dynamicflags = CONDUCTOR_SVNT_BUILD_DLL
-
-  CIDL_Files {
-  }
-
+  
   IDL_Files {
   }
 
@@ -141,3 +130,5 @@ project(Conductor_svnt) : ciao_servant, race_common, dance_deployment_stub {
     ConductorS.inl
   }
 }
+
+
diff --git a/Conductor/Conductor_exec.h b/Conductor/Conductor_exec.h
index 3dd26755797..d73f1e430f5 100644
--- a/Conductor/Conductor_exec.h
+++ b/Conductor/Conductor_exec.h
@@ -11,7 +11,7 @@
 
 #include "Conductor_exec_export.h"
 #include "tao/LocalObject.h"
-#include "Logger.h"
+#include "utils/Logger.h"
 
 namespace CIAO
 {
@@ -22,7 +22,7 @@ namespace CIAO
       namespace CIDL_Conductor_Component_Impl
       {
         class CONDUCTOR_EXEC_Export Conductor_Component_exec_i
-          : public virtual Conductor_Component_Exec,
+          : public virtual CIAO_CIAO_RACE_Conductor_Conductor_Component_Impl::Conductor_Component_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
@@ -54,7 +54,7 @@ namespace CIAO
         };
 
         class CONDUCTOR_EXEC_Export Conductor_Component_Home_exec_i
-          : public virtual Conductor_Component_Home_Exec,
+          : public virtual CIAO_CIAO_RACE_Conductor_Conductor_Component_Impl::Conductor_Component_Home_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
diff --git a/Conductor/Conductor_exec_export.h b/Conductor/Conductor_exec_export.h
deleted file mode 100644
index 37ec9f642ce..00000000000
--- a/Conductor/Conductor_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONDUCTOR_EXEC
-// ------------------------------
-#ifndef CONDUCTOR_EXEC_EXPORT_H
-#define CONDUCTOR_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CONDUCTOR_EXEC_HAS_DLL)
-#  define CONDUCTOR_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CONDUCTOR_EXEC_HAS_DLL */
-
-#if !defined (CONDUCTOR_EXEC_HAS_DLL)
-#  define CONDUCTOR_EXEC_HAS_DLL 1
-#endif /* ! CONDUCTOR_EXEC_HAS_DLL */
-
-#if defined (CONDUCTOR_EXEC_HAS_DLL) && (CONDUCTOR_EXEC_HAS_DLL == 1)
-#  if defined (CONDUCTOR_EXEC_BUILD_DLL)
-#    define CONDUCTOR_EXEC_Export ACE_Proper_Export_Flag
-#    define CONDUCTOR_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONDUCTOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONDUCTOR_EXEC_BUILD_DLL */
-#    define CONDUCTOR_EXEC_Export ACE_Proper_Import_Flag
-#    define CONDUCTOR_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONDUCTOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONDUCTOR_EXEC_BUILD_DLL */
-#else /* CONDUCTOR_EXEC_HAS_DLL == 1 */
-#  define CONDUCTOR_EXEC_Export
-#  define CONDUCTOR_EXEC_SINGLETON_DECLARATION(T)
-#  define CONDUCTOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONDUCTOR_EXEC_HAS_DLL == 1 */
-
-// Set CONDUCTOR_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONDUCTOR_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONDUCTOR_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONDUCTOR_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONDUCTOR_EXEC_NTRACE */
-
-#if (CONDUCTOR_EXEC_NTRACE == 1)
-#  define CONDUCTOR_EXEC_TRACE(X)
-#else /* (CONDUCTOR_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONDUCTOR_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONDUCTOR_EXEC_NTRACE == 1) */
-
-#endif /* CONDUCTOR_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Conductor/Conductor_stub_export.h b/Conductor/Conductor_stub_export.h
deleted file mode 100644
index 12d9f2826e7..00000000000
--- a/Conductor/Conductor_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONDUCTOR_STUB
-// ------------------------------
-#ifndef CONDUCTOR_STUB_EXPORT_H
-#define CONDUCTOR_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CONDUCTOR_STUB_HAS_DLL)
-#  define CONDUCTOR_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CONDUCTOR_STUB_HAS_DLL */
-
-#if !defined (CONDUCTOR_STUB_HAS_DLL)
-#  define CONDUCTOR_STUB_HAS_DLL 1
-#endif /* ! CONDUCTOR_STUB_HAS_DLL */
-
-#if defined (CONDUCTOR_STUB_HAS_DLL) && (CONDUCTOR_STUB_HAS_DLL == 1)
-#  if defined (CONDUCTOR_STUB_BUILD_DLL)
-#    define CONDUCTOR_STUB_Export ACE_Proper_Export_Flag
-#    define CONDUCTOR_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONDUCTOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONDUCTOR_STUB_BUILD_DLL */
-#    define CONDUCTOR_STUB_Export ACE_Proper_Import_Flag
-#    define CONDUCTOR_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONDUCTOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONDUCTOR_STUB_BUILD_DLL */
-#else /* CONDUCTOR_STUB_HAS_DLL == 1 */
-#  define CONDUCTOR_STUB_Export
-#  define CONDUCTOR_STUB_SINGLETON_DECLARATION(T)
-#  define CONDUCTOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONDUCTOR_STUB_HAS_DLL == 1 */
-
-// Set CONDUCTOR_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONDUCTOR_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONDUCTOR_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONDUCTOR_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONDUCTOR_STUB_NTRACE */
-
-#if (CONDUCTOR_STUB_NTRACE == 1)
-#  define CONDUCTOR_STUB_TRACE(X)
-#else /* (CONDUCTOR_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONDUCTOR_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONDUCTOR_STUB_NTRACE == 1) */
-
-#endif /* CONDUCTOR_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Conductor/Conductor_svnt_export.h b/Conductor/Conductor_svnt_export.h
deleted file mode 100644
index b0b2fa4037d..00000000000
--- a/Conductor/Conductor_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONDUCTOR_SVNT
-// ------------------------------
-#ifndef CONDUCTOR_SVNT_EXPORT_H
-#define CONDUCTOR_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CONDUCTOR_SVNT_HAS_DLL)
-#  define CONDUCTOR_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CONDUCTOR_SVNT_HAS_DLL */
-
-#if !defined (CONDUCTOR_SVNT_HAS_DLL)
-#  define CONDUCTOR_SVNT_HAS_DLL 1
-#endif /* ! CONDUCTOR_SVNT_HAS_DLL */
-
-#if defined (CONDUCTOR_SVNT_HAS_DLL) && (CONDUCTOR_SVNT_HAS_DLL == 1)
-#  if defined (CONDUCTOR_SVNT_BUILD_DLL)
-#    define CONDUCTOR_SVNT_Export ACE_Proper_Export_Flag
-#    define CONDUCTOR_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONDUCTOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONDUCTOR_SVNT_BUILD_DLL */
-#    define CONDUCTOR_SVNT_Export ACE_Proper_Import_Flag
-#    define CONDUCTOR_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONDUCTOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONDUCTOR_SVNT_BUILD_DLL */
-#else /* CONDUCTOR_SVNT_HAS_DLL == 1 */
-#  define CONDUCTOR_SVNT_Export
-#  define CONDUCTOR_SVNT_SINGLETON_DECLARATION(T)
-#  define CONDUCTOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONDUCTOR_SVNT_HAS_DLL == 1 */
-
-// Set CONDUCTOR_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONDUCTOR_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONDUCTOR_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONDUCTOR_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONDUCTOR_SVNT_NTRACE */
-
-#if (CONDUCTOR_SVNT_NTRACE == 1)
-#  define CONDUCTOR_SVNT_TRACE(X)
-#else /* (CONDUCTOR_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONDUCTOR_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONDUCTOR_SVNT_NTRACE == 1) */
-
-#endif /* CONDUCTOR_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Controller/Base/Controller_Base.mpc b/Controller/Base/Controller_Base.mpc
index 0adc3ffa87c..2ffe88fcb00 100644
--- a/Controller/Base/Controller_Base.mpc
+++ b/Controller/Base/Controller_Base.mpc
@@ -1,33 +1,62 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl Controller_Base"
+// This file is generated with "generate_component_mpc.pl -b race_common Controller_Base"
 
-project(Controller_Base_idl_gen) : taoidldefaults, anytypecode, race_idl {
-  avoids += ace_for_tao
+project(Controller_Base_idl_gen) : componentidldefaults , race_idl  {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CONTROLLER_BASE_STUB_Export \
               -Wb,stub_export_include=Controller_Base_stub_export.h \
               -Wb,skel_export_macro=CONTROLLER_BASE_SVNT_Export \
-              -Wb,skel_export_include=Controller_Base_svnt_export.h
+              -Wb,skel_export_include=Controller_Base_svnt_export.h \
+              -Wb,exec_export_macro=CONTROLLER_BASE_EXEC_Export \
+              -Wb,exec_export_include=Controller_Base_exec_export.h
 
   IDL_Files {
     Controller_Base.idl
   }
 }
 
-project(Controller_Base_stub) : ccm_stub, race_common {
-  avoids += ace_for_tao
-  after += Controller_Base_idl_gen \
-           OpString_stub \
-           RACE_common_stub \
-           TM_Proxy_stub \
-           Effector_Base_stub
+project(Controller_Base_lem_gen) : ciaoidldefaults , race_idl  {
+  after += Controller_Base_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=CONTROLLER_BASE_LEM_STUB_Export \
+              -Wb,stub_export_include=Controller_Base_lem_stub_export.h \
+              -SS -Gxhst
 
+  IDL_Files {
+    Controller_BaseE.idl
+  }
+}
 
-  libs  += OpString_stub \
-           RACE_common_stub \
-           TM_Proxy_Component_stub \
-           Effector_Base_stub
+project(Controller_Base_lem_stub) : ccm_svnt , race_opstring, tm_proxy_stub  {
+  after += Controller_Base_lem_gen Controller_Base_stub 
+  libs  +=  Controller_Base_stub
+  
+  
+  sharedname = Controller_Base_lem_stub
+  dynamicflags   = CONTROLLER_BASE_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Controller_BaseEC.cpp
+  }
+
+  Header_Files {
+    Controller_BaseEC.h
+    Controller_Base_lem_stub_export.h
+  }
 
+  Inline_Files {
+    Controller_BaseEC.inl
+  }
+}
+
+project(Controller_Base_stub) : ccm_stub , race_opstring, tm_proxy_stub, race_effector_stub  {
+  after += Controller_Base_idl_gen 
+  libs  += 
+  
+  
   sharedname = Controller_Base_stub
   dynamicflags   = CONTROLLER_BASE_STUB_BUILD_DLL
 
@@ -48,35 +77,31 @@ project(Controller_Base_stub) : ccm_stub, race_common {
   }
 }
 
-project(Controller_Base_svnt) : ciao_servant, race_common, dance_deployment_stub {
-  avoids += ace_for_tao
-  after      +=  Controller_Base_stub
-
-  sharedname  = Controller_Base_svnt
-
-  libs       += Controller_Base_stub \
-                OpString_stub \
-                RACE_common_stub \
-                TM_Proxy_Component_stub \
-                Effector_Base_stub
-
+project(Controller_Base_skel) : ciao_servant , race_opstring, tm_proxy_stub, race_effector_skel  {
+  after      +=   Controller_Base_lem_stub
+  sharedname  = Controller_Base_skel
+  libs       += Controller_Base_stub Controller_Base_lem_stub  
+  
+  
   dynamicflags = CONTROLLER_BASE_SVNT_BUILD_DLL
-
-  CIDL_Files {
-  }
-
+  
   IDL_Files {
   }
 
   Source_Files {
     Controller_BaseS.cpp
+    Controller_Base_svnt.cpp
   }
 
   Header_Files {
     Controller_BaseS.h
+    Controller_Base_svnt.h
+    Controller_Base_svnt_export.h
   }
 
   Inline_Files {
     Controller_BaseS.inl
   }
 }
+
+
diff --git a/Controller/Base/Controller_Base_stub_export.h b/Controller/Base/Controller_Base_stub_export.h
deleted file mode 100644
index a21c236d6db..00000000000
--- a/Controller/Base/Controller_Base_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONTROLLER_BASE_STUB
-// ------------------------------
-#ifndef CONTROLLER_BASE_STUB_EXPORT_H
-#define CONTROLLER_BASE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CONTROLLER_BASE_STUB_HAS_DLL)
-#  define CONTROLLER_BASE_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CONTROLLER_BASE_STUB_HAS_DLL */
-
-#if !defined (CONTROLLER_BASE_STUB_HAS_DLL)
-#  define CONTROLLER_BASE_STUB_HAS_DLL 1
-#endif /* ! CONTROLLER_BASE_STUB_HAS_DLL */
-
-#if defined (CONTROLLER_BASE_STUB_HAS_DLL) && (CONTROLLER_BASE_STUB_HAS_DLL == 1)
-#  if defined (CONTROLLER_BASE_STUB_BUILD_DLL)
-#    define CONTROLLER_BASE_STUB_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_BASE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_BASE_STUB_BUILD_DLL */
-#    define CONTROLLER_BASE_STUB_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_BASE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_BASE_STUB_BUILD_DLL */
-#else /* CONTROLLER_BASE_STUB_HAS_DLL == 1 */
-#  define CONTROLLER_BASE_STUB_Export
-#  define CONTROLLER_BASE_STUB_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_BASE_STUB_HAS_DLL == 1 */
-
-// Set CONTROLLER_BASE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_BASE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_BASE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_BASE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_BASE_STUB_NTRACE */
-
-#if (CONTROLLER_BASE_STUB_NTRACE == 1)
-#  define CONTROLLER_BASE_STUB_TRACE(X)
-#else /* (CONTROLLER_BASE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_BASE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_BASE_STUB_NTRACE == 1) */
-
-#endif /* CONTROLLER_BASE_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Controller/Base/Controller_Base_svnt_export.h b/Controller/Base/Controller_Base_svnt_export.h
deleted file mode 100644
index 3ff6899d443..00000000000
--- a/Controller/Base/Controller_Base_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONTROLLER_BASE_SVNT
-// ------------------------------
-#ifndef CONTROLLER_BASE_SVNT_EXPORT_H
-#define CONTROLLER_BASE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CONTROLLER_BASE_SVNT_HAS_DLL)
-#  define CONTROLLER_BASE_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CONTROLLER_BASE_SVNT_HAS_DLL */
-
-#if !defined (CONTROLLER_BASE_SVNT_HAS_DLL)
-#  define CONTROLLER_BASE_SVNT_HAS_DLL 1
-#endif /* ! CONTROLLER_BASE_SVNT_HAS_DLL */
-
-#if defined (CONTROLLER_BASE_SVNT_HAS_DLL) && (CONTROLLER_BASE_SVNT_HAS_DLL == 1)
-#  if defined (CONTROLLER_BASE_SVNT_BUILD_DLL)
-#    define CONTROLLER_BASE_SVNT_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_BASE_SVNT_BUILD_DLL */
-#    define CONTROLLER_BASE_SVNT_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_BASE_SVNT_BUILD_DLL */
-#else /* CONTROLLER_BASE_SVNT_HAS_DLL == 1 */
-#  define CONTROLLER_BASE_SVNT_Export
-#  define CONTROLLER_BASE_SVNT_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_BASE_SVNT_HAS_DLL == 1 */
-
-// Set CONTROLLER_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_BASE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_BASE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_BASE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_BASE_SVNT_NTRACE */
-
-#if (CONTROLLER_BASE_SVNT_NTRACE == 1)
-#  define CONTROLLER_BASE_SVNT_TRACE(X)
-#else /* (CONTROLLER_BASE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_BASE_SVNT_NTRACE == 1) */
-
-#endif /* CONTROLLER_BASE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Controller/Component/Controller.cidl b/Controller/Component/Controller.cidl
deleted file mode 100644
index 981fa42caea..00000000000
--- a/Controller/Component/Controller.cidl
+++ /dev/null
@@ -1,28 +0,0 @@
-// Controller.cidl,v 1.1 2006/01/23 16:58:01 nshankar Exp
-#ifndef RACE_CONTROLLER_CIDL
-#define RACE_CONTROLLER_CIDL
-
-/*
- * @file Controller.cidl
- * @brief This file contains the Controller component implementation defination.
- */
-
-#include "Controller.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session Controller_Impl
-    {
-      home executor Controller_Home_Exec
-        {
-          implements Controller_Home;
-          manages    Controller_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_CONTROLLER_CIDL */
diff --git a/Controller/Component/Controller.idl b/Controller/Component/Controller.idl
index 1f6780696e8..bd343fdcf6e 100644
--- a/Controller/Component/Controller.idl
+++ b/Controller/Component/Controller.idl
@@ -12,7 +12,7 @@
  */
 
 #include <Components.idl>
-#include "ciao/Deployment_Target_Data.idl"
+#include "DAnCE/Deployment/Deployment_TargetData.idl"
 #include "TargetManager/TargetManagerExt.idl"
 #include "Interface.idl"
 #include "Monitor/Central_Monitor/Monitor.idl"
diff --git a/Controller/Component/Controller.mpc b/Controller/Component/Controller.mpc
index 0a4f759849c..75437175efe 100644
--- a/Controller/Component/Controller.mpc
+++ b/Controller/Component/Controller.mpc
@@ -1,109 +1,140 @@
-project(Controller_stub): dance_deployment_stub, race_idl {
-
-  after += CIAO_TargetManager_stub \
-           TargetManager_stub       \
-           NodeManager_stub \
-           Monitor_stub
-
-  sharedname = Controller_stub
-
-  libs += TargetManager_stub \
-          NodeManager_stub \
-          Monitor_stub
+// $Id$
+// This file is generated with "generate_component_mpc.pl -b race_common, dance_deployment_stub -c starter Controller"
 
+project(Controller_idl_gen) : componentidldefaults , race_idl, dance_deployment_stub  {
+  custom_only = 1
   idlflags += -Wb,stub_export_macro=CONTROLLER_STUB_Export \
               -Wb,stub_export_include=Controller_stub_export.h \
               -Wb,skel_export_macro=CONTROLLER_SVNT_Export \
-              -Wb,skel_export_include=Controller_svnt_export.h
-
-  dynamicflags   = CONTROLLER_STUB_BUILD_DLL
+              -Wb,skel_export_include=Controller_svnt_export.h \
+              -Wb,exec_export_macro=CONTROLLER_EXEC_Export \
+              -Wb,exec_export_include=Controller_exec_export.h
 
   IDL_Files {
     Controller.idl
-    Interface.idl
   }
+}
 
-  Source_Files {
-    ControllerC.cpp
-    InterfaceC.cpp
+project(Controller_lem_gen) : ciaoidldefaults , race_idl, dance_deployment_stub  {
+  after += Controller_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=CONTROLLER_LEM_STUB_Export \
+              -Wb,stub_export_include=Controller_lem_stub_export.h \
+              -SS -Gxhst
+
+  IDL_Files {
+    ControllerE.idl
   }
 }
 
-project(Controller_svnt) : ciao_servant, race_idl {
-  after +=  Controller_stub \
-            CIAO_TargetManager_svnt
-
-  sharedname  = Controller_svnt
+project(Controller_lem_stub) : ccm_svnt , race_common, dance_deployment_stub  {
+  after += Controller_lem_gen Controller_stub 
+  libs  +=  Controller_stub
+  
+  
+  sharedname = Controller_lem_stub
+  dynamicflags   = CONTROLLER_LEM_STUB_BUILD_DLL
 
-  libs    += Controller_stub \
-             TargetManager_stub \
-             TargetManager_svnt \
-             NodeManager_stub \
-             Monitor_stub
+  IDL_Files {
+  }
 
-  idlflags  +=  -Wb,export_macro=CONTROLLER_SVNT_Export \
-                -Wb,export_include=Controller_svnt_export.h
+  Source_Files {
+    ControllerEC.cpp
+  }
 
-  dynamicflags = CONTROLLER_SVNT_BUILD_DLL
+  Header_Files {
+    ControllerEC.h
+    Controller_lem_stub_export.h
+  }
 
-  CIDL_Files {
-    Controller.cidl
+  Inline_Files {
+    ControllerEC.inl
   }
+}
+
+project(Controller_stub) : ccm_stub , race_common, dance_deployment_stub  {
+  after += Controller_idl_gen 
+  libs  += 
+  
+  
+  sharedname = Controller_stub
+  dynamicflags   = CONTROLLER_STUB_BUILD_DLL
 
   IDL_Files {
-    ControllerE.idl
   }
 
   Source_Files {
-    ControllerEC.cpp
-    ControllerS.cpp
-    InterfaceS.cpp
-    Controller_svnt.cpp
+    ControllerC.cpp
   }
-}
-
-project(Controller_exec) : ciao_executor, ciao_config_handlers, race_common {
-  after   += Controller_svnt \
-             XSC_Config_Handlers \
-             Path_stub
 
-  sharedname = Controller_exec
-  includes += $(CIAO_ROOT)/DAnCE/
+  Header_Files {
+    ControllerC.h
+    Controller_stub_export.h
+  }
 
-  libs      += Controller_stub \
-               Controller_svnt \
-               TargetManager_stub \
-               TargetManager_svnt \
-               NodeManager_stub \
-               Monitor_stub
+  Inline_Files {
+    ControllerC.inl
+  }
+}
 
+project(Controller_exec) : ciao_executor , race_common, dance_deployment_stub, ciao_config_handlers  {
+  after   += Controller_lem_stub Controller_stub
+  sharedname = Controller_exec
+  libs += Controller_stub Controller_lem_stub 
+  
+  
   dynamicflags   = CONTROLLER_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
+  Source_Files {
+    Controller_exec.cpp
+  }
+
   Header_Files {
-    Poller.h
-    Descriptor.h
+    Controller_exec.h
+    Controller_exec_export.h
   }
 
-  Source_Files {
-    Poller.cpp
-    Descriptor.cpp
-    Controller_exec.cpp
+  Inline_Files {
   }
 }
 
 
-project (Controller_Starter) : ccm_stub, dance_deployment_stub, valuetype, race_common {
-  exename = starter
-  after += Controller_stub
-  libs += Controller_stub \
-          TargetManager_stub       \
-          NodeManager_stub \
-          Monitor_stub
+project(Controller_svnt) : ciao_servant , race_common, dance_deployment_stub  {
+  after      +=   Controller_lem_stub
+  sharedname  = Controller_svnt
+  libs       += Controller_stub Controller_lem_stub  
+  
+  
+  dynamicflags = CONTROLLER_SVNT_BUILD_DLL
+  
+  IDL_Files {
+  }
 
+  Source_Files {
+    ControllerS.cpp
+    Controller_svnt.cpp
+  }
 
+  Header_Files {
+    ControllerS.h
+    Controller_svnt.h
+    Controller_svnt_export.h
+  }
+
+  Inline_Files {
+    ControllerS.inl
+  }
+}
+
+project (starter) : ccm_stub, valuetype , race_common, dance_deployment_stub  {
+  exename = starter
+  after += Controller_stub
+  libs  += Controller_stub 
+  
+  
   IDL_Files {
   }
 
@@ -117,3 +148,4 @@ project (Controller_Starter) : ccm_stub, dance_deployment_stub, valuetype, race_
   Inline_Files {
   }
 }
+
diff --git a/Controller/Component/Controller_exec_export.h b/Controller/Component/Controller_exec_export.h
deleted file mode 100644
index c53792cd002..00000000000
--- a/Controller/Component/Controller_exec_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// Controller_exec_export.h,v 1.1 2006/01/23 17:00:43 nshankar Exp
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONTROLLER_EXEC
-// ------------------------------
-#ifndef CONTROLLER_EXEC_EXPORT_H
-#define CONTROLLER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_EXEC_HAS_DLL)
-#  define CONTROLLER_EXEC_HAS_DLL 1
-#endif /* ! CONTROLLER_EXEC_HAS_DLL */
-
-#if defined (CONTROLLER_EXEC_HAS_DLL) && (CONTROLLER_EXEC_HAS_DLL == 1)
-#  if defined (CONTROLLER_EXEC_BUILD_DLL)
-#    define CONTROLLER_EXEC_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_EXEC_BUILD_DLL */
-#    define CONTROLLER_EXEC_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_EXEC_BUILD_DLL */
-#else /* CONTROLLER_EXEC_HAS_DLL == 1 */
-#  define CONTROLLER_EXEC_Export
-#  define CONTROLLER_EXEC_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_EXEC_HAS_DLL == 1 */
-
-// Set CONTROLLER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_EXEC_NTRACE */
-
-#if (CONTROLLER_EXEC_NTRACE == 1)
-#  define CONTROLLER_EXEC_TRACE(X)
-#else /* (CONTROLLER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_EXEC_NTRACE == 1) */
-
-#endif /* CONTROLLER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Controller/Component/Controller_stub_export.h b/Controller/Component/Controller_stub_export.h
deleted file mode 100644
index 27354106759..00000000000
--- a/Controller/Component/Controller_stub_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// Controller_stub_export.h,v 1.1 2006/01/23 17:01:07 nshankar Exp
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONTROLLER_STUB
-// ------------------------------
-#ifndef CONTROLLER_STUB_EXPORT_H
-#define CONTROLLER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_STUB_HAS_DLL)
-#  define CONTROLLER_STUB_HAS_DLL 1
-#endif /* ! CONTROLLER_STUB_HAS_DLL */
-
-#if defined (CONTROLLER_STUB_HAS_DLL) && (CONTROLLER_STUB_HAS_DLL == 1)
-#  if defined (CONTROLLER_STUB_BUILD_DLL)
-#    define CONTROLLER_STUB_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_STUB_BUILD_DLL */
-#    define CONTROLLER_STUB_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_STUB_BUILD_DLL */
-#else /* CONTROLLER_STUB_HAS_DLL == 1 */
-#  define CONTROLLER_STUB_Export
-#  define CONTROLLER_STUB_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_STUB_HAS_DLL == 1 */
-
-// Set CONTROLLER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_STUB_NTRACE */
-
-#if (CONTROLLER_STUB_NTRACE == 1)
-#  define CONTROLLER_STUB_TRACE(X)
-#else /* (CONTROLLER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_STUB_NTRACE == 1) */
-
-#endif /* CONTROLLER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Controller/Component/Controller_svnt_export.h b/Controller/Component/Controller_svnt_export.h
deleted file mode 100644
index 0752d79427f..00000000000
--- a/Controller/Component/Controller_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// Controller_svnt_export.h,v 1.1 2006/01/23 17:01:16 nshankar Exp
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONTROLLER_SVNT
-// ------------------------------
-#ifndef CONTROLLER_SVNT_EXPORT_H
-#define CONTROLLER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_SVNT_HAS_DLL)
-#  define CONTROLLER_SVNT_HAS_DLL 1
-#endif /* ! CONTROLLER_SVNT_HAS_DLL */
-
-#if defined (CONTROLLER_SVNT_HAS_DLL) && (CONTROLLER_SVNT_HAS_DLL == 1)
-#  if defined (CONTROLLER_SVNT_BUILD_DLL)
-#    define CONTROLLER_SVNT_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_SVNT_BUILD_DLL */
-#    define CONTROLLER_SVNT_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_SVNT_BUILD_DLL */
-#else /* CONTROLLER_SVNT_HAS_DLL == 1 */
-#  define CONTROLLER_SVNT_Export
-#  define CONTROLLER_SVNT_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_SVNT_HAS_DLL == 1 */
-
-// Set CONTROLLER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_SVNT_NTRACE */
-
-#if (CONTROLLER_SVNT_NTRACE == 1)
-#  define CONTROLLER_SVNT_TRACE(X)
-#else /* (CONTROLLER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_SVNT_NTRACE == 1) */
-
-#endif /* CONTROLLER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Controller/Component/Path_exec_export.h b/Controller/Component/Path_exec_export.h
deleted file mode 100644
index 59f06c9568c..00000000000
--- a/Controller/Component/Path_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl PATH_EXEC
-// ------------------------------
-#ifndef PATH_EXEC_EXPORT_H
-#define PATH_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PATH_EXEC_HAS_DLL)
-#  define PATH_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PATH_EXEC_HAS_DLL */
-
-#if !defined (PATH_EXEC_HAS_DLL)
-#  define PATH_EXEC_HAS_DLL 1
-#endif /* ! PATH_EXEC_HAS_DLL */
-
-#if defined (PATH_EXEC_HAS_DLL) && (PATH_EXEC_HAS_DLL == 1)
-#  if defined (PATH_EXEC_BUILD_DLL)
-#    define PATH_EXEC_Export ACE_Proper_Export_Flag
-#    define PATH_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PATH_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PATH_EXEC_BUILD_DLL */
-#    define PATH_EXEC_Export ACE_Proper_Import_Flag
-#    define PATH_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PATH_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PATH_EXEC_BUILD_DLL */
-#else /* PATH_EXEC_HAS_DLL == 1 */
-#  define PATH_EXEC_Export
-#  define PATH_EXEC_SINGLETON_DECLARATION(T)
-#  define PATH_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PATH_EXEC_HAS_DLL == 1 */
-
-// Set PATH_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PATH_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PATH_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PATH_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PATH_EXEC_NTRACE */
-
-#if (PATH_EXEC_NTRACE == 1)
-#  define PATH_EXEC_TRACE(X)
-#else /* (PATH_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PATH_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PATH_EXEC_NTRACE == 1) */
-
-#endif /* PATH_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Controller/Component/Path_stub_export.h b/Controller/Component/Path_stub_export.h
deleted file mode 100644
index 3f8b23a3904..00000000000
--- a/Controller/Component/Path_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl PATH_STUB
-// ------------------------------
-#ifndef PATH_STUB_EXPORT_H
-#define PATH_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PATH_STUB_HAS_DLL)
-#  define PATH_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PATH_STUB_HAS_DLL */
-
-#if !defined (PATH_STUB_HAS_DLL)
-#  define PATH_STUB_HAS_DLL 1
-#endif /* ! PATH_STUB_HAS_DLL */
-
-#if defined (PATH_STUB_HAS_DLL) && (PATH_STUB_HAS_DLL == 1)
-#  if defined (PATH_STUB_BUILD_DLL)
-#    define PATH_STUB_Export ACE_Proper_Export_Flag
-#    define PATH_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PATH_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PATH_STUB_BUILD_DLL */
-#    define PATH_STUB_Export ACE_Proper_Import_Flag
-#    define PATH_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PATH_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PATH_STUB_BUILD_DLL */
-#else /* PATH_STUB_HAS_DLL == 1 */
-#  define PATH_STUB_Export
-#  define PATH_STUB_SINGLETON_DECLARATION(T)
-#  define PATH_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PATH_STUB_HAS_DLL == 1 */
-
-// Set PATH_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PATH_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PATH_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PATH_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PATH_STUB_NTRACE */
-
-#if (PATH_STUB_NTRACE == 1)
-#  define PATH_STUB_TRACE(X)
-#else /* (PATH_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PATH_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PATH_STUB_NTRACE == 1) */
-
-#endif /* PATH_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Controller/Component/Path_svnt_export.h b/Controller/Component/Path_svnt_export.h
deleted file mode 100644
index 25ad1a1f1f2..00000000000
--- a/Controller/Component/Path_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl PATH_SVNT
-// ------------------------------
-#ifndef PATH_SVNT_EXPORT_H
-#define PATH_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PATH_SVNT_HAS_DLL)
-#  define PATH_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PATH_SVNT_HAS_DLL */
-
-#if !defined (PATH_SVNT_HAS_DLL)
-#  define PATH_SVNT_HAS_DLL 1
-#endif /* ! PATH_SVNT_HAS_DLL */
-
-#if defined (PATH_SVNT_HAS_DLL) && (PATH_SVNT_HAS_DLL == 1)
-#  if defined (PATH_SVNT_BUILD_DLL)
-#    define PATH_SVNT_Export ACE_Proper_Export_Flag
-#    define PATH_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PATH_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PATH_SVNT_BUILD_DLL */
-#    define PATH_SVNT_Export ACE_Proper_Import_Flag
-#    define PATH_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PATH_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PATH_SVNT_BUILD_DLL */
-#else /* PATH_SVNT_HAS_DLL == 1 */
-#  define PATH_SVNT_Export
-#  define PATH_SVNT_SINGLETON_DECLARATION(T)
-#  define PATH_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PATH_SVNT_HAS_DLL == 1 */
-
-// Set PATH_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PATH_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PATH_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PATH_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PATH_SVNT_NTRACE */
-
-#if (PATH_SVNT_NTRACE == 1)
-#  define PATH_SVNT_TRACE(X)
-#else /* (PATH_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PATH_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PATH_SVNT_NTRACE == 1) */
-
-#endif /* PATH_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Controller/EUCON/EUCON_Controller.cidl b/Controller/EUCON/EUCON_Controller.cidl
deleted file mode 100644
index 9e11e004af8..00000000000
--- a/Controller/EUCON/EUCON_Controller.cidl
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-#ifndef RACE_EUCON_CONTROLLER_CIDL
-#define RACE_EUCON_CONTROLLER_CIDL
-
-/*
- * @file EUCON_Controller.cidl
- *
- * @brief This file contains the EUCON Controller component implementation
- * defination.
- */
-
-#include "EUCON_Controller.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    module Controller
-    {
-      composition session EUCON_Controller_Impl
-      {
-        home executor EUCON_Controller_Home_Exec
-        {
-          implements EUCON_Controller_Home;
-          manages    EUCON_Controller_Exec;
-        };
-      };
-    };
-  };
-};
-
-
-#endif /* RACE_EUCON_CONTROLLER_CIDL */
diff --git a/Controller/FMUF/FMUF_Controller.cidl b/Controller/FMUF/FMUF_Controller.cidl
deleted file mode 100644
index 735a7150475..00000000000
--- a/Controller/FMUF/FMUF_Controller.cidl
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-#ifndef RACE_FMUF_CONTROLLER_CIDL
-#define RACE_FMUF_CONTROLLER_CIDL
-
-/*
- * @file FMUF_Controller.cidl
- *
- * @brief This file contains the FMUF Controller component implementation
- * defination.
- */
-
-#include "FMUF_Controller.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    module Controller
-    {
-      composition session FMUF_Controller_Impl
-      {
-        home executor FMUF_Controller_Home_Exec
-        {
-          implements FMUF_Controller_Home;
-          manages    FMUF_Controller_Exec;
-        };
-      };
-    };
-  };
-};
-
-
-#endif /* RACE_FMUF_CONTROLLER_CIDL */
diff --git a/Data_Base/Data_Base.cidl b/Data_Base/Data_Base.cidl
deleted file mode 100644
index f33e1437fc2..00000000000
--- a/Data_Base/Data_Base.cidl
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef RACE_DATA_BASE_CIDL
-#define RACE_DATA_BASE_CIDL
-#include "Data_Base.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    module Data_Base
-    {
-      composition session Data_Base_Component_Impl
-      {
-        home executor Data_Base_Component_Home_Exec
-        {
-          implements Data_Base_Component_Home;
-          manages    Data_Base_Component_Exec;
-        };
-      };
-    };
-  };
-};
-
-#endif /* RACE_DATA_BASE_CIDL */
diff --git a/Data_Base/Data_Base.mpc b/Data_Base/Data_Base.mpc
index 96ceaedf7da..03e3af63458 100644
--- a/Data_Base/Data_Base.mpc
+++ b/Data_Base/Data_Base.mpc
@@ -1,75 +1,134 @@
-project(Data_Base_stub): ccm_stub, dance_deployment_stub, race_idl {
+// $Id$
+// This file is generated with "generate_component_mpc.pl -b race_common Data_Base"
 
-  sharedname = Data_Base_Component_stub
-  after += OpString_stub
-
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=DATA_BASE_STUB_Export \
+project(Data_Base_idl_gen) : componentidldefaults , race_idl  {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=DATA_BASE_STUB_Export \
               -Wb,stub_export_include=Data_Base_stub_export.h \
               -Wb,skel_export_macro=DATA_BASE_SVNT_Export \
-              -Wb,skel_export_include=Data_Base_svnt_export.h
-  dynamicflags   = DATA_BASE_STUB_BUILD_DLL
-
-  libs +=	OpString_stub \
-			RACE_common_stub
+              -Wb,skel_export_include=Data_Base_svnt_export.h \
+              -Wb,exec_export_macro=DATA_BASE_EXEC_Export \
+              -Wb,exec_export_include=Data_Base_exec_export.h
 
   IDL_Files {
     Data_Base.idl
   }
+}
 
-  Source_Files {
-    Data_BaseC.cpp
+project(Data_Base_lem_gen) : ciaoidldefaults , race_idl  {
+  after += Data_Base_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=DATA_BASE_LEM_STUB_Export \
+              -Wb,stub_export_include=Data_Base_lem_stub_export.h \
+              -SS -Gxhst
+
+  IDL_Files {
+    Data_BaseE.idl
   }
 }
 
-project(Data_Base_svnt) : ciao_servant, race_idl, dance_deployment_stub {
-  after      +=  Data_Base_stub
-  sharedname  = Data_Base_Component_svnt
-  libs       += Data_Base_Component_stub \
-				OpString_stub \
-				RACE_common_stub
+project(Data_Base_lem_stub) : ccm_svnt , race_opstring  {
+  after += Data_Base_lem_gen Data_Base_stub 
+  libs  +=  Data_Base_stub
+  
+  
+  sharedname = Data_Base_lem_stub
+  dynamicflags   = DATA_BASE_LEM_STUB_BUILD_DLL
 
-  idlflags -= -GT
-  idlflags += -St -SS \
-              -Wb,export_macro=DATA_BASE_SVNT_Export \
-              -Wb,export_include=Data_Base_svnt_export.h
+  IDL_Files {
+  }
 
-  dynamicflags = DATA_BASE_SVNT_BUILD_DLL
+  Source_Files {
+    Data_BaseEC.cpp
+  }
+
+  Header_Files {
+    Data_BaseEC.h
+    Data_Base_lem_stub_export.h
+  }
 
-  CIDL_Files {
-    Data_Base.cidl
+  Inline_Files {
+    Data_BaseEC.inl
   }
+}
+
+project(Data_Base_stub) : ccm_stub , race_opstring  {
+  after += Data_Base_idl_gen 
+  libs  += 
+  
+  
+  sharedname = Data_Base_stub
+  dynamicflags   = DATA_BASE_STUB_BUILD_DLL
 
   IDL_Files {
-    Data_BaseE.idl
   }
 
   Source_Files {
-    Data_BaseEC.cpp
-    Data_BaseS.cpp
-    Data_Base_svnt.cpp
+    Data_BaseC.cpp
   }
-}
 
-project(Data_Base_exec) : ciao_executor, race_common, dance_deployment_stub {
-  after   += Data_Base_svnt
-  sharedname = Data_Base_Component_exec
-  libs +=	Data_Base_Component_stub \
-			Data_Base_Component_svnt \
-			OpString_stub \	
-			RACE_common_stub
+  Header_Files {
+    Data_BaseC.h
+    Data_Base_stub_export.h
+  }
 
+  Inline_Files {
+    Data_BaseC.inl
+  }
+}
+
+project(Data_Base_exec) : ciao_executor , race_opstring  {
+  after   += Data_Base_lem_stub Data_Base_stub Data_Base_svnt
+  sharedname = Data_Base_exec
+  libs += Data_Base_stub Data_Base_lem_stub Data_Base_svnt
+  
+  
   dynamicflags   = DATA_BASE_EXEC_BUILD_DLL
 
   IDL_Files {
-
   }
 
   Source_Files {
-
     Data_Base_exec.cpp
     Admin_exec.cpp
     Query_exec.cpp
   }
+
+  Header_Files {
+    Data_Base_exec.h
+    Data_Base_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(Data_Base_svnt) : ciao_servant , race_opstring  {
+  after      +=   Data_Base_lem_stub
+  sharedname  = Data_Base_svnt
+  libs       += Data_Base_stub Data_Base_lem_stub  
+  
+  
+  dynamicflags = DATA_BASE_SVNT_BUILD_DLL
+  
+  IDL_Files {
+  }
+
+  Source_Files {
+    Data_BaseS.cpp
+    Data_Base_svnt.cpp
+  }
+
+  Header_Files {
+    Data_BaseS.h
+    Data_Base_svnt.h
+    Data_Base_svnt_export.h
+  }
+
+  Inline_Files {
+    Data_BaseS.inl
+  }
 }
+
+
diff --git a/Data_Base/Data_Base_exec.cpp b/Data_Base/Data_Base_exec.cpp
index 76ffc7fbdc4..9968abea855 100644
--- a/Data_Base/Data_Base_exec.cpp
+++ b/Data_Base/Data_Base_exec.cpp
@@ -36,7 +36,7 @@ namespace CIAO
           ::Components::SessionContext_ptr ctx)
         {
           this->context_ =
-            Data_Base_Component_Context::_narrow (ctx);
+            CIAO_CIAO_RACE_Data_Base_Data_Base_Component_Impl::Data_Base_Component_Context::_narrow (ctx);
 
           if (this->context_ == 0)
           {
diff --git a/Data_Base/Data_Base_exec.h b/Data_Base/Data_Base_exec.h
index 331be46a78e..5f513effb55 100644
--- a/Data_Base/Data_Base_exec.h
+++ b/Data_Base/Data_Base_exec.h
@@ -28,7 +28,7 @@ namespace CIAO
 
 
         class DATA_BASE_EXEC_Export Data_Base_Component_exec_i
-          : public virtual Data_Base_Component_Exec,
+          : public virtual CIAO_CIAO_RACE_Data_Base_Data_Base_Component_Impl::Data_Base_Component_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
@@ -57,7 +57,7 @@ namespace CIAO
           virtual void ccm_remove ();
 
           protected:
-          Data_Base_Component_Context *context_;
+          CIAO_CIAO_RACE_Data_Base_Data_Base_Component_Impl::Data_Base_Component_Context *context_;
 
           private:
           ACE_Hash_Map_Manager_Ex
@@ -73,7 +73,7 @@ namespace CIAO
         };
 
         class DATA_BASE_EXEC_Export Data_Base_Component_Home_exec_i
-          : public virtual Data_Base_Component_Home_Exec,
+          : public virtual CIAO_CIAO_RACE_Data_Base_Data_Base_Component_Impl::Data_Base_Component_Home_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
diff --git a/Data_Base/Data_Base_exec_export.h b/Data_Base/Data_Base_exec_export.h
deleted file mode 100644
index 2e8c091f92a..00000000000
--- a/Data_Base/Data_Base_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DATA_BASE_EXEC
-// ------------------------------
-#ifndef DATA_BASE_EXEC_EXPORT_H
-#define DATA_BASE_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DATA_BASE_EXEC_HAS_DLL)
-#  define DATA_BASE_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DATA_BASE_EXEC_HAS_DLL */
-
-#if !defined (DATA_BASE_EXEC_HAS_DLL)
-#  define DATA_BASE_EXEC_HAS_DLL 1
-#endif /* ! DATA_BASE_EXEC_HAS_DLL */
-
-#if defined (DATA_BASE_EXEC_HAS_DLL) && (DATA_BASE_EXEC_HAS_DLL == 1)
-#  if defined (DATA_BASE_EXEC_BUILD_DLL)
-#    define DATA_BASE_EXEC_Export ACE_Proper_Export_Flag
-#    define DATA_BASE_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DATA_BASE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DATA_BASE_EXEC_BUILD_DLL */
-#    define DATA_BASE_EXEC_Export ACE_Proper_Import_Flag
-#    define DATA_BASE_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DATA_BASE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DATA_BASE_EXEC_BUILD_DLL */
-#else /* DATA_BASE_EXEC_HAS_DLL == 1 */
-#  define DATA_BASE_EXEC_Export
-#  define DATA_BASE_EXEC_SINGLETON_DECLARATION(T)
-#  define DATA_BASE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DATA_BASE_EXEC_HAS_DLL == 1 */
-
-// Set DATA_BASE_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DATA_BASE_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DATA_BASE_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DATA_BASE_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DATA_BASE_EXEC_NTRACE */
-
-#if (DATA_BASE_EXEC_NTRACE == 1)
-#  define DATA_BASE_EXEC_TRACE(X)
-#else /* (DATA_BASE_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DATA_BASE_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DATA_BASE_EXEC_NTRACE == 1) */
-
-#endif /* DATA_BASE_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Data_Base/Data_Base_stub_export.h b/Data_Base/Data_Base_stub_export.h
deleted file mode 100644
index bbd60e48408..00000000000
--- a/Data_Base/Data_Base_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DATA_BASE_STUB
-// ------------------------------
-#ifndef DATA_BASE_STUB_EXPORT_H
-#define DATA_BASE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DATA_BASE_STUB_HAS_DLL)
-#  define DATA_BASE_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DATA_BASE_STUB_HAS_DLL */
-
-#if !defined (DATA_BASE_STUB_HAS_DLL)
-#  define DATA_BASE_STUB_HAS_DLL 1
-#endif /* ! DATA_BASE_STUB_HAS_DLL */
-
-#if defined (DATA_BASE_STUB_HAS_DLL) && (DATA_BASE_STUB_HAS_DLL == 1)
-#  if defined (DATA_BASE_STUB_BUILD_DLL)
-#    define DATA_BASE_STUB_Export ACE_Proper_Export_Flag
-#    define DATA_BASE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DATA_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DATA_BASE_STUB_BUILD_DLL */
-#    define DATA_BASE_STUB_Export ACE_Proper_Import_Flag
-#    define DATA_BASE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DATA_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DATA_BASE_STUB_BUILD_DLL */
-#else /* DATA_BASE_STUB_HAS_DLL == 1 */
-#  define DATA_BASE_STUB_Export
-#  define DATA_BASE_STUB_SINGLETON_DECLARATION(T)
-#  define DATA_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DATA_BASE_STUB_HAS_DLL == 1 */
-
-// Set DATA_BASE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DATA_BASE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DATA_BASE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DATA_BASE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DATA_BASE_STUB_NTRACE */
-
-#if (DATA_BASE_STUB_NTRACE == 1)
-#  define DATA_BASE_STUB_TRACE(X)
-#else /* (DATA_BASE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DATA_BASE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DATA_BASE_STUB_NTRACE == 1) */
-
-#endif /* DATA_BASE_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Data_Base/Data_Base_svnt_export.h b/Data_Base/Data_Base_svnt_export.h
deleted file mode 100644
index db46622acff..00000000000
--- a/Data_Base/Data_Base_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DATA_BASE_SVNT
-// ------------------------------
-#ifndef DATA_BASE_SVNT_EXPORT_H
-#define DATA_BASE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DATA_BASE_SVNT_HAS_DLL)
-#  define DATA_BASE_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DATA_BASE_SVNT_HAS_DLL */
-
-#if !defined (DATA_BASE_SVNT_HAS_DLL)
-#  define DATA_BASE_SVNT_HAS_DLL 1
-#endif /* ! DATA_BASE_SVNT_HAS_DLL */
-
-#if defined (DATA_BASE_SVNT_HAS_DLL) && (DATA_BASE_SVNT_HAS_DLL == 1)
-#  if defined (DATA_BASE_SVNT_BUILD_DLL)
-#    define DATA_BASE_SVNT_Export ACE_Proper_Export_Flag
-#    define DATA_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DATA_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DATA_BASE_SVNT_BUILD_DLL */
-#    define DATA_BASE_SVNT_Export ACE_Proper_Import_Flag
-#    define DATA_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DATA_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DATA_BASE_SVNT_BUILD_DLL */
-#else /* DATA_BASE_SVNT_HAS_DLL == 1 */
-#  define DATA_BASE_SVNT_Export
-#  define DATA_BASE_SVNT_SINGLETON_DECLARATION(T)
-#  define DATA_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DATA_BASE_SVNT_HAS_DLL == 1 */
-
-// Set DATA_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DATA_BASE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DATA_BASE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DATA_BASE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DATA_BASE_SVNT_NTRACE */
-
-#if (DATA_BASE_SVNT_NTRACE == 1)
-#  define DATA_BASE_SVNT_TRACE(X)
-#else /* (DATA_BASE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DATA_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DATA_BASE_SVNT_NTRACE == 1) */
-
-#endif /* DATA_BASE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Effectors/Base/Effector_Base.mpc b/Effectors/Base/Effector_Base.mpc
index f23482934c9..5d0d9c42e55 100644
--- a/Effectors/Base/Effector_Base.mpc
+++ b/Effectors/Base/Effector_Base.mpc
@@ -1,25 +1,62 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl Effector_Base"
+// This file is generated with "generate_component_mpc.pl -b race_common Effector_Base"
 
-project(Effector_Base_idl_gen) : taoidldefaults, anytypecode, race_idl {
-  avoids += ace_for_tao
+project(Effector_Base_idl_gen) : componentidldefaults , race_idl  {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=EFFECTOR_BASE_STUB_Export \
               -Wb,stub_export_include=Effector_Base_stub_export.h \
               -Wb,skel_export_macro=EFFECTOR_BASE_SVNT_Export \
-              -Wb,skel_export_include=Effector_Base_svnt_export.h
+              -Wb,skel_export_include=Effector_Base_svnt_export.h \
+              -Wb,exec_export_macro=EFFECTOR_BASE_EXEC_Export \
+              -Wb,exec_export_include=Effector_Base_exec_export.h
 
   IDL_Files {
     Effector_Base.idl
   }
 }
 
-project(Effector_Base_stub) : ccm_stub, race_common {
-  avoids += ace_for_tao
-  after += Effector_Base_idl_gen \
-           OpString_stub
-  libs  += OpString_stub
+project(Effector_Base_lem_gen) : ciaoidldefaults , race_idl  {
+  after += Effector_Base_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=EFFECTOR_BASE_LEM_STUB_Export \
+              -Wb,stub_export_include=Effector_Base_lem_stub_export.h \
+              -SS -Gxhst
 
+  IDL_Files {
+    Effector_BaseE.idl
+  }
+}
+
+project(Effector_Base_lem_stub) : ccm_svnt , race_common, race_opstring  {
+  after += Effector_Base_lem_gen Effector_Base_stub 
+  libs  +=  Effector_Base_stub
+  
+  
+  sharedname = Effector_Base_lem_stub
+  dynamicflags   = EFFECTOR_BASE_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Effector_BaseEC.cpp
+  }
+
+  Header_Files {
+    Effector_BaseEC.h
+    Effector_Base_lem_stub_export.h
+  }
+
+  Inline_Files {
+    Effector_BaseEC.inl
+  }
+}
+
+project(Effector_Base_stub) : ccm_stub , race_common, race_opstring  {
+  after += Effector_Base_idl_gen 
+  libs  += 
+  
+  
   sharedname = Effector_Base_stub
   dynamicflags   = EFFECTOR_BASE_STUB_BUILD_DLL
 
@@ -40,30 +77,31 @@ project(Effector_Base_stub) : ccm_stub, race_common {
   }
 }
 
-project(Effector_Base_svnt) : ciao_servant, race_common, dance_deployment_stub {
-  avoids += ace_for_tao
-  after      +=  Effector_Base_stub
-  sharedname  = Effector_Base_svnt
-  libs       += Effector_Base_stub \
-                OpString_stub
-
+project(Effector_Base_skel) : ciao_servant , race_common, race_opstring  {
+  after      +=   Effector_Base_lem_stub
+  sharedname  = Effector_Base_skel
+  libs       += Effector_Base_stub Effector_Base_lem_stub  
+  
+  
   dynamicflags = EFFECTOR_BASE_SVNT_BUILD_DLL
-
-  CIDL_Files {
-  }
-
+  
   IDL_Files {
   }
 
   Source_Files {
     Effector_BaseS.cpp
+    Effector_Base_svnt.cpp
   }
 
   Header_Files {
     Effector_BaseS.h
+    Effector_Base_svnt.h
+    Effector_Base_svnt_export.h
   }
 
   Inline_Files {
     Effector_BaseS.inl
   }
 }
+
+
diff --git a/Effectors/Base/Effector_Base_stub_export.h b/Effectors/Base/Effector_Base_stub_export.h
deleted file mode 100644
index 9aeb34ebab0..00000000000
--- a/Effectors/Base/Effector_Base_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl EFFECTOR_BASE_STUB
-// ------------------------------
-#ifndef EFFECTOR_BASE_STUB_EXPORT_H
-#define EFFECTOR_BASE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (EFFECTOR_BASE_STUB_HAS_DLL)
-#  define EFFECTOR_BASE_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && EFFECTOR_BASE_STUB_HAS_DLL */
-
-#if !defined (EFFECTOR_BASE_STUB_HAS_DLL)
-#  define EFFECTOR_BASE_STUB_HAS_DLL 1
-#endif /* ! EFFECTOR_BASE_STUB_HAS_DLL */
-
-#if defined (EFFECTOR_BASE_STUB_HAS_DLL) && (EFFECTOR_BASE_STUB_HAS_DLL == 1)
-#  if defined (EFFECTOR_BASE_STUB_BUILD_DLL)
-#    define EFFECTOR_BASE_STUB_Export ACE_Proper_Export_Flag
-#    define EFFECTOR_BASE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define EFFECTOR_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* EFFECTOR_BASE_STUB_BUILD_DLL */
-#    define EFFECTOR_BASE_STUB_Export ACE_Proper_Import_Flag
-#    define EFFECTOR_BASE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define EFFECTOR_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* EFFECTOR_BASE_STUB_BUILD_DLL */
-#else /* EFFECTOR_BASE_STUB_HAS_DLL == 1 */
-#  define EFFECTOR_BASE_STUB_Export
-#  define EFFECTOR_BASE_STUB_SINGLETON_DECLARATION(T)
-#  define EFFECTOR_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* EFFECTOR_BASE_STUB_HAS_DLL == 1 */
-
-// Set EFFECTOR_BASE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (EFFECTOR_BASE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define EFFECTOR_BASE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define EFFECTOR_BASE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !EFFECTOR_BASE_STUB_NTRACE */
-
-#if (EFFECTOR_BASE_STUB_NTRACE == 1)
-#  define EFFECTOR_BASE_STUB_TRACE(X)
-#else /* (EFFECTOR_BASE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define EFFECTOR_BASE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (EFFECTOR_BASE_STUB_NTRACE == 1) */
-
-#endif /* EFFECTOR_BASE_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Effectors/Base/Effector_Base_svnt_export.h b/Effectors/Base/Effector_Base_svnt_export.h
deleted file mode 100644
index 2b29f0510a1..00000000000
--- a/Effectors/Base/Effector_Base_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl EFFECTOR_BASE_SVNT
-// ------------------------------
-#ifndef EFFECTOR_BASE_SVNT_EXPORT_H
-#define EFFECTOR_BASE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (EFFECTOR_BASE_SVNT_HAS_DLL)
-#  define EFFECTOR_BASE_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && EFFECTOR_BASE_SVNT_HAS_DLL */
-
-#if !defined (EFFECTOR_BASE_SVNT_HAS_DLL)
-#  define EFFECTOR_BASE_SVNT_HAS_DLL 1
-#endif /* ! EFFECTOR_BASE_SVNT_HAS_DLL */
-
-#if defined (EFFECTOR_BASE_SVNT_HAS_DLL) && (EFFECTOR_BASE_SVNT_HAS_DLL == 1)
-#  if defined (EFFECTOR_BASE_SVNT_BUILD_DLL)
-#    define EFFECTOR_BASE_SVNT_Export ACE_Proper_Export_Flag
-#    define EFFECTOR_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define EFFECTOR_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* EFFECTOR_BASE_SVNT_BUILD_DLL */
-#    define EFFECTOR_BASE_SVNT_Export ACE_Proper_Import_Flag
-#    define EFFECTOR_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define EFFECTOR_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* EFFECTOR_BASE_SVNT_BUILD_DLL */
-#else /* EFFECTOR_BASE_SVNT_HAS_DLL == 1 */
-#  define EFFECTOR_BASE_SVNT_Export
-#  define EFFECTOR_BASE_SVNT_SINGLETON_DECLARATION(T)
-#  define EFFECTOR_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* EFFECTOR_BASE_SVNT_HAS_DLL == 1 */
-
-// Set EFFECTOR_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (EFFECTOR_BASE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define EFFECTOR_BASE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define EFFECTOR_BASE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !EFFECTOR_BASE_SVNT_NTRACE */
-
-#if (EFFECTOR_BASE_SVNT_NTRACE == 1)
-#  define EFFECTOR_BASE_SVNT_TRACE(X)
-#else /* (EFFECTOR_BASE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define EFFECTOR_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (EFFECTOR_BASE_SVNT_NTRACE == 1) */
-
-#endif /* EFFECTOR_BASE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Effectors/Callback/Callback.mpc b/Effectors/Callback/Callback.mpc
index 6c9f870047e..a346b9a24ac 100644
--- a/Effectors/Callback/Callback.mpc
+++ b/Effectors/Callback/Callback.mpc
@@ -1,26 +1,31 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl Callback"
+// This file is generated with "generate_component_mpc.pl -n -b race_common Callback"
 
-project(Callback_idl_gen) : taoidldefaults, anytypecode, race_idl {
-  avoids += ace_for_tao
+project(Callback_idl_gen) : componentidldefaults , race_common  {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CALLBACK_STUB_Export \
               -Wb,stub_export_include=Callback_stub_export.h \
-              -Wb,skel_export_macro=CALLBACK_SVNT_Export \
-              -Wb,skel_export_include=Callback_svnt_export.h
+              -Wb,skel_export_macro=CALLBACK_SKEL_Export \
+              -Wb,skel_export_include=Callback_skel_export.h \
+              -Wb,exec_export_macro=CALLBACK_EXEC_Export \
+              -Wb,exec_export_include=Callback_exec_export.h
 
   IDL_Files {
     Callback.idl
   }
 }
 
-project(Callback_stub) : taolib, anytypecode, race_common {
-  avoids += ace_for_tao
-  after += Callback_idl_gen
-  libout       = $(ACE_ROOT)/lib
+project(Callback_stub) : ccm_stub , race_common  {
+  after += Callback_idl_gen 
+  libs  += 
+  
+  
   sharedname = Callback_stub
   dynamicflags   = CALLBACK_STUB_BUILD_DLL
 
+  IDL_Files {
+  }
+
   Source_Files {
     CallbackC.cpp
   }
@@ -34,3 +39,32 @@ project(Callback_stub) : taolib, anytypecode, race_common {
     CallbackC.inl
   }
 }
+
+
+project(Callback_skel) : ciao_executor , race_common  {
+  after      +=  Callback_stub Callback_lem_stub
+  sharedname  = Callback_skel
+  libs       += Callback_stub
+ 
+  
+  
+  dynamicflags = CALLBACK_SKEL_BUILD_DLL
+  
+  IDL_Files {
+  }
+
+  Source_Files {
+    CallbackS.cpp
+  }
+
+  Header_Files {
+    CallbackS.h
+    Callback_skel_export.h
+  }
+
+  Inline_Files {
+    CallbackS.inl
+  }
+}
+
+
diff --git a/Effectors/Callback/Callback_stub_export.h b/Effectors/Callback/Callback_stub_export.h
deleted file mode 100644
index 7caabd71e59..00000000000
--- a/Effectors/Callback/Callback_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CALLBACK_STUB
-// ------------------------------
-#ifndef CALLBACK_STUB_EXPORT_H
-#define CALLBACK_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CALLBACK_STUB_HAS_DLL)
-#  define CALLBACK_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CALLBACK_STUB_HAS_DLL */
-
-#if !defined (CALLBACK_STUB_HAS_DLL)
-#  define CALLBACK_STUB_HAS_DLL 1
-#endif /* ! CALLBACK_STUB_HAS_DLL */
-
-#if defined (CALLBACK_STUB_HAS_DLL) && (CALLBACK_STUB_HAS_DLL == 1)
-#  if defined (CALLBACK_STUB_BUILD_DLL)
-#    define CALLBACK_STUB_Export ACE_Proper_Export_Flag
-#    define CALLBACK_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CALLBACK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CALLBACK_STUB_BUILD_DLL */
-#    define CALLBACK_STUB_Export ACE_Proper_Import_Flag
-#    define CALLBACK_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CALLBACK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CALLBACK_STUB_BUILD_DLL */
-#else /* CALLBACK_STUB_HAS_DLL == 1 */
-#  define CALLBACK_STUB_Export
-#  define CALLBACK_STUB_SINGLETON_DECLARATION(T)
-#  define CALLBACK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CALLBACK_STUB_HAS_DLL == 1 */
-
-// Set CALLBACK_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CALLBACK_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CALLBACK_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CALLBACK_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CALLBACK_STUB_NTRACE */
-
-#if (CALLBACK_STUB_NTRACE == 1)
-#  define CALLBACK_STUB_TRACE(X)
-#else /* (CALLBACK_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CALLBACK_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CALLBACK_STUB_NTRACE == 1) */
-
-#endif /* CALLBACK_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Effectors/Callback/Callback_svnt_export.h b/Effectors/Callback/Callback_svnt_export.h
deleted file mode 100644
index ae9c40aa083..00000000000
--- a/Effectors/Callback/Callback_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CALLBACK_SVNT
-// ------------------------------
-#ifndef CALLBACK_SVNT_EXPORT_H
-#define CALLBACK_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CALLBACK_SVNT_HAS_DLL)
-#  define CALLBACK_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CALLBACK_SVNT_HAS_DLL */
-
-#if !defined (CALLBACK_SVNT_HAS_DLL)
-#  define CALLBACK_SVNT_HAS_DLL 1
-#endif /* ! CALLBACK_SVNT_HAS_DLL */
-
-#if defined (CALLBACK_SVNT_HAS_DLL) && (CALLBACK_SVNT_HAS_DLL == 1)
-#  if defined (CALLBACK_SVNT_BUILD_DLL)
-#    define CALLBACK_SVNT_Export ACE_Proper_Export_Flag
-#    define CALLBACK_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CALLBACK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CALLBACK_SVNT_BUILD_DLL */
-#    define CALLBACK_SVNT_Export ACE_Proper_Import_Flag
-#    define CALLBACK_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CALLBACK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CALLBACK_SVNT_BUILD_DLL */
-#else /* CALLBACK_SVNT_HAS_DLL == 1 */
-#  define CALLBACK_SVNT_Export
-#  define CALLBACK_SVNT_SINGLETON_DECLARATION(T)
-#  define CALLBACK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CALLBACK_SVNT_HAS_DLL == 1 */
-
-// Set CALLBACK_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CALLBACK_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CALLBACK_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CALLBACK_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CALLBACK_SVNT_NTRACE */
-
-#if (CALLBACK_SVNT_NTRACE == 1)
-#  define CALLBACK_SVNT_TRACE(X)
-#else /* (CALLBACK_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CALLBACK_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CALLBACK_SVNT_NTRACE == 1) */
-
-#endif /* CALLBACK_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Effectors/EUCON/ApplicationActuator_exec.cpp b/Effectors/EUCON/ApplicationActuator_exec.cpp
index 227c468f370..67dd756ac49 100644
--- a/Effectors/EUCON/ApplicationActuator_exec.cpp
+++ b/Effectors/EUCON/ApplicationActuator_exec.cpp
@@ -12,7 +12,7 @@ namespace CIAO
       namespace CIDL_EUCON_Effector_Impl
       {
         ApplicationActuator_exec_i::ApplicationActuator_exec_i
-        (EUCON_Effector_Context *context,
+        (CIAO_CIAO_RACE_Effector_EUCON_Effector_Impl::EUCON_Effector_Context *context,
          Logger &logger)
           : context_ (context),
             logger_ (logger)
@@ -121,8 +121,11 @@ namespace CIAO
           msg.str ("");
           try
             {
+              int argc = 0;
+              
               ::CORBA::ORB_ptr orb =
-                this->context_->_ciao_the_Container()->the_ORB();
+                CORBA::ORB_init (argc, 0);
+              
               /// Trying to get the object reference from the Naming Service.
               CORBA::Object_var naming_obj =
                 orb->resolve_initial_references ("NameService");
diff --git a/Effectors/EUCON/ApplicationActuator_exec.h b/Effectors/EUCON/ApplicationActuator_exec.h
index f7d3dcdac09..86d86d6d9cc 100644
--- a/Effectors/EUCON/ApplicationActuator_exec.h
+++ b/Effectors/EUCON/ApplicationActuator_exec.h
@@ -5,7 +5,7 @@
 #include /**/ "ace/pre.h"
 
 #include "EUCON_Effector_svnt.h"
-#include "Logger.h"
+#include "utils/Logger.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/SString.h"
@@ -32,7 +32,7 @@ namespace CIAO
         {
           public:
           ApplicationActuator_exec_i
-            (EUCON_Effector_Context *context,
+            (CIAO_CIAO_RACE_Effector_EUCON_Effector_Impl::EUCON_Effector_Context *context,
              Logger &logger);
 
           virtual ~ApplicationActuator_exec_i (void);
@@ -61,7 +61,7 @@ namespace CIAO
 
           Logger &logger_;
 
-          EUCON_Effector_Context *context_;
+          CIAO_CIAO_RACE_Effector_EUCON_Effector_Impl::EUCON_Effector_Context *context_;
 
           CosNaming::NamingContext_var naming_context_;
 
diff --git a/Effectors/EUCON/EUCON_Effector.cidl b/Effectors/EUCON/EUCON_Effector.cidl
deleted file mode 100644
index 86efe89866e..00000000000
--- a/Effectors/EUCON/EUCON_Effector.cidl
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-#ifndef RACE_EUCON_EFFECTOR_CIDL
-#define RACE_EUCON_EFFECTOR_CIDL
-
-/*
- * @file EUCON_Effector.cidl
- *
- * @brief This file contains the EUCON Effector component implementation
- * defination.
- */
-
-#include "EUCON_Effector.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    module Effector
-    {
-      composition session EUCON_Effector_Impl
-      {
-        home executor EUCON_Effector_Home_Exec
-        {
-          implements EUCON_Effector_Home;
-          manages    EUCON_Effector_Exec;
-        };
-      };
-    };
-  };
-};
-
-
-#endif /* RACE_EUCON_EFFECTOR_CIDL */
diff --git a/Effectors/EUCON/EUCON_Effector.idl b/Effectors/EUCON/EUCON_Effector.idl
index b434594139c..f1fd859d652 100644
--- a/Effectors/EUCON/EUCON_Effector.idl
+++ b/Effectors/EUCON/EUCON_Effector.idl
@@ -13,6 +13,7 @@
 
 #include <Components.idl>
 #include "Effectors/Base/Effector_Base.idl"
+#include "Effectors/Base/Effector_BaseE.idl"
 
 
 module CIAO
diff --git a/Effectors/EUCON/EUCON_Effector.mpc b/Effectors/EUCON/EUCON_Effector.mpc
index 8ecab7f9ba9..706bf5b180b 100644
--- a/Effectors/EUCON/EUCON_Effector.mpc
+++ b/Effectors/EUCON/EUCON_Effector.mpc
@@ -1,99 +1,90 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl EUCON_Effector"
+// This file is generated with "generate_component_mpc.pl -b race_common -p Effector_Base EUCON_Effector"
 
-project(EUCON_Effector_stub) : ccm_stub, dance_deployment_stub, race_idl {
-  after += Effector_Base_stub
-  sharedname = EUCON_Effector_Component_stub
-  libs += Effector_Base_stub
-
-  dynamicflags   = EUCON_EFFECTOR_STUB_BUILD_DLL
-
-
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=EUCON_EFFECTOR_STUB_Export \
+project(Effector_Base_EUCON_Effector_idl_gen) : componentidldefaults , race_idl  {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=EUCON_EFFECTOR_STUB_Export \
               -Wb,stub_export_include=EUCON_Effector_stub_export.h \
               -Wb,skel_export_macro=EUCON_EFFECTOR_SVNT_Export \
-              -Wb,skel_export_include=EUCON_Effector_svnt_export.h
+              -Wb,skel_export_include=EUCON_Effector_svnt_export.h \
+              -Wb,exec_export_macro=EUCON_EFFECTOR_EXEC_Export \
+              -Wb,exec_export_include=EUCON_Effector_exec_export.h
 
+  idlflags -= -Gsv
+              
   IDL_Files {
     EUCON_Effector.idl
   }
+}
 
-  Source_Files {
-    EUCON_EffectorC.cpp
-  }
+project(Effector_Base_EUCON_Effector_lem_gen) : ciaoidldefaults , race_idl  {
+  after += Effector_Base_EUCON_Effector_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=EUCON_EFFECTOR_LEM_STUB_Export \
+              -Wb,stub_export_include=EUCON_Effector_lem_stub_export.h \
+              -SS -Gxhst
 
-  Header_Files {
-    EUCON_EffectorC.h
-    EUCON_Effector_stub_export.h
-  }
-
-  Inline_Files {
-    EUCON_EffectorC.inl
+  IDL_Files {
+    EUCON_EffectorE.idl
   }
 }
 
-project(EUCON_Effector_svnt) : ciao_servant, race_idl {
-  after      += EUCON_Effector_stub \
-                Effector_Base_svnt
-
-  sharedname  = EUCON_Effector_Component_svnt
-  libs       += EUCON_Effector_Component_stub \
-                Effector_Base_svnt\
-                Effector_Base_stub
-
-  dynamicflags = EUCON_EFFECTOR_SVNT_BUILD_DLL
-  idlflags -= -GT
-  idlflags += -St -SS \
-              -Wb,export_macro=EUCON_EFFECTOR_SVNT_Export \
-              -Wb,export_include=EUCON_Effector_svnt_export.h
-
-
-  CIDL_Files {
-    EUCON_Effector.cidl
-  }
+project(Effector_Base_EUCON_Effector_lem_stub) : ccm_svnt , race_common, race_effector_lem, race_effector_callback_stub  {
+  after += Effector_Base_EUCON_Effector_lem_gen Effector_Base_EUCON_Effector_stub Effector_Base_stub
+  libs  += Effector_Base_stub EUCON_Effector_stub
+  
+  
+  sharedname = EUCON_Effector_lem_stub
+  dynamicflags   = EUCON_EFFECTOR_LEM_STUB_BUILD_DLL
 
   IDL_Files {
-    EUCON_EffectorE.idl
   }
 
   Source_Files {
     EUCON_EffectorEC.cpp
-    EUCON_EffectorS.cpp
-    EUCON_Effector_svnt.cpp
   }
 
   Header_Files {
     EUCON_EffectorEC.h
-    EUCON_EffectorS.h
-    EUCON_Effector_svnt.h
-    EUCON_Effector_svnt_export.h
+    EUCON_Effector_lem_stub_export.h
   }
 
   Inline_Files {
     EUCON_EffectorEC.inl
-    EUCON_EffectorS.inl
   }
 }
 
-project(EUCON_Effector_exec) : ciao_executor, race_common {
-  after += EUCON_Effector_svnt \
-           Callback_stub \
-           OpString_stub
+project(Effector_Base_EUCON_Effector_stub) : ccm_stub , race_common, race_effector_stub, race_effector_callback_stub  {
+  after += Effector_Base_EUCON_Effector_idl_gen Effector_Base_stub
+  libs  += Effector_Base_stub
+  
+  
+  sharedname = EUCON_Effector_stub
+  dynamicflags   = EUCON_EFFECTOR_STUB_BUILD_DLL
 
-  sharedname = EUCON_Effector_Component_exec
+  IDL_Files {
+  }
 
-  libs += EUCON_Effector_Component_stub \
-          EUCON_Effector_Component_svnt \
-          Effector_Base_svnt        \
-          Effector_Base_stub \
-          RACE_utils \
-          Callback_stub \
-          OpString_stub
+  Source_Files {
+    EUCON_EffectorC.cpp
+  }
 
- includes += $(RACE_ROOT)/utils
+  Header_Files {
+    EUCON_EffectorC.h
+    EUCON_Effector_stub_export.h
+  }
+
+  Inline_Files {
+    EUCON_EffectorC.inl
+  }
+}
 
+project(Effector_Base_EUCON_Effector_exec) : ciao_executor , race_common, race_utils, naming, race_effector_lem, race_effector_callback_stub  {
+  after   += Effector_Base_EUCON_Effector_lem_stub Effector_Base_EUCON_Effector_stub Effector_Base_EUCON_Effector_svnt
+  sharedname = EUCON_Effector_exec
+  libs += EUCON_Effector_stub EUCON_Effector_lem_stub Effector_Base_stub EUCON_Effector_svnt
+  
+  
   dynamicflags   = EUCON_EFFECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -101,15 +92,47 @@ project(EUCON_Effector_exec) : ciao_executor, race_common {
 
   Source_Files {
     EUCON_Effector_exec.cpp
-    ApplicationActuator_exec.cpp
     SystemActuator_exec.cpp
+    ApplicationActuator_exec.cpp
   }
 
   Header_Files {
     EUCON_Effector_exec.h
     EUCON_Effector_exec_export.h
-    ApplicationActuator_exec.h
-    SystemActuator_exec.h
-    Utility.h
+  }
+
+  Inline_Files {
   }
 }
+
+
+project(Effector_Base_EUCON_Effector_svnt) : ciao_servant , race_common, race_effector_skel, race_effector_callback_skel  {
+  after      += Effector_Base_skel  Effector_Base_EUCON_Effector_lem_stub
+  libs       += EUCON_Effector_stub EUCON_Effector_lem_stub  \
+                Effector_Base_skel \
+                Effector_Base_stub
+  sharedname = EUCON_Effector_svnt
+  
+  
+  dynamicflags = EUCON_EFFECTOR_SVNT_BUILD_DLL
+  
+  IDL_Files {
+  }
+
+  Source_Files {
+    EUCON_EffectorS.cpp
+    EUCON_Effector_svnt.cpp
+  }
+
+  Header_Files {
+    EUCON_EffectorS.h
+    EUCON_Effector_svnt.h
+    EUCON_Effector_svnt_export.h
+  }
+
+  Inline_Files {
+    EUCON_EffectorS.inl
+  }
+}
+
+
diff --git a/Effectors/EUCON/EUCON_Effector_exec.cpp b/Effectors/EUCON/EUCON_Effector_exec.cpp
index 0d8dde90287..d646dd60fe8 100644
--- a/Effectors/EUCON/EUCON_Effector_exec.cpp
+++ b/Effectors/EUCON/EUCON_Effector_exec.cpp
@@ -52,7 +52,7 @@ namespace CIAO
           ::Components::SessionContext_ptr ctx)
         {
           this->context_ =
-            EUCON_Effector_Context::_narrow (ctx);
+            CIAO_CIAO_RACE_Effector_EUCON_Effector_Impl::EUCON_Effector_Context::_narrow (ctx);
 
           if (CORBA::is_nil (this->context_))
           {
diff --git a/Effectors/EUCON/EUCON_Effector_exec.h b/Effectors/EUCON/EUCON_Effector_exec.h
index 2a355b38d62..ee485560b87 100644
--- a/Effectors/EUCON/EUCON_Effector_exec.h
+++ b/Effectors/EUCON/EUCON_Effector_exec.h
@@ -12,7 +12,7 @@
 
 #include "EUCON_Effector_exec_export.h"
 #include "tao/LocalObject.h"
-#include "Logger.h"
+#include "utils/Logger.h"
 
 namespace CIAO
 {
@@ -23,7 +23,7 @@ namespace CIAO
       namespace CIDL_EUCON_Effector_Impl
       {
         class EUCON_EFFECTOR_EXEC_Export EUCON_Effector_exec_i
-          : public virtual EUCON_Effector_Exec,
+          : public virtual CIAO_CIAO_RACE_Effector_EUCON_Effector_Impl::EUCON_Effector_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
@@ -52,14 +52,14 @@ namespace CIAO
           virtual void ccm_remove ();
 
           private:
-          EUCON_Effector_Context *context_;
+          CIAO_CIAO_RACE_Effector_EUCON_Effector_Impl::EUCON_Effector_Context *context_;
 
           Logger logger_;
 
         };
 
         class EUCON_EFFECTOR_EXEC_Export EUCON_Effector_Home_exec_i
-          : public virtual EUCON_Effector_Home_Exec,
+          : public virtual CIAO_CIAO_RACE_Effector_EUCON_Effector_Impl::EUCON_Effector_Home_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
diff --git a/Effectors/EUCON/EUCON_Effector_exec_export.h b/Effectors/EUCON/EUCON_Effector_exec_export.h
deleted file mode 100644
index 32e9a35036f..00000000000
--- a/Effectors/EUCON/EUCON_Effector_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl EUCON_EFFECTOR_EXEC
-// ------------------------------
-#ifndef EUCON_EFFECTOR_EXEC_EXPORT_H
-#define EUCON_EFFECTOR_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (EUCON_EFFECTOR_EXEC_HAS_DLL)
-#  define EUCON_EFFECTOR_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && EUCON_EFFECTOR_EXEC_HAS_DLL */
-
-#if !defined (EUCON_EFFECTOR_EXEC_HAS_DLL)
-#  define EUCON_EFFECTOR_EXEC_HAS_DLL 1
-#endif /* ! EUCON_EFFECTOR_EXEC_HAS_DLL */
-
-#if defined (EUCON_EFFECTOR_EXEC_HAS_DLL) && (EUCON_EFFECTOR_EXEC_HAS_DLL == 1)
-#  if defined (EUCON_EFFECTOR_EXEC_BUILD_DLL)
-#    define EUCON_EFFECTOR_EXEC_Export ACE_Proper_Export_Flag
-#    define EUCON_EFFECTOR_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define EUCON_EFFECTOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* EUCON_EFFECTOR_EXEC_BUILD_DLL */
-#    define EUCON_EFFECTOR_EXEC_Export ACE_Proper_Import_Flag
-#    define EUCON_EFFECTOR_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define EUCON_EFFECTOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* EUCON_EFFECTOR_EXEC_BUILD_DLL */
-#else /* EUCON_EFFECTOR_EXEC_HAS_DLL == 1 */
-#  define EUCON_EFFECTOR_EXEC_Export
-#  define EUCON_EFFECTOR_EXEC_SINGLETON_DECLARATION(T)
-#  define EUCON_EFFECTOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* EUCON_EFFECTOR_EXEC_HAS_DLL == 1 */
-
-// Set EUCON_EFFECTOR_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (EUCON_EFFECTOR_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define EUCON_EFFECTOR_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define EUCON_EFFECTOR_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !EUCON_EFFECTOR_EXEC_NTRACE */
-
-#if (EUCON_EFFECTOR_EXEC_NTRACE == 1)
-#  define EUCON_EFFECTOR_EXEC_TRACE(X)
-#else /* (EUCON_EFFECTOR_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define EUCON_EFFECTOR_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (EUCON_EFFECTOR_EXEC_NTRACE == 1) */
-
-#endif /* EUCON_EFFECTOR_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Effectors/EUCON/EUCON_Effector_stub_export.h b/Effectors/EUCON/EUCON_Effector_stub_export.h
deleted file mode 100644
index 06db06018db..00000000000
--- a/Effectors/EUCON/EUCON_Effector_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl EUCON_EFFECTOR_STUB
-// ------------------------------
-#ifndef EUCON_EFFECTOR_STUB_EXPORT_H
-#define EUCON_EFFECTOR_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (EUCON_EFFECTOR_STUB_HAS_DLL)
-#  define EUCON_EFFECTOR_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && EUCON_EFFECTOR_STUB_HAS_DLL */
-
-#if !defined (EUCON_EFFECTOR_STUB_HAS_DLL)
-#  define EUCON_EFFECTOR_STUB_HAS_DLL 1
-#endif /* ! EUCON_EFFECTOR_STUB_HAS_DLL */
-
-#if defined (EUCON_EFFECTOR_STUB_HAS_DLL) && (EUCON_EFFECTOR_STUB_HAS_DLL == 1)
-#  if defined (EUCON_EFFECTOR_STUB_BUILD_DLL)
-#    define EUCON_EFFECTOR_STUB_Export ACE_Proper_Export_Flag
-#    define EUCON_EFFECTOR_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define EUCON_EFFECTOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* EUCON_EFFECTOR_STUB_BUILD_DLL */
-#    define EUCON_EFFECTOR_STUB_Export ACE_Proper_Import_Flag
-#    define EUCON_EFFECTOR_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define EUCON_EFFECTOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* EUCON_EFFECTOR_STUB_BUILD_DLL */
-#else /* EUCON_EFFECTOR_STUB_HAS_DLL == 1 */
-#  define EUCON_EFFECTOR_STUB_Export
-#  define EUCON_EFFECTOR_STUB_SINGLETON_DECLARATION(T)
-#  define EUCON_EFFECTOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* EUCON_EFFECTOR_STUB_HAS_DLL == 1 */
-
-// Set EUCON_EFFECTOR_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (EUCON_EFFECTOR_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define EUCON_EFFECTOR_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define EUCON_EFFECTOR_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !EUCON_EFFECTOR_STUB_NTRACE */
-
-#if (EUCON_EFFECTOR_STUB_NTRACE == 1)
-#  define EUCON_EFFECTOR_STUB_TRACE(X)
-#else /* (EUCON_EFFECTOR_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define EUCON_EFFECTOR_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (EUCON_EFFECTOR_STUB_NTRACE == 1) */
-
-#endif /* EUCON_EFFECTOR_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Effectors/EUCON/EUCON_Effector_svnt_export.h b/Effectors/EUCON/EUCON_Effector_svnt_export.h
deleted file mode 100644
index bb7f9af5b28..00000000000
--- a/Effectors/EUCON/EUCON_Effector_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl EUCON_EFFECTOR_SVNT
-// ------------------------------
-#ifndef EUCON_EFFECTOR_SVNT_EXPORT_H
-#define EUCON_EFFECTOR_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (EUCON_EFFECTOR_SVNT_HAS_DLL)
-#  define EUCON_EFFECTOR_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && EUCON_EFFECTOR_SVNT_HAS_DLL */
-
-#if !defined (EUCON_EFFECTOR_SVNT_HAS_DLL)
-#  define EUCON_EFFECTOR_SVNT_HAS_DLL 1
-#endif /* ! EUCON_EFFECTOR_SVNT_HAS_DLL */
-
-#if defined (EUCON_EFFECTOR_SVNT_HAS_DLL) && (EUCON_EFFECTOR_SVNT_HAS_DLL == 1)
-#  if defined (EUCON_EFFECTOR_SVNT_BUILD_DLL)
-#    define EUCON_EFFECTOR_SVNT_Export ACE_Proper_Export_Flag
-#    define EUCON_EFFECTOR_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define EUCON_EFFECTOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* EUCON_EFFECTOR_SVNT_BUILD_DLL */
-#    define EUCON_EFFECTOR_SVNT_Export ACE_Proper_Import_Flag
-#    define EUCON_EFFECTOR_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define EUCON_EFFECTOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* EUCON_EFFECTOR_SVNT_BUILD_DLL */
-#else /* EUCON_EFFECTOR_SVNT_HAS_DLL == 1 */
-#  define EUCON_EFFECTOR_SVNT_Export
-#  define EUCON_EFFECTOR_SVNT_SINGLETON_DECLARATION(T)
-#  define EUCON_EFFECTOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* EUCON_EFFECTOR_SVNT_HAS_DLL == 1 */
-
-// Set EUCON_EFFECTOR_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (EUCON_EFFECTOR_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define EUCON_EFFECTOR_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define EUCON_EFFECTOR_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !EUCON_EFFECTOR_SVNT_NTRACE */
-
-#if (EUCON_EFFECTOR_SVNT_NTRACE == 1)
-#  define EUCON_EFFECTOR_SVNT_TRACE(X)
-#else /* (EUCON_EFFECTOR_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define EUCON_EFFECTOR_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (EUCON_EFFECTOR_SVNT_NTRACE == 1) */
-
-#endif /* EUCON_EFFECTOR_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Input_Adapters/Base/Input_Adapter_Base.mpc b/Input_Adapters/Base/Input_Adapter_Base.mpc
index eefb81b2c6e..b16d197b94a 100644
--- a/Input_Adapters/Base/Input_Adapter_Base.mpc
+++ b/Input_Adapters/Base/Input_Adapter_Base.mpc
@@ -1,25 +1,62 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl Input_Adapter_Base"
+// This file is generated with "generate_component_mpc.pl -b race_common, dance_deployment_stub -n Input_Adapter_Base"
 
-project(Input_Adapter_Base_idl_gen) : taoidldefaults, anytypecode, race_idl {
-  avoids += ace_for_tao
+project(Input_Adapter_Base_idl_gen) : componentidldefaults , race_idl, dance_deployment_stub  {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=INPUT_ADAPTER_BASE_STUB_Export \
               -Wb,stub_export_include=Input_Adapter_Base_stub_export.h \
-              -Wb,skel_export_macro=INPUT_ADAPTER_BASE_SVNT_Export \
-              -Wb,skel_export_include=Input_Adapter_Base_svnt_export.h \
-              -I$(RACE_ROOT)
+              -Wb,skel_export_macro=INPUT_ADAPTER_BASE_SKEL_Export \
+              -Wb,skel_export_include=Input_Adapter_Base_skel_export.h \
+              -Wb,exec_export_macro=INPUT_ADAPTER_BASE_EXEC_Export \
+              -Wb,exec_export_include=Input_Adapter_Base_exec_export.h
 
   IDL_Files {
     Input_Adapter_Base.idl
   }
 }
 
-project(Input_Adapter_Base_stub) : ccm_stub, race_common {
-  avoids += ace_for_tao
-  after += Input_Adapter_Base_idl_gen  Conductor_stub
-  libs  += Conductor_Component_stub
+project(Input_Adapter_Base_lem_gen) : ciaoidldefaults , race_idl, dance_deployment_stub  {
+  after += Input_Adapter_Base_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=INPUT_ADAPTER_BASE_LEM_STUB_Export \
+              -Wb,stub_export_include=Input_Adapter_Base_lem_stub_export.h \
+              -SS -Gxhst
+
+  IDL_Files {
+    Input_Adapter_BaseE.idl
+  }
+}
+
+project(Input_Adapter_Base_lem_stub) : ccm_svnt , race_common, dance_deployment_stub, race_conductor_stub  {
+  after += Input_Adapter_Base_lem_gen Input_Adapter_Base_stub 
+  libs  +=  Input_Adapter_Base_stub
+  
+  
+  sharedname = Input_Adapter_Base_lem_stub
+  dynamicflags   = INPUT_ADAPTER_BASE_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Input_Adapter_BaseEC.cpp
+  }
 
+  Header_Files {
+    Input_Adapter_BaseEC.h
+    Input_Adapter_Base_lem_stub_export.h
+  }
+
+  Inline_Files {
+    Input_Adapter_BaseEC.inl
+  }
+}
+
+project(Input_Adapter_Base_stub) : ccm_stub , race_idl, dance_deployment_stub, race_conductor_stub  {
+  after += Input_Adapter_Base_idl_gen 
+  libs  += 
+  
+  
   sharedname = Input_Adapter_Base_stub
   dynamicflags   = INPUT_ADAPTER_BASE_STUB_BUILD_DLL
 
@@ -40,30 +77,32 @@ project(Input_Adapter_Base_stub) : ccm_stub, race_common {
   }
 }
 
-project(Input_Adapter_Base_svnt) : ciao_servant, race_common {
-  avoids += ace_for_tao
-  after      +=  Input_Adapter_Base_stub
-  sharedname  = Input_Adapter_Base_svnt
-  libs       += Input_Adapter_Base_stub \
-                Conductor_Component_stub
-
-  dynamicflags = INPUT_ADAPTER_BASE_SVNT_BUILD_DLL
-
-  CIDL_Files {
-  }
 
+project(Input_Adapter_Base_skel) : ciao_servant , race_common, dance_deployment_stub, race_conductor_stub  {
+  after      +=  Input_Adapter_Base_stub Input_Adapter_Base_lem_stub
+  sharedname  = Input_Adapter_Base_skel
+  libs       += Input_Adapter_Base_stub Input_Adapter_Base_lem_stub
+ 
+  
+  
+  dynamicflags = INPUT_ADAPTER_BASE_SKEL_BUILD_DLL
+  
   IDL_Files {
   }
 
   Source_Files {
     Input_Adapter_BaseS.cpp
+    Input_Adapter_Base_svnt.cpp
   }
 
   Header_Files {
     Input_Adapter_BaseS.h
+    Input_Adapter_Base_skel_export.h
   }
 
   Inline_Files {
     Input_Adapter_BaseS.inl
   }
 }
+
+
diff --git a/Input_Adapters/Base/Input_Adapter_Base_stub_export.h b/Input_Adapters/Base/Input_Adapter_Base_stub_export.h
deleted file mode 100644
index 59b5c307b76..00000000000
--- a/Input_Adapters/Base/Input_Adapter_Base_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl INPUT_ADAPTER_BASE_STUB
-// ------------------------------
-#ifndef INPUT_ADAPTER_BASE_STUB_EXPORT_H
-#define INPUT_ADAPTER_BASE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (INPUT_ADAPTER_BASE_STUB_HAS_DLL)
-#  define INPUT_ADAPTER_BASE_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && INPUT_ADAPTER_BASE_STUB_HAS_DLL */
-
-#if !defined (INPUT_ADAPTER_BASE_STUB_HAS_DLL)
-#  define INPUT_ADAPTER_BASE_STUB_HAS_DLL 1
-#endif /* ! INPUT_ADAPTER_BASE_STUB_HAS_DLL */
-
-#if defined (INPUT_ADAPTER_BASE_STUB_HAS_DLL) && (INPUT_ADAPTER_BASE_STUB_HAS_DLL == 1)
-#  if defined (INPUT_ADAPTER_BASE_STUB_BUILD_DLL)
-#    define INPUT_ADAPTER_BASE_STUB_Export ACE_Proper_Export_Flag
-#    define INPUT_ADAPTER_BASE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define INPUT_ADAPTER_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* INPUT_ADAPTER_BASE_STUB_BUILD_DLL */
-#    define INPUT_ADAPTER_BASE_STUB_Export ACE_Proper_Import_Flag
-#    define INPUT_ADAPTER_BASE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define INPUT_ADAPTER_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* INPUT_ADAPTER_BASE_STUB_BUILD_DLL */
-#else /* INPUT_ADAPTER_BASE_STUB_HAS_DLL == 1 */
-#  define INPUT_ADAPTER_BASE_STUB_Export
-#  define INPUT_ADAPTER_BASE_STUB_SINGLETON_DECLARATION(T)
-#  define INPUT_ADAPTER_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* INPUT_ADAPTER_BASE_STUB_HAS_DLL == 1 */
-
-// Set INPUT_ADAPTER_BASE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (INPUT_ADAPTER_BASE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define INPUT_ADAPTER_BASE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define INPUT_ADAPTER_BASE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !INPUT_ADAPTER_BASE_STUB_NTRACE */
-
-#if (INPUT_ADAPTER_BASE_STUB_NTRACE == 1)
-#  define INPUT_ADAPTER_BASE_STUB_TRACE(X)
-#else /* (INPUT_ADAPTER_BASE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define INPUT_ADAPTER_BASE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (INPUT_ADAPTER_BASE_STUB_NTRACE == 1) */
-
-#endif /* INPUT_ADAPTER_BASE_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Input_Adapters/Base/Input_Adapter_Base_svnt_export.h b/Input_Adapters/Base/Input_Adapter_Base_svnt_export.h
deleted file mode 100644
index df8ec58c13c..00000000000
--- a/Input_Adapters/Base/Input_Adapter_Base_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl INPUT_ADAPTER_BASE_SVNT
-// ------------------------------
-#ifndef INPUT_ADAPTER_BASE_SVNT_EXPORT_H
-#define INPUT_ADAPTER_BASE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (INPUT_ADAPTER_BASE_SVNT_HAS_DLL)
-#  define INPUT_ADAPTER_BASE_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && INPUT_ADAPTER_BASE_SVNT_HAS_DLL */
-
-#if !defined (INPUT_ADAPTER_BASE_SVNT_HAS_DLL)
-#  define INPUT_ADAPTER_BASE_SVNT_HAS_DLL 1
-#endif /* ! INPUT_ADAPTER_BASE_SVNT_HAS_DLL */
-
-#if defined (INPUT_ADAPTER_BASE_SVNT_HAS_DLL) && (INPUT_ADAPTER_BASE_SVNT_HAS_DLL == 1)
-#  if defined (INPUT_ADAPTER_BASE_SVNT_BUILD_DLL)
-#    define INPUT_ADAPTER_BASE_SVNT_Export ACE_Proper_Export_Flag
-#    define INPUT_ADAPTER_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define INPUT_ADAPTER_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* INPUT_ADAPTER_BASE_SVNT_BUILD_DLL */
-#    define INPUT_ADAPTER_BASE_SVNT_Export ACE_Proper_Import_Flag
-#    define INPUT_ADAPTER_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define INPUT_ADAPTER_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* INPUT_ADAPTER_BASE_SVNT_BUILD_DLL */
-#else /* INPUT_ADAPTER_BASE_SVNT_HAS_DLL == 1 */
-#  define INPUT_ADAPTER_BASE_SVNT_Export
-#  define INPUT_ADAPTER_BASE_SVNT_SINGLETON_DECLARATION(T)
-#  define INPUT_ADAPTER_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* INPUT_ADAPTER_BASE_SVNT_HAS_DLL == 1 */
-
-// Set INPUT_ADAPTER_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (INPUT_ADAPTER_BASE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define INPUT_ADAPTER_BASE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define INPUT_ADAPTER_BASE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !INPUT_ADAPTER_BASE_SVNT_NTRACE */
-
-#if (INPUT_ADAPTER_BASE_SVNT_NTRACE == 1)
-#  define INPUT_ADAPTER_BASE_SVNT_TRACE(X)
-#else /* (INPUT_ADAPTER_BASE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define INPUT_ADAPTER_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (INPUT_ADAPTER_BASE_SVNT_NTRACE == 1) */
-
-#endif /* INPUT_ADAPTER_BASE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl
deleted file mode 100644
index dff4c3f4a3f..00000000000
--- a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-#ifndef RACE_INTERACTIVE_INPUT_ADAPTER_CIDL
-#define RACE_INTERACTIVE_INPUT_ADAPTER_CIDL
-
-#include "Interactive_Input_Adapter.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    module Input_Adapter
-    {
-      composition session Interactive_IA_Component_Impl
-      {
-        home executor Interactive_IA_Component_Home_Exec
-        {
-          implements Interactive_IA_Component_Home;
-          manages    Interactive_IA_Component_Exec;
-        };
-      };
-    };
-  };
-};
-
-
-#endif /* RACE_INTERACTIVE_INPUT_ADAPTER_CIDL */
diff --git a/Input_Adapters/SA_POP_Input_Adapter/Admin_exec.cpp b/Input_Adapters/SA_POP_Input_Adapter/Admin_exec.cpp
index 709745eb273..e8b73970eae 100644
--- a/Input_Adapters/SA_POP_Input_Adapter/Admin_exec.cpp
+++ b/Input_Adapters/SA_POP_Input_Adapter/Admin_exec.cpp
@@ -9,7 +9,7 @@ namespace CIAO
     {
       namespace CIDL_SA_POP_IA_Component_Impl
       {
-        Admin_exec_i::Admin_exec_i (SA_POP_IA_Component_Context *context,
+        Admin_exec_i::Admin_exec_i (CIAO_CIAO_RACE_Input_Adapter_SA_POP_IA_Component_Impl::SA_POP_IA_Component_Context *context,
                                     Logger &logger)
           : logger_ (logger)
         {
diff --git a/Input_Adapters/SA_POP_Input_Adapter/Admin_exec.h b/Input_Adapters/SA_POP_Input_Adapter/Admin_exec.h
index 47f74393a3f..ed295631ea8 100644
--- a/Input_Adapters/SA_POP_Input_Adapter/Admin_exec.h
+++ b/Input_Adapters/SA_POP_Input_Adapter/Admin_exec.h
@@ -4,7 +4,7 @@
 #include "SA_POP_Input_Adapter_svnt.h"
 #include "SA_POP_Input_Adapter_exec_export.h"
 #include "tao/LocalObject.h"
-#include "Logger.h"
+#include "utils/Logger.h"
 
 namespace CIAO
 {
@@ -19,7 +19,7 @@ namespace CIAO
             public virtual TAO_Local_RefCounted_Object
         {
           public:
-          Admin_exec_i (SA_POP_IA_Component_Context *context,
+          Admin_exec_i (CIAO_CIAO_RACE_Input_Adapter_SA_POP_IA_Component_Impl::SA_POP_IA_Component_Context *context,
                         Logger &logger);
 
           virtual ~Admin_exec_i (void);
diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.cidl b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.cidl
deleted file mode 100644
index f60bf2bd352..00000000000
--- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.cidl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-#ifndef RACE_SA_POP_INPUT_ADAPTER_CIDL
-#define RACE_SA_POP_INPUT_ADAPTER_CIDL
-#include "SA_POP_Input_Adapter.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    module Input_Adapter
-    {
-      composition session SA_POP_IA_Component_Impl
-      {
-        home executor SA_POP_IA_Component_Home_Exec
-        {
-          implements SA_POP_IA_Component_Home;
-          manages    SA_POP_IA_Component_Exec;
-        };
-      };
-    };
-  };
-};
-
-#endif /* RACE_SA_POP_INPUT_ADAPTER_CIDL */
diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.idl b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.idl
index b8484ce636a..abf9e1d1d86 100644
--- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.idl
+++ b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.idl
@@ -6,6 +6,7 @@
 #include "common/OpString.idl"
 #include "common/RACE_common.idl"
 #include "Input_Adapters/Base/Input_Adapter_Base.idl"
+#include "Input_Adapters/Base/Input_Adapter_BaseE.idl"
 
 module CIAO
 {
diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc
index afa7169b8eb..d2bbd15a545 100644
--- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc
+++ b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc
@@ -1,94 +1,133 @@
-project(SA_POP_Input_Adapter_stub): ccm_stub, dance_deployment_stub, race_idl {
+// $Id$
+// This file is generated with "generate_component_mpc.pl -b race_opstring, dance_deployment_stub SA_POP_Input_Adapter"
 
-  sharedname = SA_POP_IA_Component_stub
-
-  after += OpString_stub \
-           Input_Adapter_Base_stub
-
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=SA_POP_INPUT_ADAPTER_STUB_Export \
+project(SA_POP_Input_Adapter_idl_gen) : componentidldefaults , race_idl, dance_deployment_stub  {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SA_POP_INPUT_ADAPTER_STUB_Export \
               -Wb,stub_export_include=SA_POP_Input_Adapter_stub_export.h \
               -Wb,skel_export_macro=SA_POP_INPUT_ADAPTER_SVNT_Export \
-              -Wb,skel_export_include=SA_POP_Input_Adapter_svnt_export.h
-
-  dynamicflags   = SA_POP_INPUT_ADAPTER_STUB_BUILD_DLL
-
-  libs += OpString_stub \
-          Input_Adapter_Base_stub \
-          RACE_common_stub
+              -Wb,skel_export_include=SA_POP_Input_Adapter_svnt_export.h \
+              -Wb,exec_export_macro=SA_POP_INPUT_ADAPTER_EXEC_Export \
+              -Wb,exec_export_include=SA_POP_Input_Adapter_exec_export.h
 
   IDL_Files {
     SA_POP_Input_Adapter.idl
   }
+}
 
-  Source_Files {
-    SA_POP_Input_AdapterC.cpp
+project(SA_POP_Input_Adapter_lem_gen) : ciaoidldefaults , race_idl, dance_deployment_stub  {
+  after += SA_POP_Input_Adapter_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SA_POP_INPUT_ADAPTER_LEM_STUB_Export \
+              -Wb,stub_export_include=SA_POP_Input_Adapter_lem_stub_export.h \
+              -SS -Gxhst
+
+  IDL_Files {
+    SA_POP_Input_AdapterE.idl
   }
 }
 
-project(SA_POP_Input_Adapter_svnt) : ciao_servant, race_idl, dance_deployment_stub {
+project(SA_POP_Input_Adapter_lem_stub) : ccm_svnt , race_opstring, dance_deployment_stub, race_ia_lem  {
+  after += SA_POP_Input_Adapter_lem_gen SA_POP_Input_Adapter_stub 
+  libs  +=  SA_POP_Input_Adapter_stub
+  
+  
+  sharedname = SA_POP_Input_Adapter_lem_stub
+  dynamicflags   = SA_POP_INPUT_ADAPTER_LEM_STUB_BUILD_DLL
 
-  sharedname  = SA_POP_IA_Component_svnt
+  IDL_Files {
+  }
 
-  after      +=  SA_POP_Input_Adapter_stub \
-                 Input_Adapter_Base_svnt
+  Source_Files {
+    SA_POP_Input_AdapterEC.cpp
+  }
+
+  Header_Files {
+    SA_POP_Input_AdapterEC.h
+    SA_POP_Input_Adapter_lem_stub_export.h
+  }
+
+  Inline_Files {
+    SA_POP_Input_AdapterEC.inl
+  }
+}
 
-  libs       += SA_POP_IA_Component_stub \
-                OpString_stub \
-                Conductor_Component_stub \
-                RACE_common_stub \
-                Input_Adapter_Base_stub \
-                Input_Adapter_Base_svnt
+project(SA_POP_Input_Adapter_stub) : ccm_stub , race_opstring, dance_deployment_stub, race_ia_stub  {
+  after += SA_POP_Input_Adapter_idl_gen 
+  libs  += 
+  
+  
+  sharedname = SA_POP_Input_Adapter_stub
+  dynamicflags   = SA_POP_INPUT_ADAPTER_STUB_BUILD_DLL
 
-  idlflags -= -GT
-  idlflags += -St -SS \
-              -Wb,export_macro=SA_POP_INPUT_ADAPTER_SVNT_Export \
-              -Wb,export_include=SA_POP_Input_Adapter_svnt_export.h
+  IDL_Files {
+  }
 
-  dynamicflags = SA_POP_INPUT_ADAPTER_SVNT_BUILD_DLL
+  Source_Files {
+    SA_POP_Input_AdapterC.cpp
+  }
 
+  Header_Files {
+    SA_POP_Input_AdapterC.h
+    SA_POP_Input_Adapter_stub_export.h
+  }
 
-  CIDL_Files {
-    SA_POP_Input_Adapter.cidl
+  Inline_Files {
+    SA_POP_Input_AdapterC.inl
   }
+}
+
+project(SA_POP_Input_Adapter_exec) : ciao_executor , race_opstring, dance_deployment_stub, race_ia_lem, race_utils, race_conductor_stub  {
+  after   += SA_POP_Input_Adapter_lem_stub SA_POP_Input_Adapter_stub SA_POP_Input_Adapter_svnt
+  sharedname = SA_POP_Input_Adapter_exec
+  libs += SA_POP_Input_Adapter_stub SA_POP_Input_Adapter_lem_stub SA_POP_Input_Adapter_svnt
+  
+  
+  dynamicflags   = SA_POP_INPUT_ADAPTER_EXEC_BUILD_DLL
 
   IDL_Files {
-    SA_POP_Input_AdapterE.idl
   }
 
   Source_Files {
-    SA_POP_Input_AdapterEC.cpp
-    SA_POP_Input_AdapterS.cpp
-    SA_POP_Input_Adapter_svnt.cpp
+    SA_POP_Input_Adapter_exec.cpp
+    Admin_exec.cpp
   }
-}
 
-project(SA_POP_Input_Adapter_exec) : ciao_executor, ciao_config_handlers, race_common {
+  Header_Files {
+    SA_POP_Input_Adapter_exec.h
+    SA_POP_Input_Adapter_exec_export.h
+  }
 
- sharedname = SA_POP_IA_Component_exec
+  Inline_Files {
+  }
+}
 
- after   += SA_POP_Input_Adapter_svnt SA_POP_Component_stub RACE_utils
 
- libs += SA_POP_IA_Component_stub \
-         SA_POP_IA_Component_svnt \
-         OpString_stub \
-         Conductor_Component_stub \
-         RACE_common_stub \
-         RACE_utils \
-         Input_Adapter_Base_stub \
-         Input_Adapter_Base_svnt
+project(SA_POP_Input_Adapter_svnt) : ciao_servant , race_opstring, dance_deployment_stub, race_ia_skel, race_ia_lem, race_conductor_stub  {
+  after      +=   SA_POP_Input_Adapter_lem_stub
+  sharedname  = SA_POP_Input_Adapter_svnt
+  libs       += SA_POP_Input_Adapter_stub SA_POP_Input_Adapter_lem_stub  
+  
+  
+  dynamicflags = SA_POP_INPUT_ADAPTER_SVNT_BUILD_DLL
+  
+  IDL_Files {
+  }
 
- includes += $(RACE_ROOT)/utils
+  Source_Files {
+    SA_POP_Input_AdapterS.cpp
+    SA_POP_Input_Adapter_svnt.cpp
+  }
 
- dynamicflags   = SA_POP_INPUT_ADAPTER_EXEC_BUILD_DLL
+  Header_Files {
+    SA_POP_Input_AdapterS.h
+    SA_POP_Input_Adapter_svnt.h
+    SA_POP_Input_Adapter_svnt_export.h
+  }
 
- IDL_Files {
+  Inline_Files {
+    SA_POP_Input_AdapterS.inl
+  }
+}
 
- }
 
- Source_Files {
-   Admin_exec.cpp
-   SA_POP_Input_Adapter_exec.cpp
- }
-}
diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.cpp b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.cpp
index abbbbf2c379..5e5ea15b0c7 100644
--- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.cpp
+++ b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.cpp
@@ -35,7 +35,7 @@ namespace CIAO
         (::Components::SessionContext_ptr ctx)
         {
           this->context_ =
-            SA_POP_IA_Component_Context::_narrow (ctx);
+            CIAO_CIAO_RACE_Input_Adapter_SA_POP_IA_Component_Impl::SA_POP_IA_Component_Context::_narrow (ctx);
 
           if (this->context_ == 0)
             {
diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.h b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.h
index 8cca4e5be8c..150c2bb0123 100644
--- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.h
+++ b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.h
@@ -4,7 +4,7 @@
 #include "SA_POP_Input_Adapter_svnt.h"
 #include "SA_POP_Input_Adapter_exec_export.h"
 #include "tao/LocalObject.h"
-#include "Logger.h"
+#include "utils/Logger.h"
 
 namespace CIAO
 {
@@ -15,7 +15,7 @@ namespace CIAO
       namespace CIDL_SA_POP_IA_Component_Impl
       {
         class SA_POP_INPUT_ADAPTER_EXEC_Export SA_POP_IA_Component_exec_i
-          : public virtual SA_POP_IA_Component_Exec,
+          : public virtual CIAO_CIAO_RACE_Input_Adapter_SA_POP_IA_Component_Impl::SA_POP_IA_Component_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
@@ -40,14 +40,14 @@ namespace CIAO
           virtual void ccm_remove ();
 
           protected:
-          SA_POP_IA_Component_Context *context_;
+          CIAO_CIAO_RACE_Input_Adapter_SA_POP_IA_Component_Impl::SA_POP_IA_Component_Context *context_;
 
           private:
           Logger logger_;
         };
 
         class SA_POP_INPUT_ADAPTER_EXEC_Export SA_POP_IA_Component_Home_exec_i
-          : public virtual SA_POP_IA_Component_Home_Exec,
+          : public virtual CIAO_CIAO_RACE_Input_Adapter_SA_POP_IA_Component_Impl::SA_POP_IA_Component_Home_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec_export.h b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec_export.h
deleted file mode 100644
index f67430db964..00000000000
--- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SA_POP_INPUT_ADAPTER_EXEC
-// ------------------------------
-#ifndef SA_POP_INPUT_ADAPTER_EXEC_EXPORT_H
-#define SA_POP_INPUT_ADAPTER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SA_POP_INPUT_ADAPTER_EXEC_HAS_DLL)
-#  define SA_POP_INPUT_ADAPTER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SA_POP_INPUT_ADAPTER_EXEC_HAS_DLL */
-
-#if !defined (SA_POP_INPUT_ADAPTER_EXEC_HAS_DLL)
-#  define SA_POP_INPUT_ADAPTER_EXEC_HAS_DLL 1
-#endif /* ! SA_POP_INPUT_ADAPTER_EXEC_HAS_DLL */
-
-#if defined (SA_POP_INPUT_ADAPTER_EXEC_HAS_DLL) && (SA_POP_INPUT_ADAPTER_EXEC_HAS_DLL == 1)
-#  if defined (SA_POP_INPUT_ADAPTER_EXEC_BUILD_DLL)
-#    define SA_POP_INPUT_ADAPTER_EXEC_Export ACE_Proper_Export_Flag
-#    define SA_POP_INPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_INPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SA_POP_INPUT_ADAPTER_EXEC_BUILD_DLL */
-#    define SA_POP_INPUT_ADAPTER_EXEC_Export ACE_Proper_Import_Flag
-#    define SA_POP_INPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_INPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SA_POP_INPUT_ADAPTER_EXEC_BUILD_DLL */
-#else /* SA_POP_INPUT_ADAPTER_EXEC_HAS_DLL == 1 */
-#  define SA_POP_INPUT_ADAPTER_EXEC_Export
-#  define SA_POP_INPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T)
-#  define SA_POP_INPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SA_POP_INPUT_ADAPTER_EXEC_HAS_DLL == 1 */
-
-// Set SA_POP_INPUT_ADAPTER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SA_POP_INPUT_ADAPTER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SA_POP_INPUT_ADAPTER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SA_POP_INPUT_ADAPTER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SA_POP_INPUT_ADAPTER_EXEC_NTRACE */
-
-#if (SA_POP_INPUT_ADAPTER_EXEC_NTRACE == 1)
-#  define SA_POP_INPUT_ADAPTER_EXEC_TRACE(X)
-#else /* (SA_POP_INPUT_ADAPTER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SA_POP_INPUT_ADAPTER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SA_POP_INPUT_ADAPTER_EXEC_NTRACE == 1) */
-
-#endif /* SA_POP_INPUT_ADAPTER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_stub_export.h b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_stub_export.h
deleted file mode 100644
index ee04a5432e6..00000000000
--- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SA_POP_INPUT_ADAPTER_STUB
-// ------------------------------
-#ifndef SA_POP_INPUT_ADAPTER_STUB_EXPORT_H
-#define SA_POP_INPUT_ADAPTER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SA_POP_INPUT_ADAPTER_STUB_HAS_DLL)
-#  define SA_POP_INPUT_ADAPTER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SA_POP_INPUT_ADAPTER_STUB_HAS_DLL */
-
-#if !defined (SA_POP_INPUT_ADAPTER_STUB_HAS_DLL)
-#  define SA_POP_INPUT_ADAPTER_STUB_HAS_DLL 1
-#endif /* ! SA_POP_INPUT_ADAPTER_STUB_HAS_DLL */
-
-#if defined (SA_POP_INPUT_ADAPTER_STUB_HAS_DLL) && (SA_POP_INPUT_ADAPTER_STUB_HAS_DLL == 1)
-#  if defined (SA_POP_INPUT_ADAPTER_STUB_BUILD_DLL)
-#    define SA_POP_INPUT_ADAPTER_STUB_Export ACE_Proper_Export_Flag
-#    define SA_POP_INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SA_POP_INPUT_ADAPTER_STUB_BUILD_DLL */
-#    define SA_POP_INPUT_ADAPTER_STUB_Export ACE_Proper_Import_Flag
-#    define SA_POP_INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SA_POP_INPUT_ADAPTER_STUB_BUILD_DLL */
-#else /* SA_POP_INPUT_ADAPTER_STUB_HAS_DLL == 1 */
-#  define SA_POP_INPUT_ADAPTER_STUB_Export
-#  define SA_POP_INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T)
-#  define SA_POP_INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SA_POP_INPUT_ADAPTER_STUB_HAS_DLL == 1 */
-
-// Set SA_POP_INPUT_ADAPTER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SA_POP_INPUT_ADAPTER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SA_POP_INPUT_ADAPTER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SA_POP_INPUT_ADAPTER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SA_POP_INPUT_ADAPTER_STUB_NTRACE */
-
-#if (SA_POP_INPUT_ADAPTER_STUB_NTRACE == 1)
-#  define SA_POP_INPUT_ADAPTER_STUB_TRACE(X)
-#else /* (SA_POP_INPUT_ADAPTER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SA_POP_INPUT_ADAPTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SA_POP_INPUT_ADAPTER_STUB_NTRACE == 1) */
-
-#endif /* SA_POP_INPUT_ADAPTER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_svnt_export.h b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_svnt_export.h
deleted file mode 100644
index cc3350f5671..00000000000
--- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SA_POP_INPUT_ADAPTER_SVNT
-// ------------------------------
-#ifndef SA_POP_INPUT_ADAPTER_SVNT_EXPORT_H
-#define SA_POP_INPUT_ADAPTER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SA_POP_INPUT_ADAPTER_SVNT_HAS_DLL)
-#  define SA_POP_INPUT_ADAPTER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SA_POP_INPUT_ADAPTER_SVNT_HAS_DLL */
-
-#if !defined (SA_POP_INPUT_ADAPTER_SVNT_HAS_DLL)
-#  define SA_POP_INPUT_ADAPTER_SVNT_HAS_DLL 1
-#endif /* ! SA_POP_INPUT_ADAPTER_SVNT_HAS_DLL */
-
-#if defined (SA_POP_INPUT_ADAPTER_SVNT_HAS_DLL) && (SA_POP_INPUT_ADAPTER_SVNT_HAS_DLL == 1)
-#  if defined (SA_POP_INPUT_ADAPTER_SVNT_BUILD_DLL)
-#    define SA_POP_INPUT_ADAPTER_SVNT_Export ACE_Proper_Export_Flag
-#    define SA_POP_INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SA_POP_INPUT_ADAPTER_SVNT_BUILD_DLL */
-#    define SA_POP_INPUT_ADAPTER_SVNT_Export ACE_Proper_Import_Flag
-#    define SA_POP_INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SA_POP_INPUT_ADAPTER_SVNT_BUILD_DLL */
-#else /* SA_POP_INPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-#  define SA_POP_INPUT_ADAPTER_SVNT_Export
-#  define SA_POP_INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T)
-#  define SA_POP_INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SA_POP_INPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-
-// Set SA_POP_INPUT_ADAPTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SA_POP_INPUT_ADAPTER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SA_POP_INPUT_ADAPTER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SA_POP_INPUT_ADAPTER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SA_POP_INPUT_ADAPTER_SVNT_NTRACE */
-
-#if (SA_POP_INPUT_ADAPTER_SVNT_NTRACE == 1)
-#  define SA_POP_INPUT_ADAPTER_SVNT_TRACE(X)
-#else /* (SA_POP_INPUT_ADAPTER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SA_POP_INPUT_ADAPTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SA_POP_INPUT_ADAPTER_SVNT_NTRACE == 1) */
-
-#endif /* SA_POP_INPUT_ADAPTER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/MPC/config/race_allocator_lem.mpb b/MPC/config/race_allocator_lem.mpb
new file mode 100644
index 00000000000..6c3698f222e
--- /dev/null
+++ b/MPC/config/race_allocator_lem.mpb
@@ -0,0 +1,4 @@
+project : race_allocator_stub {
+   libs += Allocator_Base_lem_stub
+   after += Allocator_Base_lem_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_allocator_skel.mpb b/MPC/config/race_allocator_skel.mpb
new file mode 100644
index 00000000000..871397a9193
--- /dev/null
+++ b/MPC/config/race_allocator_skel.mpb
@@ -0,0 +1,4 @@
+project : race_allocator_lem {
+  after += Allocator_Base_skel
+  libs += Allocator_Base_skel
+}
\ No newline at end of file
diff --git a/MPC/config/race_allocator_stub.mpb b/MPC/config/race_allocator_stub.mpb
new file mode 100644
index 00000000000..305a276589b
--- /dev/null
+++ b/MPC/config/race_allocator_stub.mpb
@@ -0,0 +1,4 @@
+project : dance_deployment_stub, tm_proxy_stub, race_opstring {
+  libs += Allocator_Base_stub
+  after += Allocator_Base_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_common.mpb b/MPC/config/race_common.mpb
index 52841173353..a490d402a27 100644
--- a/MPC/config/race_common.mpb
+++ b/MPC/config/race_common.mpb
@@ -1,5 +1,5 @@
-project {
-  libout     =  $(ACE_ROOT)/lib	
-  includes  +=  $(RACE_ROOT)
+project : race_out {
+  libs += RACE_common_stub
+  after += RACE_common_stub
 }
 
diff --git a/MPC/config/race_conductor_stub.mpb b/MPC/config/race_conductor_stub.mpb
new file mode 100644
index 00000000000..d173016cc08
--- /dev/null
+++ b/MPC/config/race_conductor_stub.mpb
@@ -0,0 +1,4 @@
+project : race_controller_stub {
+  after += Conductor_stub
+  libs += Conductor_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_controller_stub.mpb b/MPC/config/race_controller_stub.mpb
new file mode 100644
index 00000000000..d26297c1a46
--- /dev/null
+++ b/MPC/config/race_controller_stub.mpb
@@ -0,0 +1,4 @@
+project : tm_proxy_stub {
+   after += Controller_Base_stub
+   libs += Controller_Base_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_dance_oa_stub.mpb b/MPC/config/race_dance_oa_stub.mpb
new file mode 100644
index 00000000000..9b3f547ca70
--- /dev/null
+++ b/MPC/config/race_dance_oa_stub.mpb
@@ -0,0 +1,4 @@
+project : dance_deployment_stub {
+  libs += DAnCE_Output_Adapter_stub
+  after += DAnCE_Output_Adapter_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_data_base_stub.mpb b/MPC/config/race_data_base_stub.mpb
new file mode 100644
index 00000000000..eefb40c17e6
--- /dev/null
+++ b/MPC/config/race_data_base_stub.mpb
@@ -0,0 +1,4 @@
+project : race_opstring {
+  after += Data_Base_stub
+  libs += Data_Base_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_effector_base.mpb b/MPC/config/race_effector_base.mpb
new file mode 100644
index 00000000000..f76fb4f05d5
--- /dev/null
+++ b/MPC/config/race_effector_base.mpb
@@ -0,0 +1,4 @@
+project : race_opstring {
+  libs += Effector_Base_stub
+  after += Effector_Base_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_effector_callback_skel.mpb b/MPC/config/race_effector_callback_skel.mpb
new file mode 100644
index 00000000000..c10e75bcf86
--- /dev/null
+++ b/MPC/config/race_effector_callback_skel.mpb
@@ -0,0 +1,4 @@
+project : race_effector_callback_stub {
+  libs += Callback_skel
+  after += Callback_skel
+}
\ No newline at end of file
diff --git a/MPC/config/race_effector_callback_stub.mpb b/MPC/config/race_effector_callback_stub.mpb
new file mode 100644
index 00000000000..7888f040f87
--- /dev/null
+++ b/MPC/config/race_effector_callback_stub.mpb
@@ -0,0 +1,4 @@
+project : race_common {
+  libs += Callback_stub
+  after += Callback_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_effector_lem.mpb b/MPC/config/race_effector_lem.mpb
new file mode 100644
index 00000000000..7ccc6a3febe
--- /dev/null
+++ b/MPC/config/race_effector_lem.mpb
@@ -0,0 +1,4 @@
+project : race_effector_stub {
+  after += Effector_Base_lem_stub
+  libs += Effector_Base_lem_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_effector_skel.mpb b/MPC/config/race_effector_skel.mpb
new file mode 100644
index 00000000000..4dade0a4eb8
--- /dev/null
+++ b/MPC/config/race_effector_skel.mpb
@@ -0,0 +1,4 @@
+project : race_effector_lem {
+  libs += Effector_Base_skel
+  after += Effector_Base_skel
+}
\ No newline at end of file
diff --git a/MPC/config/race_effector_stub.mpb b/MPC/config/race_effector_stub.mpb
new file mode 100644
index 00000000000..ec9ce699ea9
--- /dev/null
+++ b/MPC/config/race_effector_stub.mpb
@@ -0,0 +1,4 @@
+project : race_common {
+  libs += Effector_Base_stub
+  after += Effector_Base_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_ia_lem.mpb b/MPC/config/race_ia_lem.mpb
new file mode 100644
index 00000000000..e7e4c6ec437
--- /dev/null
+++ b/MPC/config/race_ia_lem.mpb
@@ -0,0 +1,4 @@
+project : race_ia_stub {
+  after += Input_Adapter_Base_lem_stub
+  libs += Input_Adapter_Base_lem_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_ia_skel.mpb b/MPC/config/race_ia_skel.mpb
new file mode 100644
index 00000000000..7505a55a8be
--- /dev/null
+++ b/MPC/config/race_ia_skel.mpb
@@ -0,0 +1,4 @@
+project : race_ia_stub {
+  after += Input_Adapter_Base_skel
+  libs += Input_Adapter_Base_skel
+}
\ No newline at end of file
diff --git a/MPC/config/race_ia_stub.mpb b/MPC/config/race_ia_stub.mpb
new file mode 100644
index 00000000000..aac7cb68e43
--- /dev/null
+++ b/MPC/config/race_ia_stub.mpb
@@ -0,0 +1,4 @@
+project : dance_deployment_stub {
+  after += Input_Adapter_Base_stub
+  libs += Input_Adapter_Base_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_idl.mpb b/MPC/config/race_idl.mpb
index ab106f98474..5aa8013078b 100644
--- a/MPC/config/race_idl.mpb
+++ b/MPC/config/race_idl.mpb
@@ -1,6 +1,3 @@
-project : taoidldefaults, ciaocidldefaults, race_common {
-
-  cidlflags += -I$(RACE_ROOT)
-
+project : taoidldefaults, race_common {
   idlflags += -I$(RACE_ROOT)
 }
\ No newline at end of file
diff --git a/MPC/config/race_opstring.mpc b/MPC/config/race_opstring.mpc
new file mode 100644
index 00000000000..a5a37c23a19
--- /dev/null
+++ b/MPC/config/race_opstring.mpc
@@ -0,0 +1,4 @@
+project : race_common, dance_deployment_stub {
+   after += OpString_stub
+   libs += OpString_stub
+}
\ No newline at end of file
diff --git a/MPC/config/race_out.mpb b/MPC/config/race_out.mpb
new file mode 100644
index 00000000000..80a5eb5e1c7
--- /dev/null
+++ b/MPC/config/race_out.mpb
@@ -0,0 +1,4 @@
+project {
+  libout     =  $(ACE_ROOT)/lib	
+  includes  +=  $(RACE_ROOT)
+}
\ No newline at end of file
diff --git a/MPC/config/race_utils.mpb b/MPC/config/race_utils.mpb
new file mode 100644
index 00000000000..b68b72d6194
--- /dev/null
+++ b/MPC/config/race_utils.mpb
@@ -0,0 +1,4 @@
+project : race_common {
+  libs += RACE_utils
+  after += RACE_utils
+}
\ No newline at end of file
diff --git a/MPC/config/sa_pop_ia_admin.mpb b/MPC/config/sa_pop_ia_admin.mpb
new file mode 100644
index 00000000000..d0db6c9d509
--- /dev/null
+++ b/MPC/config/sa_pop_ia_admin.mpb
@@ -0,0 +1,4 @@
+project : race_opstring {
+  after += SA_POP_Input_Adapter_stub
+  libs += SA_POP_Input_Adapter_stub
+}
\ No newline at end of file
diff --git a/MPC/config/sapop.mpb b/MPC/config/sapop.mpb
new file mode 100644
index 00000000000..9adf50194a1
--- /dev/null
+++ b/MPC/config/sapop.mpb
@@ -0,0 +1,4 @@
+project {
+  after += SA_POP
+  libs += SA_POP
+}
\ No newline at end of file
diff --git a/MPC/config/tm_daemon_stub.mpb b/MPC/config/tm_daemon_stub.mpb
new file mode 100644
index 00000000000..dada8ae7172
--- /dev/null
+++ b/MPC/config/tm_daemon_stub.mpb
@@ -0,0 +1,4 @@
+project : race_common, tm_proxy_stub {
+  after += TM_Daemon_stub
+  libs += TM_Daemon_stub
+}
\ No newline at end of file
diff --git a/MPC/config/tm_proxy_stub.mpb b/MPC/config/tm_proxy_stub.mpb
new file mode 100644
index 00000000000..5df79177455
--- /dev/null
+++ b/MPC/config/tm_proxy_stub.mpb
@@ -0,0 +1,4 @@
+project : race_common {
+  after += TM_Proxy_stub
+  libs += TM_Proxy_stub
+}
\ No newline at end of file
diff --git a/Monitor/Central_Monitor/Monitor.cidl b/Monitor/Central_Monitor/Monitor.cidl
deleted file mode 100644
index c2378e25483..00000000000
--- a/Monitor/Central_Monitor/Monitor.cidl
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef RACE_MONITOR_CIDL
-#define RACE_MONITOR_CIDL
-
-#include "Monitor.idl"
-
-
-module CIAO
-{
-  module RACE
-  {
-    composition session Central_Monitor_Impl
-    {
-      home executor Central_Monitor_Home_Exec
-        {
-          implements Central_Monitor_Home;
-          manages    Central_Monitor_Exec;
-        };
-    };
-  };
-};
-#endif /* RACE_MONITOR_CIDL */
diff --git a/Monitor/Central_Monitor/Monitor.mpc b/Monitor/Central_Monitor/Monitor.mpc
index 972b9ef7125..c37d225eaa9 100644
--- a/Monitor/Central_Monitor/Monitor.mpc
+++ b/Monitor/Central_Monitor/Monitor.mpc
@@ -1,93 +1,132 @@
-// project(Monitor_Interface_stub): taolib_with_idl, race_idl {
+// $Id$
+// This file is generated with "generate_component_mpc.pl -b race_common Monitor"
 
-//   sharedname = Monitor_Interface_stub
-//   idlflags -= -GT
-//   idlflags += -St \
-//               -Wb,stub_export_macro=INTERFACE_STUB_Export \
-//               -Wb,stub_export_include=Interface_stub_export.h \
-//               -Wb,skel_export_macro=INTERFACE_SVNT_Export \
-//               -Wb,skel_export_include=Interface_svnt_export.h
-//   dynamicflags   = INTERFACE_STUB_BUILD_DLL
+project(Monitor_idl_gen) : componentidldefaults , race_common  {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=MONITOR_STUB_Export \
+              -Wb,stub_export_include=Monitor_stub_export.h \
+              -Wb,skel_export_macro=MONITOR_SVNT_Export \
+              -Wb,skel_export_include=Monitor_svnt_export.h \
+              -Wb,exec_export_macro=MONITOR_EXEC_Export \
+              -Wb,exec_export_include=Monitor_exec_export.h
+
+  IDL_Files {
+    Monitor.idl
+  }
+}
 
-//   IDL_Files {
-//     Interface.idl
-//   }
+project(Monitor_lem_gen) : ciaoidldefaults , race_common  {
+  after += Monitor_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=MONITOR_LEM_STUB_Export \
+              -Wb,stub_export_include=Monitor_lem_stub_export.h \
+              -SS -Gxhst
 
-//   Source_Files {
-//     InterfaceC.cpp
-//   }
-// }
-// project(Monitor_Interface_svnt): taolib_with_idl, portableserver, race_common {
+  IDL_Files {
+    MonitorE.idl
+  }
+}
 
-//   after += Monitor_Interface_stub
-//   sharedname = Monitor_Interface_svnt
-//   libs += Monitor_Interface_stub
+project(Monitor_lem_stub) : ccm_svnt , race_common  {
+  after += Monitor_lem_gen Monitor_stub 
+  libs  +=  Monitor_stub
+  
+  
+  sharedname = Monitor_lem_stub
+  dynamicflags   = MONITOR_LEM_STUB_BUILD_DLL
 
-//   dynamicflags = INTERFACE_SVNT_BUILD_DLL
+  IDL_Files {
+  }
 
-//   IDL_Files {
-//   }
+  Source_Files {
+    MonitorEC.cpp
+  }
 
-//   Source_Files {
-//     InterfaceS.cpp
-//   }
-// }
+  Header_Files {
+    MonitorEC.h
+    Monitor_lem_stub_export.h
+  }
 
-project(Monitor_stub): ccm_stub, race_idl {
+  Inline_Files {
+    MonitorEC.inl
+  }
+}
 
+project(Monitor_stub) : ccm_stub , race_common  {
+  after += Monitor_idl_gen 
+  libs  += 
+  
+  
   sharedname = Monitor_stub
-  idlflags += -Wb,stub_export_macro=MONITOR_STUB_Export \
-              -Wb,stub_export_include=Monitor_stub_export.h \
-              -Wb,skel_export_macro=MONITOR_SVNT_Export \
-              -Wb,skel_export_include=Monitor_svnt_export.h
   dynamicflags   = MONITOR_STUB_BUILD_DLL
 
   IDL_Files {
-    Monitor.idl
   }
 
   Source_Files {
     MonitorC.cpp
   }
-}
 
-project(Monitor_svnt) : ciao_servant, race_idl {
-  after +=  Monitor_stub
-  sharedname  = Monitor_svnt
-  libs    += Monitor_stub
-
-  idlflags  +=  -Wb,export_macro=MONITOR_SVNT_Export \
-                -Wb,export_include=Monitor_svnt_export.h
-  dynamicflags = MONITOR_SVNT_BUILD_DLL
+  Header_Files {
+    MonitorC.h
+    Monitor_stub_export.h
+  }
 
-  CIDL_Files {
-    Monitor.cidl
+  Inline_Files {
+    MonitorC.inl
   }
+}
+
+project(Monitor_exec) : ciao_executor , race_common  {
+  after   += Monitor_lem_stub Monitor_stub Monitor_svnt
+  sharedname = Monitor_exec
+  libs += Monitor_stub Monitor_lem_stub CIAO_Context_Impl Monitor_svnt
+  
+  
+  dynamicflags   = MONITOR_EXEC_BUILD_DLL
 
   IDL_Files {
-    MonitorE.idl
   }
 
   Source_Files {
-    MonitorEC.cpp
-    MonitorS.cpp
-    Monitor_svnt.cpp
+    Monitor_exec.cpp
   }
-}
 
+  Header_Files {
+    Monitor_exec.h
+    Monitor_exec_export.h
+  }
 
-project(Monitor_exec) : ciao_executor, race_common {
-  after   += Monitor_svnt
-  sharedname = Monitor_exec
-  libs      += Monitor_stub Monitor_svnt
+  Inline_Files {
+  }
+}
 
-  dynamicflags   = MONITOR_EXEC_BUILD_DLL
 
+project(Monitor_svnt) : ciao_servant , race_common  {
+  after      +=   Monitor_lem_stub
+  sharedname  = Monitor_svnt
+  libs       += Monitor_stub Monitor_lem_stub  
+  
+  
+  dynamicflags = MONITOR_SVNT_BUILD_DLL
+  
   IDL_Files {
-
   }
 
   Source_Files {
-    Monitor_exec.cpp
+    MonitorS.cpp
+    Monitor_svnt.cpp
+  }
+
+  Header_Files {
+    MonitorS.h
+    Monitor_svnt.h
+    Monitor_svnt_export.h
+  }
+
+  Inline_Files {
+    MonitorS.inl
   }
 }
+
+
diff --git a/Monitor/Central_Monitor/Monitor_exec.cpp b/Monitor/Central_Monitor/Monitor_exec.cpp
index 1ff0d689962..3abe90de6c2 100644
--- a/Monitor/Central_Monitor/Monitor_exec.cpp
+++ b/Monitor/Central_Monitor/Monitor_exec.cpp
@@ -137,7 +137,7 @@ namespace CIAO
                ::Components::CCMException)
       {
         this->context_ =
-          Central_Monitor_Context::_narrow (ctx);
+          CIAO_CIAO_RACE_Central_Monitor_Impl::Central_Monitor_Context::_narrow (ctx);
 
         if (this->context_ == 0)
         {
diff --git a/Monitor/Central_Monitor/Monitor_exec.h b/Monitor/Central_Monitor/Monitor_exec.h
index 64502d5b8dd..8a28159c5a7 100644
--- a/Monitor/Central_Monitor/Monitor_exec.h
+++ b/Monitor/Central_Monitor/Monitor_exec.h
@@ -35,7 +35,7 @@ namespace CIAO
       };
 
       class MONITOR_EXEC_Export Central_Monitor_exec_i
-        : public virtual Central_Monitor_Exec,
+        : public virtual CIAO_CIAO_RACE_Central_Monitor_Impl::Central_Monitor_Exec,
           public virtual TAO_Local_RefCounted_Object
       {
         public:
@@ -66,11 +66,11 @@ namespace CIAO
           throw (::CORBA::SystemException, ::Components::CCMException);
 
         protected:
-        Central_Monitor_Context *context_;
+        CIAO_CIAO_RACE_Central_Monitor_Impl::Central_Monitor_Context *context_;
       };
 
       class MONITOR_EXEC_Export Central_Monitor_Home_exec_i
-        : public virtual Central_Monitor_Home_Exec,
+        : public virtual CIAO_CIAO_RACE_Central_Monitor_Impl::Central_Monitor_Home_Exec,
           public virtual TAO_Local_RefCounted_Object
       {
         public:
diff --git a/Monitor/Central_Monitor/Monitor_exec_export.h b/Monitor/Central_Monitor/Monitor_exec_export.h
deleted file mode 100644
index 68316404532..00000000000
--- a/Monitor/Central_Monitor/Monitor_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl MONITOR_EXEC
-// ------------------------------
-#ifndef MONITOR_EXEC_EXPORT_H
-#define MONITOR_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (MONITOR_EXEC_HAS_DLL)
-#  define MONITOR_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && MONITOR_EXEC_HAS_DLL */
-
-#if !defined (MONITOR_EXEC_HAS_DLL)
-#  define MONITOR_EXEC_HAS_DLL 1
-#endif /* ! MONITOR_EXEC_HAS_DLL */
-
-#if defined (MONITOR_EXEC_HAS_DLL) && (MONITOR_EXEC_HAS_DLL == 1)
-#  if defined (MONITOR_EXEC_BUILD_DLL)
-#    define MONITOR_EXEC_Export ACE_Proper_Export_Flag
-#    define MONITOR_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define MONITOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* MONITOR_EXEC_BUILD_DLL */
-#    define MONITOR_EXEC_Export ACE_Proper_Import_Flag
-#    define MONITOR_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define MONITOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* MONITOR_EXEC_BUILD_DLL */
-#else /* MONITOR_EXEC_HAS_DLL == 1 */
-#  define MONITOR_EXEC_Export
-#  define MONITOR_EXEC_SINGLETON_DECLARATION(T)
-#  define MONITOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* MONITOR_EXEC_HAS_DLL == 1 */
-
-// Set MONITOR_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (MONITOR_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define MONITOR_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define MONITOR_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !MONITOR_EXEC_NTRACE */
-
-#if (MONITOR_EXEC_NTRACE == 1)
-#  define MONITOR_EXEC_TRACE(X)
-#else /* (MONITOR_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define MONITOR_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (MONITOR_EXEC_NTRACE == 1) */
-
-#endif /* MONITOR_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Monitor/Central_Monitor/Monitor_stub_export.h b/Monitor/Central_Monitor/Monitor_stub_export.h
deleted file mode 100644
index ecbb89f2f31..00000000000
--- a/Monitor/Central_Monitor/Monitor_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl MONITOR_STUB
-// ------------------------------
-#ifndef MONITOR_STUB_EXPORT_H
-#define MONITOR_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (MONITOR_STUB_HAS_DLL)
-#  define MONITOR_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && MONITOR_STUB_HAS_DLL */
-
-#if !defined (MONITOR_STUB_HAS_DLL)
-#  define MONITOR_STUB_HAS_DLL 1
-#endif /* ! MONITOR_STUB_HAS_DLL */
-
-#if defined (MONITOR_STUB_HAS_DLL) && (MONITOR_STUB_HAS_DLL == 1)
-#  if defined (MONITOR_STUB_BUILD_DLL)
-#    define MONITOR_STUB_Export ACE_Proper_Export_Flag
-#    define MONITOR_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define MONITOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* MONITOR_STUB_BUILD_DLL */
-#    define MONITOR_STUB_Export ACE_Proper_Import_Flag
-#    define MONITOR_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define MONITOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* MONITOR_STUB_BUILD_DLL */
-#else /* MONITOR_STUB_HAS_DLL == 1 */
-#  define MONITOR_STUB_Export
-#  define MONITOR_STUB_SINGLETON_DECLARATION(T)
-#  define MONITOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* MONITOR_STUB_HAS_DLL == 1 */
-
-// Set MONITOR_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (MONITOR_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define MONITOR_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define MONITOR_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !MONITOR_STUB_NTRACE */
-
-#if (MONITOR_STUB_NTRACE == 1)
-#  define MONITOR_STUB_TRACE(X)
-#else /* (MONITOR_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define MONITOR_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (MONITOR_STUB_NTRACE == 1) */
-
-#endif /* MONITOR_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Monitor/Central_Monitor/Monitor_svnt_export.h b/Monitor/Central_Monitor/Monitor_svnt_export.h
deleted file mode 100644
index 0291689bb8e..00000000000
--- a/Monitor/Central_Monitor/Monitor_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl MONITOR_SVNT
-// ------------------------------
-#ifndef MONITOR_SVNT_EXPORT_H
-#define MONITOR_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (MONITOR_SVNT_HAS_DLL)
-#  define MONITOR_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && MONITOR_SVNT_HAS_DLL */
-
-#if !defined (MONITOR_SVNT_HAS_DLL)
-#  define MONITOR_SVNT_HAS_DLL 1
-#endif /* ! MONITOR_SVNT_HAS_DLL */
-
-#if defined (MONITOR_SVNT_HAS_DLL) && (MONITOR_SVNT_HAS_DLL == 1)
-#  if defined (MONITOR_SVNT_BUILD_DLL)
-#    define MONITOR_SVNT_Export ACE_Proper_Export_Flag
-#    define MONITOR_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define MONITOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* MONITOR_SVNT_BUILD_DLL */
-#    define MONITOR_SVNT_Export ACE_Proper_Import_Flag
-#    define MONITOR_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define MONITOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* MONITOR_SVNT_BUILD_DLL */
-#else /* MONITOR_SVNT_HAS_DLL == 1 */
-#  define MONITOR_SVNT_Export
-#  define MONITOR_SVNT_SINGLETON_DECLARATION(T)
-#  define MONITOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* MONITOR_SVNT_HAS_DLL == 1 */
-
-// Set MONITOR_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (MONITOR_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define MONITOR_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define MONITOR_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !MONITOR_SVNT_NTRACE */
-
-#if (MONITOR_SVNT_NTRACE == 1)
-#  define MONITOR_SVNT_TRACE(X)
-#else /* (MONITOR_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define MONITOR_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (MONITOR_SVNT_NTRACE == 1) */
-
-#endif /* MONITOR_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Monitor/Local_Monitor/Local_Monitor.mpc b/Monitor/Local_Monitor/Local_Monitor.mpc
index fb5b857c705..7d44c0ef1ec 100644
--- a/Monitor/Local_Monitor/Local_Monitor.mpc
+++ b/Monitor/Local_Monitor/Local_Monitor.mpc
@@ -1,4 +1,4 @@
-project(Local_Monitor): ccm_stub, naming, ciao_race_default, portableserver{
+project(Local_Monitor): ccm_stub, naming, portableserver, race_common {
   sharedname = Local_Monitor
   after += Monitor_stub
   libs += Monitor_stub
diff --git a/Output_Adapters/Base/Output_Adapter_svnt_export.h b/Output_Adapters/Base/Output_Adapter_svnt_export.h
deleted file mode 100644
index 52e5f8e17e6..00000000000
--- a/Output_Adapters/Base/Output_Adapter_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// Output_Adapter_svnt_export.h,v 1.1 2005/09/06 19:57:22 wotte Exp
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl OUTPUT_ADAPTER_SVNT
-// ------------------------------
-#ifndef OUTPUT_ADAPTER_SVNT_EXPORT_H
-#define OUTPUT_ADAPTER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (OUTPUT_ADAPTER_SVNT_HAS_DLL)
-#  define OUTPUT_ADAPTER_SVNT_HAS_DLL 1
-#endif /* ! OUTPUT_ADAPTER_SVNT_HAS_DLL */
-
-#if defined (OUTPUT_ADAPTER_SVNT_HAS_DLL) && (OUTPUT_ADAPTER_SVNT_HAS_DLL == 1)
-#  if defined (OUTPUT_ADAPTER_SVNT_BUILD_DLL)
-#    define OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Export_Flag
-#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* OUTPUT_ADAPTER_SVNT_BUILD_DLL */
-#    define OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Import_Flag
-#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* OUTPUT_ADAPTER_SVNT_BUILD_DLL */
-#else /* OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-#  define OUTPUT_ADAPTER_SVNT_Export
-#  define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T)
-#  define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-
-// Set OUTPUT_ADAPTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (OUTPUT_ADAPTER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define OUTPUT_ADAPTER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define OUTPUT_ADAPTER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !OUTPUT_ADAPTER_SVNT_NTRACE */
-
-#if (OUTPUT_ADAPTER_SVNT_NTRACE == 1)
-#  define OUTPUT_ADAPTER_SVNT_TRACE(X)
-#else /* (OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define OUTPUT_ADAPTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
-
-#endif /* OUTPUT_ADAPTER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Output_Adapters/Component/Output_Manager.cidl b/Output_Adapters/Component/Output_Manager.cidl
deleted file mode 100644
index e26dba88b3a..00000000000
--- a/Output_Adapters/Component/Output_Manager.cidl
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef RACE_OUTPUT_MANAGER_CIDL
-#define RACE_OUTPUT_MANAGER_CIDL
-
-/*
- * @file Output_Managet.cidl
- * @brief This file contains the Output_Manager component implementation defination.
- */
-
-#include "Output_Manager.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session Output_Manager_Impl
-    {
-      home executor Output_Manager_Home_Exec
-        {
-          implements Output_Manager_Home;
-          manages    Output_Manager_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_OUTPUT_MANAGER_CIDL */
diff --git a/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp b/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp
index b8aab8605b3..f22eff77b3b 100644
--- a/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp
+++ b/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp
@@ -16,7 +16,7 @@ namespace CIAO
       namespace CIDL_DAnCE_OA_Impl
       {
         Admin_exec_i::Admin_exec_i (
-          DAnCE_OA_Component_Context *context,
+          CIAO_CIAO_RACE_DAnCE_OA_DAnCE_OA_Component_Impl::DAnCE_OA_Component_Context *context,
           const char * repoman_id,
           Logger &logger)
           : DAnCE::Plan_Launcher::Plan_Launcher_Base_Impl (dynamic_cast<CIAO::Container_i *>
diff --git a/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.h b/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.h
index 431c110f851..bbb02f455e5 100644
--- a/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.h
+++ b/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.h
@@ -6,8 +6,8 @@
 #include "tao/LocalObject.h"
 
 #include "Plan_Launcher/Plan_Launcher_Base_Impl.h"
-#include "Plan_Generator_Impl.h"
-#include "Logger.h"
+#include "Plan_Generator/Plan_Generator_Impl.h"
+#include "utils/Logger.h"
 
 namespace CIAO
 {
@@ -23,7 +23,7 @@ namespace CIAO
             public DAnCE::Plan_Launcher::Plan_Launcher_Base_Impl
         {
         public:
-          Admin_exec_i (DAnCE_OA_Component_Context *context,
+          Admin_exec_i (CIAO_CIAO_RACE_DAnCE_OA_DAnCE_OA_Component_Impl::DAnCE_OA_Component_Context *context,
                         const char * repoman_id,
                         Logger &logger);
 
@@ -54,7 +54,7 @@ namespace CIAO
         private:
 
           /// Pointer to the component's context object.
-          DAnCE_OA_Component_Context *context_;
+          CIAO_CIAO_RACE_DAnCE_OA_DAnCE_OA_Component_Impl::DAnCE_OA_Component_Context *context_;
 
           /// ID of the repoman.
           CORBA::String_var repoman_id_;
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.cidl b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.cidl
deleted file mode 100644
index 100f46fb1a3..00000000000
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.cidl
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef RACE_DANCE_OUTPUT_ADAPTER_CIDL
-#define RACE_DANCE_OUTPUT_ADAPTER_CIDL
-
-#include "DAnCE_Output_Adapter.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    module DAnCE_OA
-    {
-      composition session DAnCE_OA_Impl
-      {
-        home executor DAnCE_OA_Component_Home_Exec
-        {
-          implements DAnCE_OA_Component_Home;
-          manages DAnCE_OA_Component_Exec;
-        };
-      };
-    };
-  };
-
-};
-#endif /* RACE_DANCE_OUTPUT_ADAPTER_CIDL */
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
index 3c1ecbb3ced..49838f2bd15 100644
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
+++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
@@ -1,108 +1,134 @@
-project(DAnCE_Output_Adapter_stub):  dance_deployment_stub, race_idl {
-  after += OpString_stub Data_Base_stub
+// $Id$
+// This file is generated with "generate_component_mpc.pl -b race_common, dance_deployment_stub DAnCE_Output_Adapter"
 
-  libs += Data_Base_Component_stub  OpString_stub RACE_common_stub
-
-//   libs += Output_Adapter_stub  \
-//           Controller_stub \
-//           Output_Adapter_Interface_stub \
-//           TargetManager_stub                   \
-//           NodeManager_stub \
-//           Monitor_stub
-
-  sharedname = DAnCE_OA_Component_stub
+project(DAnCE_Output_Adapter_idl_gen) : componentidldefaults , race_idl, dance_deployment_stub  {
+  custom_only = 1
   idlflags += -Wb,stub_export_macro=DANCE_OUTPUT_ADAPTER_STUB_Export \
               -Wb,stub_export_include=DAnCE_Output_Adapter_stub_export.h \
               -Wb,skel_export_macro=DANCE_OUTPUT_ADAPTER_SVNT_Export \
-              -Wb,skel_export_include=DAnCE_Output_Adapter_svnt_export.h
-
-  dynamicflags   = DANCE_OUTPUT_ADAPTER_STUB_BUILD_DLL
+              -Wb,skel_export_include=DAnCE_Output_Adapter_svnt_export.h \
+              -Wb,exec_export_macro=DANCE_OUTPUT_ADAPTER_EXEC_Export \
+              -Wb,exec_export_include=DAnCE_Output_Adapter_exec_export.h
 
   IDL_Files {
     DAnCE_Output_Adapter.idl
   }
+}
 
-  Source_Files {
-    DAnCE_Output_AdapterC.cpp
+project(DAnCE_Output_Adapter_lem_gen) : ciaoidldefaults , race_idl, dance_deployment_stub  {
+  after += DAnCE_Output_Adapter_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=DANCE_OUTPUT_ADAPTER_LEM_STUB_Export \
+              -Wb,stub_export_include=DAnCE_Output_Adapter_lem_stub_export.h \
+              -SS -Gxhst
+
+  IDL_Files {
+    DAnCE_Output_AdapterE.idl
   }
 }
 
-project(DAnCE_Output_Adapter_svnt) : ciao_servant, race_idl, dance_deployment_stub {
-// , 
-//                                  , ciao_race_component {
-  after +=  DAnCE_Output_Adapter_stub
-  sharedname  = DAnCE_OA_Component_svnt
-  libs    += DAnCE_OA_Component_stub OpString_stub RACE_common_stub
-
-            // Output_Adapter_svnt  \
-//              Output_Adapter_stub \
-//              Output_Adapter_Interface_stub \
-//              Output_Adapter_Interface_stub \
-//              Output_Adapter_Interface_svnt \
-//              Controller_stub \
-//              TargetManager_stub \
-//              NodeManager_stub \
-//              Monitor_stub
-
-  idlflags  +=  -Wb,export_macro=DANCE_OUTPUT_ADAPTER_SVNT_Export \
-                -Wb,export_include=DAnCE_Output_Adapter_svnt_export.h
+project(DAnCE_Output_Adapter_lem_stub) : ccm_svnt , race_opstring, dance_deployment_stub  {
+  after += DAnCE_Output_Adapter_lem_gen DAnCE_Output_Adapter_stub 
+  libs  +=  DAnCE_Output_Adapter_stub
+  
+  
+  sharedname = DAnCE_Output_Adapter_lem_stub
+  dynamicflags   = DANCE_OUTPUT_ADAPTER_LEM_STUB_BUILD_DLL
 
-  dynamicflags = DANCE_OUTPUT_ADAPTER_SVNT_BUILD_DLL
+  IDL_Files {
+  }
 
-//   cidlflags -= --
-//   cidlflags += --gen-exec-impl --
+  Source_Files {
+    DAnCE_Output_AdapterEC.cpp
+  }
+
+  Header_Files {
+    DAnCE_Output_AdapterEC.h
+    DAnCE_Output_Adapter_lem_stub_export.h
+  }
 
-  CIDL_Files {
-    DAnCE_Output_Adapter.cidl
+  Inline_Files {
+    DAnCE_Output_AdapterEC.inl
   }
+}
+
+project(DAnCE_Output_Adapter_stub) : ccm_stub , race_opstring, dance_deployment_stub  {
+  after += DAnCE_Output_Adapter_idl_gen 
+  libs  += 
+  
+  
+  sharedname = DAnCE_Output_Adapter_stub
+  dynamicflags   = DANCE_OUTPUT_ADAPTER_STUB_BUILD_DLL
 
   IDL_Files {
-    DAnCE_Output_AdapterE.idl
   }
 
   Source_Files {
-    DAnCE_Output_AdapterEC.cpp
-    DAnCE_Output_AdapterS.cpp
-    DAnCE_Output_Adapter_svnt.cpp
+    DAnCE_Output_AdapterC.cpp
   }
-}
 
+  Header_Files {
+    DAnCE_Output_AdapterC.h
+    DAnCE_Output_Adapter_stub_export.h
+  }
 
-project(DAnCE_Output_Adapter_exec) : ciao_executor, dance_plan_generator, ciao_config_handlers, dance_deployment_stub, race_common, dance_plan_launcher_base {
-  //  , ciao_race_component, ciao_config_handlers, ciao_plan_generator {
-  after   += DAnCE_Output_Adapter_svnt RACE_utils
-  sharedname = DAnCE_OA_Component_exec
-  includes += $(RACE_ROOT)/utils
-  libs += Data_Base_Component_stub DAnCE_Utils TAO_RTCORBA DAnCE_ExecutionManager_stub CIAO_Context_Impl
-  libs      +=  OpString_stub \
-				RACE_common_stub \
-				DAnCE_OA_Component_stub \
-				DAnCE_OA_Component_svnt \
-				DAnCE_Plan_Launcher \
-				RACE_utils
-//                ExecutionManager_stub \
-//                Output_Adapter_stub \
-//                Output_Adapter_Interface_stub \
-//                Output_Adapter_svnt \
-//                Output_Adapter_stub \
-//                Output_Adapter_Interface_stub \
-//                DAnCE_Output_Adapter_stub  \
-//                Output_Adapter_Interface_stub \
-//                Output_Adapter_Interface_svnt \
-//                Controller_stub \
-//                TargetManager_stub \
-//                NodeManager_stub \
-//                Monitor_stub
+  Inline_Files {
+    DAnCE_Output_AdapterC.inl
+  }
+}
 
+project(DAnCE_Output_Adapter_exec) : ciao_executor , race_opstring, dance_deployment_stub, race_utils, \
+   ciao_config_handlers, dance_plan_launcher_base, dance_repositorymanager_stub, dance_plan_generator  {
+  after   += DAnCE_Output_Adapter_lem_stub DAnCE_Output_Adapter_stub DAnCE_Output_Adapter_svnt
+  sharedname = DAnCE_Output_Adapter_exec
+  libs += DAnCE_Output_Adapter_stub DAnCE_Output_Adapter_lem_stub DAnCE_Output_Adapter_svnt
+  
+  
   dynamicflags   = DANCE_OUTPUT_ADAPTER_EXEC_BUILD_DLL
 
   IDL_Files {
-
   }
 
   Source_Files {
-
     DAnCE_Output_Adapter_exec.cpp
     Admin_exec.cpp
   }
+
+  Header_Files {
+    DAnCE_Output_Adapter_exec.h
+    DAnCE_Output_Adapter_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(DAnCE_Output_Adapter_svnt) : ciao_servant , race_opstring, dance_deployment_stub  {
+  after      +=   DAnCE_Output_Adapter_lem_stub
+  sharedname  = DAnCE_Output_Adapter_svnt
+  libs       += DAnCE_Output_Adapter_stub DAnCE_Output_Adapter_lem_stub  
+  
+  
+  dynamicflags = DANCE_OUTPUT_ADAPTER_SVNT_BUILD_DLL
+  
+  IDL_Files {
+  }
+
+  Source_Files {
+    DAnCE_Output_AdapterS.cpp
+    DAnCE_Output_Adapter_svnt.cpp
+  }
+
+  Header_Files {
+    DAnCE_Output_AdapterS.h
+    DAnCE_Output_Adapter_svnt.h
+    DAnCE_Output_Adapter_svnt_export.h
+  }
+
+  Inline_Files {
+    DAnCE_Output_AdapterS.inl
+  }
 }
+
+
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp
index 6d207b8cf67..844f037f5b1 100644
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp
+++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp
@@ -49,7 +49,7 @@ namespace CIAO
         DAnCE_OA_Component_exec_i::set_session_context (
           ::Components::SessionContext_ptr ctx)
         {
-          this->context_ = DAnCE_OA_Component_Context::_narrow (ctx);
+          this->context_ = CIAO_CIAO_RACE_DAnCE_OA_DAnCE_OA_Component_Impl::DAnCE_OA_Component_Context::_narrow (ctx);
 
           if (this->context_ == 0)
             {
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h
index ce6713c6ac9..f159f10c76f 100644
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h
+++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h
@@ -4,7 +4,7 @@
 #include "DAnCE_Output_Adapter_svnt.h"
 #include "DAnCE_Output_Adapter_exec_export.h"
 #include "tao/LocalObject.h"
-#include "Logger.h"
+#include "utils/Logger.h"
 
 namespace CIAO
 {
@@ -15,7 +15,7 @@ namespace CIAO
       namespace CIDL_DAnCE_OA_Impl
       {
         class DANCE_OUTPUT_ADAPTER_EXEC_Export DAnCE_OA_Component_exec_i
-          : public virtual DAnCE_OA_Component_Exec,
+          : public virtual CIAO_CIAO_RACE_DAnCE_OA_DAnCE_OA_Component_Impl::DAnCE_OA_Component_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
@@ -44,7 +44,7 @@ namespace CIAO
           virtual void ccm_remove ();
 
           protected:
-          DAnCE_OA_Component_Context *context_;
+          CIAO_CIAO_RACE_DAnCE_OA_DAnCE_OA_Component_Impl::DAnCE_OA_Component_Context *context_;
 
           private:
 
@@ -56,7 +56,7 @@ namespace CIAO
         };
 
         class DANCE_OUTPUT_ADAPTER_EXEC_Export DAnCE_OA_Component_Home_exec_i
-          : public virtual DAnCE_OA_Component_Home_Exec,
+          : public virtual CIAO_CIAO_RACE_DAnCE_OA_DAnCE_OA_Component_Impl::DAnCE_OA_Component_Home_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec_export.h b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec_export.h
deleted file mode 100644
index e710b44875a..00000000000
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DANCE_OUTPUT_ADAPTER_EXEC
-// ------------------------------
-#ifndef DANCE_OUTPUT_ADAPTER_EXEC_EXPORT_H
-#define DANCE_OUTPUT_ADAPTER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (DANCE_OUTPUT_ADAPTER_EXEC_HAS_DLL)
-#  define DANCE_OUTPUT_ADAPTER_EXEC_HAS_DLL 1
-#endif /* ! DANCE_OUTPUT_ADAPTER_EXEC_HAS_DLL */
-
-#if defined (DANCE_OUTPUT_ADAPTER_EXEC_HAS_DLL) && (DANCE_OUTPUT_ADAPTER_EXEC_HAS_DLL == 1)
-#  if defined (DANCE_OUTPUT_ADAPTER_EXEC_BUILD_DLL)
-#    define DANCE_OUTPUT_ADAPTER_EXEC_Export ACE_Proper_Export_Flag
-#    define DANCE_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DANCE_OUTPUT_ADAPTER_EXEC_BUILD_DLL */
-#    define DANCE_OUTPUT_ADAPTER_EXEC_Export ACE_Proper_Import_Flag
-#    define DANCE_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DANCE_OUTPUT_ADAPTER_EXEC_BUILD_DLL */
-#else /* DANCE_OUTPUT_ADAPTER_EXEC_HAS_DLL == 1 */
-#  define DANCE_OUTPUT_ADAPTER_EXEC_Export
-#  define DANCE_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T)
-#  define DANCE_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DANCE_OUTPUT_ADAPTER_EXEC_HAS_DLL == 1 */
-
-// Set DANCE_OUTPUT_ADAPTER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DANCE_OUTPUT_ADAPTER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DANCE_OUTPUT_ADAPTER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DANCE_OUTPUT_ADAPTER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DANCE_OUTPUT_ADAPTER_EXEC_NTRACE */
-
-#if (DANCE_OUTPUT_ADAPTER_EXEC_NTRACE == 1)
-#  define DANCE_OUTPUT_ADAPTER_EXEC_TRACE(X)
-#else /* (DANCE_OUTPUT_ADAPTER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DANCE_OUTPUT_ADAPTER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DANCE_OUTPUT_ADAPTER_EXEC_NTRACE == 1) */
-
-#endif /* DANCE_OUTPUT_ADAPTER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_stub_export.h b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_stub_export.h
deleted file mode 100644
index e770a642896..00000000000
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_stub_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DANCE_OUTPUT_ADAPTER_STUB
-// ------------------------------
-#ifndef DANCE_OUTPUT_ADAPTER_STUB_EXPORT_H
-#define DANCE_OUTPUT_ADAPTER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (DANCE_OUTPUT_ADAPTER_STUB_HAS_DLL)
-#  define DANCE_OUTPUT_ADAPTER_STUB_HAS_DLL 1
-#endif /* ! DANCE_OUTPUT_ADAPTER_STUB_HAS_DLL */
-
-#if defined (DANCE_OUTPUT_ADAPTER_STUB_HAS_DLL) && (DANCE_OUTPUT_ADAPTER_STUB_HAS_DLL == 1)
-#  if defined (DANCE_OUTPUT_ADAPTER_STUB_BUILD_DLL)
-#    define DANCE_OUTPUT_ADAPTER_STUB_Export ACE_Proper_Export_Flag
-#    define DANCE_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DANCE_OUTPUT_ADAPTER_STUB_BUILD_DLL */
-#    define DANCE_OUTPUT_ADAPTER_STUB_Export ACE_Proper_Import_Flag
-#    define DANCE_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DANCE_OUTPUT_ADAPTER_STUB_BUILD_DLL */
-#else /* DANCE_OUTPUT_ADAPTER_STUB_HAS_DLL == 1 */
-#  define DANCE_OUTPUT_ADAPTER_STUB_Export
-#  define DANCE_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T)
-#  define DANCE_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DANCE_OUTPUT_ADAPTER_STUB_HAS_DLL == 1 */
-
-// Set DANCE_OUTPUT_ADAPTER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DANCE_OUTPUT_ADAPTER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DANCE_OUTPUT_ADAPTER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DANCE_OUTPUT_ADAPTER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DANCE_OUTPUT_ADAPTER_STUB_NTRACE */
-
-#if (DANCE_OUTPUT_ADAPTER_STUB_NTRACE == 1)
-#  define DANCE_OUTPUT_ADAPTER_STUB_TRACE(X)
-#else /* (DANCE_OUTPUT_ADAPTER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DANCE_OUTPUT_ADAPTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DANCE_OUTPUT_ADAPTER_STUB_NTRACE == 1) */
-
-#endif /* DANCE_OUTPUT_ADAPTER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_svnt_export.h b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_svnt_export.h
deleted file mode 100644
index fe2bc233a0e..00000000000
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DANCE_OUTPUT_ADAPTER_SVNT
-// ------------------------------
-#ifndef DANCE_OUTPUT_ADAPTER_SVNT_EXPORT_H
-#define DANCE_OUTPUT_ADAPTER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (DANCE_OUTPUT_ADAPTER_SVNT_HAS_DLL)
-#  define DANCE_OUTPUT_ADAPTER_SVNT_HAS_DLL 1
-#endif /* ! DANCE_OUTPUT_ADAPTER_SVNT_HAS_DLL */
-
-#if defined (DANCE_OUTPUT_ADAPTER_SVNT_HAS_DLL) && (DANCE_OUTPUT_ADAPTER_SVNT_HAS_DLL == 1)
-#  if defined (DANCE_OUTPUT_ADAPTER_SVNT_BUILD_DLL)
-#    define DANCE_OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Export_Flag
-#    define DANCE_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DANCE_OUTPUT_ADAPTER_SVNT_BUILD_DLL */
-#    define DANCE_OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Import_Flag
-#    define DANCE_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DANCE_OUTPUT_ADAPTER_SVNT_BUILD_DLL */
-#else /* DANCE_OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-#  define DANCE_OUTPUT_ADAPTER_SVNT_Export
-#  define DANCE_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T)
-#  define DANCE_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DANCE_OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
-
-// Set DANCE_OUTPUT_ADAPTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DANCE_OUTPUT_ADAPTER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DANCE_OUTPUT_ADAPTER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DANCE_OUTPUT_ADAPTER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DANCE_OUTPUT_ADAPTER_SVNT_NTRACE */
-
-#if (DANCE_OUTPUT_ADAPTER_SVNT_NTRACE == 1)
-#  define DANCE_OUTPUT_ADAPTER_SVNT_TRACE(X)
-#else /* (DANCE_OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DANCE_OUTPUT_ADAPTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DANCE_OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
-
-#endif /* DANCE_OUTPUT_ADAPTER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Output_Adapters/Interface/Output_Adapter_Interface_stub_export.h b/Output_Adapters/Interface/Output_Adapter_Interface_stub_export.h
deleted file mode 100644
index 6a27d5036bb..00000000000
--- a/Output_Adapters/Interface/Output_Adapter_Interface_stub_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// Output_Adapter_Interface_stub_export.h,v 1.1 2005/09/06 19:57:22 wotte Exp
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl OUTPUT_ADAPTER_INTERFACE_STUB
-// ------------------------------
-#ifndef OUTPUT_ADAPTER_INTERFACE_STUB_EXPORT_H
-#define OUTPUT_ADAPTER_INTERFACE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL)
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL 1
-#endif /* ! OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL */
-
-#if defined (OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL) && (OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL == 1)
-#  if defined (OUTPUT_ADAPTER_INTERFACE_STUB_BUILD_DLL)
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_Export ACE_Proper_Export_Flag
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* OUTPUT_ADAPTER_INTERFACE_STUB_BUILD_DLL */
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_Export ACE_Proper_Import_Flag
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* OUTPUT_ADAPTER_INTERFACE_STUB_BUILD_DLL */
-#else /* OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL == 1 */
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_Export
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARATION(T)
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL == 1 */
-
-// Set OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE */
-
-#if (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE == 1)
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_TRACE(X)
-#else /* (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define OUTPUT_ADAPTER_INTERFACE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE == 1) */
-
-#endif /* OUTPUT_ADAPTER_INTERFACE_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Output_Adapters/Interface/Output_Adapter_Interface_svnt_export.h b/Output_Adapters/Interface/Output_Adapter_Interface_svnt_export.h
deleted file mode 100644
index f2bd23d6a54..00000000000
--- a/Output_Adapters/Interface/Output_Adapter_Interface_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// Output_Adapter_Interface_svnt_export.h,v 1.1 2005/09/06 19:57:22 wotte Exp
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl OUTPUT_ADAPTER_INTERFACE_SVNT
-// ------------------------------
-#ifndef OUTPUT_ADAPTER_INTERFACE_SVNT_EXPORT_H
-#define OUTPUT_ADAPTER_INTERFACE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL)
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL 1
-#endif /* ! OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL */
-
-#if defined (OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL) && (OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL == 1)
-#  if defined (OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL)
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_Export ACE_Proper_Export_Flag
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL */
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_Export ACE_Proper_Import_Flag
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL */
-#else /* OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL == 1 */
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_Export
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARATION(T)
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL == 1 */
-
-// Set OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE */
-
-#if (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE == 1)
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_TRACE(X)
-#else /* (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define OUTPUT_ADAPTER_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE == 1) */
-
-#endif /* OUTPUT_ADAPTER_INTERFACE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl
deleted file mode 100644
index cd0d8f07220..00000000000
--- a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl
+++ /dev/null
@@ -1,25 +0,0 @@
-//XML_Output_Adapter.cidl,v 1.1 2005/09/06 19:57:22 wotte Exp
-//XML_Output_Adapter.cidl
-
-#ifndef RACE_XML_OUTPUT_ADAPTER_CIDL
-#define RACE_XML_OUTPUT_ADAPTER_CIDL
-
-#include "XML_Output_Adapter.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session XML_Output_Adapter_Impl
-    {
-      home executor XML_Output_Adapter_Home_Exec
-        {
-          implements RACE::XML_Output_Adapter_Home;
-          manages XML_Output_Adapter_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_XML_OUTPUT_ADAPTER_CIDL */
diff --git a/Plan_Analyzer/Component/Plan_Analyzer.cidl b/Plan_Analyzer/Component/Plan_Analyzer.cidl
deleted file mode 100644
index 045a798ea9a..00000000000
--- a/Plan_Analyzer/Component/Plan_Analyzer.cidl
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef RACE_PLAN_ANALYZER_CIDL
-#define RACE_PLAN_ANALYZER_CIDL
-
-#include "Plan_Analyzer.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session Plan_Analyzer_Impl
-    {
-      home executor Plan_Analyzer_Home_Exec
-        {
-          implements RACE::Plan_Analyzer_Home;
-          manages    Plan_Analyzer_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_PLAN_ANALYZER_CIDL */
diff --git a/Planner_Manager/Component/Planner_Manager.cidl b/Planner_Manager/Component/Planner_Manager.cidl
deleted file mode 100644
index d7702221827..00000000000
--- a/Planner_Manager/Component/Planner_Manager.cidl
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef RACE_PLANNER_MANAGER_CIDL
-#define RACE_PLANNER_MANAGER_CIDL
-
-#include "Planner_Manager.idl"
-
-#include "Planners/Interface/Planner_I.idl"
-#include "Output_Adapters/Interface/PlanEgress.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session Planner_Manager_Impl
-    {
-      home executor Planner_Manager_Home_Exec
-        {
-          implements RACE::Planner_Manager_Home;
-          manages    Planner_Manager_Exec;
-        };
-    };
-  };
-};
-
-#endif /* RACE_PLANNER_MANAGER_CIDL */
diff --git a/Planners/StaticPlanner/StaticPlanner.cidl b/Planners/StaticPlanner/StaticPlanner.cidl
deleted file mode 100644
index d9a3fbd277d..00000000000
--- a/Planners/StaticPlanner/StaticPlanner.cidl
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef RACE_STATIC_PLANNER_CIDL
-#define RACE_STATIC_PLANNER_CIDL
-
-#include "StaticPlanner.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session StaticPlanner_Impl
-    {
-      home executor StaticPlanner_Home_Exec
-        {
-          implements RACE::StaticPlanner_Home;
-          manages    StaticPlanner_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_STATIC_PLANNER_CIDL */
diff --git a/SA_POP/Component/Planning_exec.cpp b/SA_POP/Component/Planning_exec.cpp
index 2e9de832ac5..904cf96a086 100644
--- a/SA_POP/Component/Planning_exec.cpp
+++ b/SA_POP/Component/Planning_exec.cpp
@@ -6,10 +6,10 @@
 #include "ace/UUID.h"
 #include "common/OpStringC.h"
 
-#include "SA_POP_Types.h"
-#include "SA_Builder.h"
-#include "TaskMapFileIn.h"
-#include "SANet/SANetFileIn.h"
+#include "SA_POP/SA_POP_Types.h"
+#include "SA_POP/SA_Builder.h"
+#include "SA_POP/TaskMapFileIn.h"
+#include "SA_POP/SANet/SANetFileIn.h"
 
 namespace CIAO
 {
diff --git a/SA_POP/Component/Planning_exec.h b/SA_POP/Component/Planning_exec.h
index 3a66c79c1f2..d88f94286ce 100644
--- a/SA_POP/Component/Planning_exec.h
+++ b/SA_POP/Component/Planning_exec.h
@@ -17,8 +17,8 @@
 
 #include "common/OpStringC.h"
 
-#include "Planner.h"
-#include "LogScreenOut.h"
+#include "SA_POP/Planner.h"
+#include "SA_POP/LogScreenOut.h"
 
 
 namespace CIAO
diff --git a/SA_POP/Component/SA_POP_Component.cidl b/SA_POP/Component/SA_POP_Component.cidl
deleted file mode 100644
index 22582a8ce84..00000000000
--- a/SA_POP/Component/SA_POP_Component.cidl
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef SA_POP_COMPONENT_CIDL
-#define SA_POP_COMPONENT_CIDL
-
-
-#include "SA_POP_Component.idl"
-
-
-module CIAO
-{
-  module RACE
-  {
-    module SA_POP
-    {
-      composition session SA_POP_Component_Impl
-      {
-        home executor SA_POP_Component_Home_Exec
-        {
-          implements SA_POP_Component_Home;
-          manages    SA_POP_Component_Exec;
-        };
-      };
-    };
-  };
-};
-
-
-#endif /* SA_POP_COMPONENT_CIDL*/
diff --git a/SA_POP/Component/SA_POP_Component.mpc b/SA_POP/Component/SA_POP_Component.mpc
index 822435ecd72..3c1e26fedad 100644
--- a/SA_POP/Component/SA_POP_Component.mpc
+++ b/SA_POP/Component/SA_POP_Component.mpc
@@ -1,88 +1,132 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -b race_opstring, race_data_base_stub SA_POP_Component"
 
-project(SA_POP_Component_stub): ccm_stub, dance_deployment_stub, race_idl {
-  
-  sharedname = SA_POP_Component_stub
-  after += OpString_stub Data_Base_stub SA_POP
-  libs += RACE_common_stub  
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=SA_POP_COMPONENT_STUB_Export \
+project(SA_POP_Component_idl_gen) : componentidldefaults , race_idl, race_data_base_stub  {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SA_POP_COMPONENT_STUB_Export \
               -Wb,stub_export_include=SA_POP_Component_stub_export.h \
               -Wb,skel_export_macro=SA_POP_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=SA_POP_Component_svnt_export.h
-
-  dynamicflags   = SA_POP_COMPONENT_STUB_BUILD_DLL
-
-  libs += OpString_stub \
-          Data_Base_Component_stub
+              -Wb,skel_export_include=SA_POP_Component_svnt_export.h \
+              -Wb,exec_export_macro=SA_POP_COMPONENT_EXEC_Export \
+              -Wb,exec_export_include=SA_POP_Component_exec_export.h
 
   IDL_Files {
     SA_POP_Component.idl
   }
+}
 
-  Source_Files {
-    SA_POP_ComponentC.cpp
+project(SA_POP_Component_lem_gen) : ciaoidldefaults , race_idl, race_data_base_stub  {
+  after += SA_POP_Component_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SA_POP_COMPONENT_LEM_STUB_Export \
+              -Wb,stub_export_include=SA_POP_Component_lem_stub_export.h \
+              -SS -Gxhst
+
+  IDL_Files {
+    SA_POP_ComponentE.idl
   }
 }
 
-project(SA_POP_Component_svnt) : ciao_servant, race_idl, dance_deployment_stub {
-  after      +=  SA_POP_Component_stub
-  sharedname  = SA_POP_Component_svnt
-  libs       += SA_POP_Component_stub \
-                OpString_stub \
-                Data_Base_Component_stub RACE_common_stub
+project(SA_POP_Component_lem_stub) : ccm_svnt , race_opstring, race_data_base_stub  {
+  after += SA_POP_Component_lem_gen SA_POP_Component_stub 
+  libs  +=  SA_POP_Component_stub
+  
+  
+  sharedname = SA_POP_Component_lem_stub
+  dynamicflags   = SA_POP_COMPONENT_LEM_STUB_BUILD_DLL
 
+  IDL_Files {
+  }
 
-//  cidlflags -= --
-//  cidlflags += --gen-exec-impl -- 
-   
-  idlflags -= -GT
-  idlflags += -St -SS \
-              -Wb,export_macro=SA_POP_COMPONENT_SVNT_Export \
-              -Wb,export_include=SA_POP_Component_svnt_export.h
+  Source_Files {
+    SA_POP_ComponentEC.cpp
+  }
 
-  dynamicflags = SA_POP_COMPONENT_SVNT_BUILD_DLL
-  
-  CIDL_Files {
-    SA_POP_Component.cidl
+  Header_Files {
+    SA_POP_ComponentEC.h
+    SA_POP_Component_lem_stub_export.h
+  }
+
+  Inline_Files {
+    SA_POP_ComponentEC.inl
   }
+}
+
+project(SA_POP_Component_stub) : ccm_stub , race_opstring, race_data_base_stub  {
+  after += SA_POP_Component_idl_gen 
+  libs  += 
+  
+  
+  sharedname = SA_POP_Component_stub
+  dynamicflags   = SA_POP_COMPONENT_STUB_BUILD_DLL
 
   IDL_Files {
-    SA_POP_ComponentE.idl
   }
 
   Source_Files {
-    SA_POP_ComponentEC.cpp
-    SA_POP_ComponentS.cpp
-    SA_POP_Component_svnt.cpp
+    SA_POP_ComponentC.cpp
   }
-}
 
-project(SA_POP_Component_exec) : ciao_executor, ciao_config_handlers , race_common {
-  after   += SA_POP_Component_svnt
-  sharedname = SA_POP_Component_exec
+  Header_Files {
+    SA_POP_ComponentC.h
+    SA_POP_Component_stub_export.h
+  }
 
-  includes += $(CIAO_ROOT)/tools/Config_Handlers \
-              $(SAPOP_ROOT)
+  Inline_Files {
+    SA_POP_ComponentC.inl
+  }
+}
 
-  libs += SA_POP_Component_stub \
-          SA_POP_Component_svnt \
-          OpString_stub \
-          Data_Base_Component_stub \
-          SA_POP RACE_common_stub
+project(SA_POP_Component_exec) : ciao_executor , race_opstring, race_data_base_stub, sapop  {
+  after   += SA_POP_Component_lem_stub SA_POP_Component_stub SA_POP_Component_svnt
+  sharedname = SA_POP_Component_exec
+  libs += SA_POP_Component_stub SA_POP_Component_lem_stub SA_POP_Component_svnt
    
   dynamicflags   = SA_POP_COMPONENT_EXEC_BUILD_DLL
 
   IDL_Files {
-    
   }
 
   Source_Files {
-    Planning_exec.cpp
     SA_POP_Component_exec.cpp
+    Planning_exec.cpp
+  }
+
+  Header_Files {
+    SA_POP_Component_exec.h
+    SA_POP_Component_exec_export.h
+  }
+
+  Inline_Files {
   }
 }
 
 
+project(SA_POP_Component_svnt) : ciao_servant , race_opstring, race_data_base_stub  {
+  after      +=   SA_POP_Component_lem_stub
+  sharedname  = SA_POP_Component_svnt
+  libs       += SA_POP_Component_stub SA_POP_Component_lem_stub  
+  
+  
+  dynamicflags = SA_POP_COMPONENT_SVNT_BUILD_DLL
+  
+  IDL_Files {
+  }
+
+  Source_Files {
+    SA_POP_ComponentS.cpp
+    SA_POP_Component_svnt.cpp
+  }
+
+  Header_Files {
+    SA_POP_ComponentS.h
+    SA_POP_Component_svnt.h
+    SA_POP_Component_svnt_export.h
+  }
+
+  Inline_Files {
+    SA_POP_ComponentS.inl
+  }
+}
+
 
diff --git a/SA_POP/Component/SA_POP_Component_exec.cpp b/SA_POP/Component/SA_POP_Component_exec.cpp
index 2176be0540c..aaea2291d54 100644
--- a/SA_POP/Component/SA_POP_Component_exec.cpp
+++ b/SA_POP/Component/SA_POP_Component_exec.cpp
@@ -98,7 +98,7 @@ namespace CIAO
           ::Components::SessionContext_ptr ctx)
         {
           this->context_ =
-            SA_POP_Component_Context::_narrow (
+            CIAO_CIAO_RACE_SA_POP_SA_POP_Component_Impl::SA_POP_Component_Context::_narrow (
               ctx
               );
 
diff --git a/SA_POP/Component/SA_POP_Component_exec.h b/SA_POP/Component/SA_POP_Component_exec.h
index b93238ddd08..b1e8cf49b65 100644
--- a/SA_POP/Component/SA_POP_Component_exec.h
+++ b/SA_POP/Component/SA_POP_Component_exec.h
@@ -65,7 +65,7 @@ namespace CIAO
 */
 
         class SA_POP_COMPONENT_EXEC_Export SA_POP_Component_exec_i
-          : public virtual SA_POP_Component_Exec,
+          : public virtual CIAO_CIAO_RACE_SA_POP_SA_POP_Component_Impl::SA_POP_Component_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
@@ -99,11 +99,11 @@ namespace CIAO
           virtual void ccm_remove ();
 
           protected:
-          SA_POP_Component_Context *context_;
+          CIAO_CIAO_RACE_SA_POP_SA_POP_Component_Impl::SA_POP_Component_Context *context_;
         };
 
         class SA_POP_COMPONENT_EXEC_Export SA_POP_Component_Home_exec_i
-          : public virtual SA_POP_Component_Home_Exec,
+          : public virtual CIAO_CIAO_RACE_SA_POP_SA_POP_Component_Impl::SA_POP_Component_Home_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
diff --git a/SA_POP/Component/SA_POP_Component_exec_export.h b/SA_POP/Component/SA_POP_Component_exec_export.h
deleted file mode 100644
index 1ed93abea83..00000000000
--- a/SA_POP/Component/SA_POP_Component_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SA_POP_COMPONENT_EXEC
-// ------------------------------
-#ifndef SA_POP_COMPONENT_EXEC_EXPORT_H
-#define SA_POP_COMPONENT_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SA_POP_COMPONENT_EXEC_HAS_DLL)
-#  define SA_POP_COMPONENT_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SA_POP_COMPONENT_EXEC_HAS_DLL */
-
-#if !defined (SA_POP_COMPONENT_EXEC_HAS_DLL)
-#  define SA_POP_COMPONENT_EXEC_HAS_DLL 1
-#endif /* ! SA_POP_COMPONENT_EXEC_HAS_DLL */
-
-#if defined (SA_POP_COMPONENT_EXEC_HAS_DLL) && (SA_POP_COMPONENT_EXEC_HAS_DLL == 1)
-#  if defined (SA_POP_COMPONENT_EXEC_BUILD_DLL)
-#    define SA_POP_COMPONENT_EXEC_Export ACE_Proper_Export_Flag
-#    define SA_POP_COMPONENT_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_COMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SA_POP_COMPONENT_EXEC_BUILD_DLL */
-#    define SA_POP_COMPONENT_EXEC_Export ACE_Proper_Import_Flag
-#    define SA_POP_COMPONENT_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_COMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SA_POP_COMPONENT_EXEC_BUILD_DLL */
-#else /* SA_POP_COMPONENT_EXEC_HAS_DLL == 1 */
-#  define SA_POP_COMPONENT_EXEC_Export
-#  define SA_POP_COMPONENT_EXEC_SINGLETON_DECLARATION(T)
-#  define SA_POP_COMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SA_POP_COMPONENT_EXEC_HAS_DLL == 1 */
-
-// Set SA_POP_COMPONENT_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SA_POP_COMPONENT_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SA_POP_COMPONENT_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SA_POP_COMPONENT_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SA_POP_COMPONENT_EXEC_NTRACE */
-
-#if (SA_POP_COMPONENT_EXEC_NTRACE == 1)
-#  define SA_POP_COMPONENT_EXEC_TRACE(X)
-#else /* (SA_POP_COMPONENT_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SA_POP_COMPONENT_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SA_POP_COMPONENT_EXEC_NTRACE == 1) */
-
-#endif /* SA_POP_COMPONENT_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/SA_POP/Component/SA_POP_Component_stub_export.h b/SA_POP/Component/SA_POP_Component_stub_export.h
deleted file mode 100644
index 64287c0e4ec..00000000000
--- a/SA_POP/Component/SA_POP_Component_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SA_POP_COMPONENT_STUB
-// ------------------------------
-#ifndef SA_POP_COMPONENT_STUB_EXPORT_H
-#define SA_POP_COMPONENT_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SA_POP_COMPONENT_STUB_HAS_DLL)
-#  define SA_POP_COMPONENT_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SA_POP_COMPONENT_STUB_HAS_DLL */
-
-#if !defined (SA_POP_COMPONENT_STUB_HAS_DLL)
-#  define SA_POP_COMPONENT_STUB_HAS_DLL 1
-#endif /* ! SA_POP_COMPONENT_STUB_HAS_DLL */
-
-#if defined (SA_POP_COMPONENT_STUB_HAS_DLL) && (SA_POP_COMPONENT_STUB_HAS_DLL == 1)
-#  if defined (SA_POP_COMPONENT_STUB_BUILD_DLL)
-#    define SA_POP_COMPONENT_STUB_Export ACE_Proper_Export_Flag
-#    define SA_POP_COMPONENT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_COMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SA_POP_COMPONENT_STUB_BUILD_DLL */
-#    define SA_POP_COMPONENT_STUB_Export ACE_Proper_Import_Flag
-#    define SA_POP_COMPONENT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_COMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SA_POP_COMPONENT_STUB_BUILD_DLL */
-#else /* SA_POP_COMPONENT_STUB_HAS_DLL == 1 */
-#  define SA_POP_COMPONENT_STUB_Export
-#  define SA_POP_COMPONENT_STUB_SINGLETON_DECLARATION(T)
-#  define SA_POP_COMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SA_POP_COMPONENT_STUB_HAS_DLL == 1 */
-
-// Set SA_POP_COMPONENT_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SA_POP_COMPONENT_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SA_POP_COMPONENT_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SA_POP_COMPONENT_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SA_POP_COMPONENT_STUB_NTRACE */
-
-#if (SA_POP_COMPONENT_STUB_NTRACE == 1)
-#  define SA_POP_COMPONENT_STUB_TRACE(X)
-#else /* (SA_POP_COMPONENT_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SA_POP_COMPONENT_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SA_POP_COMPONENT_STUB_NTRACE == 1) */
-
-#endif /* SA_POP_COMPONENT_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/SA_POP/Component/SA_POP_Component_svnt_export.h b/SA_POP/Component/SA_POP_Component_svnt_export.h
deleted file mode 100644
index b7da19e6be9..00000000000
--- a/SA_POP/Component/SA_POP_Component_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SA_POP_COMPONENT_SVNT
-// ------------------------------
-#ifndef SA_POP_COMPONENT_SVNT_EXPORT_H
-#define SA_POP_COMPONENT_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SA_POP_COMPONENT_SVNT_HAS_DLL)
-#  define SA_POP_COMPONENT_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SA_POP_COMPONENT_SVNT_HAS_DLL */
-
-#if !defined (SA_POP_COMPONENT_SVNT_HAS_DLL)
-#  define SA_POP_COMPONENT_SVNT_HAS_DLL 1
-#endif /* ! SA_POP_COMPONENT_SVNT_HAS_DLL */
-
-#if defined (SA_POP_COMPONENT_SVNT_HAS_DLL) && (SA_POP_COMPONENT_SVNT_HAS_DLL == 1)
-#  if defined (SA_POP_COMPONENT_SVNT_BUILD_DLL)
-#    define SA_POP_COMPONENT_SVNT_Export ACE_Proper_Export_Flag
-#    define SA_POP_COMPONENT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_COMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SA_POP_COMPONENT_SVNT_BUILD_DLL */
-#    define SA_POP_COMPONENT_SVNT_Export ACE_Proper_Import_Flag
-#    define SA_POP_COMPONENT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SA_POP_COMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SA_POP_COMPONENT_SVNT_BUILD_DLL */
-#else /* SA_POP_COMPONENT_SVNT_HAS_DLL == 1 */
-#  define SA_POP_COMPONENT_SVNT_Export
-#  define SA_POP_COMPONENT_SVNT_SINGLETON_DECLARATION(T)
-#  define SA_POP_COMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SA_POP_COMPONENT_SVNT_HAS_DLL == 1 */
-
-// Set SA_POP_COMPONENT_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SA_POP_COMPONENT_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SA_POP_COMPONENT_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SA_POP_COMPONENT_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SA_POP_COMPONENT_SVNT_NTRACE */
-
-#if (SA_POP_COMPONENT_SVNT_NTRACE == 1)
-#  define SA_POP_COMPONENT_SVNT_TRACE(X)
-#else /* (SA_POP_COMPONENT_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SA_POP_COMPONENT_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SA_POP_COMPONENT_SVNT_NTRACE == 1) */
-
-#endif /* SA_POP_COMPONENT_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/SA_POP/SANet/SANetFileIn.h b/SA_POP/SANet/SANetFileIn.h
index 711f23d5a4b..1aeff482abb 100644
--- a/SA_POP/SANet/SANetFileIn.h
+++ b/SA_POP/SANet/SANetFileIn.h
@@ -19,8 +19,8 @@
 #include "SANet.h"
 
 #if !defined (SANET_STANDALONE)
-#include "Builder.h"
-#include "SANetFileIn_Export.h"
+#include "SA_POP/Builder.h"
+#include "SA_POP/SANet/SANetFileIn_Export.h"
 #endif
 
 namespace SANet {
diff --git a/SA_POP/SANet/SANet_Types.h b/SA_POP/SANet/SANet_Types.h
index 0b100a2480c..443ba67efe1 100644
--- a/SA_POP/SANet/SANet_Types.h
+++ b/SA_POP/SANet/SANet_Types.h
@@ -24,7 +24,7 @@
 
 #if !defined (SANET_STANDALONE)
 
-#include "SA_POP_Types.h"
+#include "SA_POP/SA_POP_Types.h"
 
 namespace SANet {
   /// Type of a node id (tasks and conditions).
diff --git a/SA_POP/Tester/Tester_Component.cidl b/SA_POP/Tester/Tester_Component.cidl
deleted file mode 100644
index 93b1ecb60fc..00000000000
--- a/SA_POP/Tester/Tester_Component.cidl
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef TESTER_COMPONENT_CIDL
-#define TESTER_COMPONENT_CIDL
-
-
-#include "Tester_Component.idl"
-
-
-module CIAO
-{
-  module RACE
-  {
-    module SA_POP
-    {
-      composition session Tester_Component_Impl
-      {
-        home executor Tester_Component_Home_Exec
-        {
-          implements Tester_Component_Home;
-          manages    Tester_Component_Exec;
-        };
-      };
-    };
-  };
-};
-
-
-#endif /* TESTER_COMPONENT_CIDL*/
diff --git a/SA_POP/Tester/Tester_Component.mpc b/SA_POP/Tester/Tester_Component.mpc
index 24aa6a6fc69..ec18f55918b 100644
--- a/SA_POP/Tester/Tester_Component.mpc
+++ b/SA_POP/Tester/Tester_Component.mpc
@@ -1,109 +1,140 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -b race_opstring -c tester_client Tester_Component"
 
-project(Tester_Component_stub): ccm_stub, dance_deployment_stub, race_idl {
-  
-  sharedname = Tester_Component_stub
-  
-  after += SA_POP_Component_stub SA_POP_Input_Adapter_stub OpString_stub \
-          RACE_common_stub
-
-
-  libs += SA_POP_Component_stub SA_POP_IA_Component_stub OpString_stub \
-          RACE_common_stub Data_Base_Component_stub DAnCE_OA_Component_stub
-
-
-
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=TESTER_COMPONENT_STUB_Export \
+project(Tester_Component_idl_gen) : componentidldefaults , race_idl  {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=TESTER_COMPONENT_STUB_Export \
               -Wb,stub_export_include=Tester_Component_stub_export.h \
               -Wb,skel_export_macro=TESTER_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Tester_Component_svnt_export.h
-
-  dynamicflags   = TESTER_COMPONENT_STUB_BUILD_DLL
+              -Wb,skel_export_include=Tester_Component_svnt_export.h \
+              -Wb,exec_export_macro=TESTER_COMPONENT_EXEC_Export \
+              -Wb,exec_export_include=Tester_Component_exec_export.h
 
   IDL_Files {
     Tester_Component.idl
   }
-
-  Source_Files {
-    Tester_ComponentC.cpp
-  }
 }
 
-project(Tester_Component_svnt) : ciao_servant, race_idl {
-  after      +=  Tester_Component_stub
-  sharedname  = Tester_Component_svnt
-  libs       += Tester_Component_stub \
-                SA_POP_IA_Component_stub \
-                OpString_stub \
-                SA_POP_Component_stub \
-                RACE_common_stub Data_Base_Component_stub DAnCE_OA_Component_stub
-                
-
-   
-  idlflags -= -GT
-  idlflags += -St -SS \
-              -Wb,export_macro=TESTER_COMPONENT_SVNT_Export \
-              -Wb,export_include=Tester_Component_svnt_export.h
-
+project(Tester_Component_lem_gen) : ciaoidldefaults , race_idl  {
+  after += Tester_Component_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=TESTER_COMPONENT_LEM_STUB_Export \
+              -Wb,stub_export_include=Tester_Component_lem_stub_export.h \
+              -SS -Gxhst
 
-//  cidlflags += -I $(RACE_ROOT) --gen-exec-impl
-  cidlflags += -I $(RACE_ROOT)
+  IDL_Files {
+    Tester_ComponentE.idl
+  }
+}
 
-  dynamicflags = TESTER_COMPONENT_SVNT_BUILD_DLL
+project(Tester_Component_lem_stub) : ccm_svnt , race_opstring, race_ia_stub, sa_pop_ia_admin  {
+  after += Tester_Component_lem_gen Tester_Component_stub SA_POP_Component_stub
+  libs  +=  Tester_Component_stub SA_POP_Component_stub
   
-  CIDL_Files {
-    Tester_Component.cidl
-  }
+  
+  sharedname = Tester_Component_lem_stub
+  dynamicflags   = TESTER_COMPONENT_LEM_STUB_BUILD_DLL
 
   IDL_Files {
-    Tester_ComponentE.idl
   }
 
   Source_Files {
     Tester_ComponentEC.cpp
-    Tester_ComponentS.cpp
-    Tester_Component_svnt.cpp
+  }
+
+  Header_Files {
+    Tester_ComponentEC.h
+    Tester_Component_lem_stub_export.h
+  }
+
+  Inline_Files {
+    Tester_ComponentEC.inl
   }
 }
 
-project(Tester_Component_exec) : ciao_executor, race_common, dance_deployment_stub {
-  after   += Tester_Component_svnt
-  sharedname = Tester_Component_exec
+project(Tester_Component_stub) : ccm_stub , race_opstring, race_ia_stub, sa_pop_ia_admin  {
+  after += Tester_Component_idl_gen SA_POP_Component_stub
+  libs  +=  SA_POP_Component_stub
+  
+  
+  sharedname = Tester_Component_stub
+  dynamicflags   = TESTER_COMPONENT_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
 
-  libs += Tester_Component_stub Tester_Component_svnt \
-                SA_POP_IA_Component_stub \
-                OpString_stub \
-                SA_POP_Component_stub
+  Source_Files {
+    Tester_ComponentC.cpp
+  }
 
-  libs += OpString_stub Data_Base_Component_stub DAnCE_OA_Component_stub RACE_common_stub   
-// TAO_Messaging CIAO_Container_Base TAO_PortableServer
-// CIAO_Events_Base 
+  Header_Files {
+    Tester_ComponentC.h
+    Tester_Component_stub_export.h
+  }
 
-  libpaths += $(ACE_ROOT)/lib
+  Inline_Files {
+    Tester_ComponentC.inl
+  }
+}
 
+project(Tester_Component_exec) : ciao_executor , race_opstring, race_ia_stub, sa_pop_ia_admin  {
+  after   += Tester_Component_lem_stub Tester_Component_stub Tester_Component_svnt SA_POP_Component_stub
+  sharedname = Tester_Component_exec
+  libs += Tester_Component_stub Tester_Component_lem_stub Tester_Component_svnt SA_POP_Component_stub
+  
+  
   dynamicflags   = TESTER_COMPONENT_EXEC_BUILD_DLL
 
   IDL_Files {
-    
   }
 
   Source_Files {
-    
     Tester_Component_exec.cpp
   }
+
+  Header_Files {
+    Tester_Component_exec.h
+    Tester_Component_exec_export.h
+  }
+
+  Inline_Files {
+  }
 }
 
 
-project (Tester_Client) : ccm_stub, valuetype, dance_deployment_stub, race_common {
-  avoids += ace_for_tao
-  exename = tester_client
-  after += Tester_Component_stub
-  libs += Tester_Component_stub OpString_stub Input_Adapter_Base_stub 	Conductor_Component_stub  Controller_Base_stub 	TM_Proxy_Component_stub Effector_Base_stub  
-  libs += SA_POP_Component_stub SA_POP_Component_stub SA_POP_IA_Component_stub RACE_common_stub Data_Base_Component_stub DAnCE_OA_Component_stub
+project(Tester_Component_svnt) : ciao_servant , race_opstring, race_ia_stub, sa_pop_ia_admin  {
+  after      +=   Tester_Component_lem_stub SA_POP_Component_stub
+  sharedname  = Tester_Component_svnt
+  libs       += Tester_Component_stub Tester_Component_lem_stub  SA_POP_Component_stub
+  
+  
+  dynamicflags = TESTER_COMPONENT_SVNT_BUILD_DLL
+  
+  IDL_Files {
+  }
+
+  Source_Files {
+    Tester_ComponentS.cpp
+    Tester_Component_svnt.cpp
+  }
 
+  Header_Files {
+    Tester_ComponentS.h
+    Tester_Component_svnt.h
+    Tester_Component_svnt_export.h
+  }
+
+  Inline_Files {
+    Tester_ComponentS.inl
+  }
+}
 
+project (tester_client) : ccm_stub, valuetype , race_opstring, race_ia_stub, sa_pop_ia_admin  {
+  exename = tester_client
+  after += Tester_Component_stub SA_POP_Component_stub
+  libs  += Tester_Component_stub SA_POP_Component_stub
+  
+  
   IDL_Files {
   }
 
diff --git a/SA_POP/Tester/Tester_Component_exec.cpp b/SA_POP/Tester/Tester_Component_exec.cpp
index 7209120a94f..115b1f44225 100644
--- a/SA_POP/Tester/Tester_Component_exec.cpp
+++ b/SA_POP/Tester/Tester_Component_exec.cpp
@@ -119,7 +119,7 @@ namespace CIAO
           ::Components::SessionContext_ptr ctx)
         {
           this->context_ =
-            Tester_Component_Context::_narrow (ctx);
+            CIAO_CIAO_RACE_SA_POP_Tester_Component_Impl::Tester_Component_Context::_narrow (ctx);
 
           if (this->context_ == 0)
           {
diff --git a/SA_POP/Tester/Tester_Component_exec.h b/SA_POP/Tester/Tester_Component_exec.h
index ab8e28d7e2f..d7cba9f92ce 100644
--- a/SA_POP/Tester/Tester_Component_exec.h
+++ b/SA_POP/Tester/Tester_Component_exec.h
@@ -41,7 +41,7 @@ namespace CIAO
       namespace CIDL_Tester_Component_Impl
       {
         class TESTER_COMPONENT_EXEC_Export Tester_Component_exec_i
-          : public virtual Tester_Component_Exec,
+          : public virtual CIAO_CIAO_RACE_SA_POP_Tester_Component_Impl::Tester_Component_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
@@ -90,11 +90,11 @@ namespace CIAO
           virtual void ccm_remove ();
 
           protected:
-          Tester_Component_Context *context_;
+          CIAO_CIAO_RACE_SA_POP_Tester_Component_Impl::Tester_Component_Context *context_;
         };
 
         class TESTER_COMPONENT_EXEC_Export Tester_Component_Home_exec_i
-          : public virtual Tester_Component_Home_Exec,
+          : public virtual CIAO_CIAO_RACE_SA_POP_Tester_Component_Impl::Tester_Component_Home_Exec,
             public virtual TAO_Local_RefCounted_Object
         {
           public:
diff --git a/SA_POP/Tester/Tester_Component_exec_export.h b/SA_POP/Tester/Tester_Component_exec_export.h
deleted file mode 100644
index c66e5d70928..00000000000
--- a/SA_POP/Tester/Tester_Component_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TESTER_COMPONENT_EXEC
-// ------------------------------
-#ifndef TESTER_COMPONENT_EXEC_EXPORT_H
-#define TESTER_COMPONENT_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TESTER_COMPONENT_EXEC_HAS_DLL)
-#  define TESTER_COMPONENT_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TESTER_COMPONENT_EXEC_HAS_DLL */
-
-#if !defined (TESTER_COMPONENT_EXEC_HAS_DLL)
-#  define TESTER_COMPONENT_EXEC_HAS_DLL 1
-#endif /* ! TESTER_COMPONENT_EXEC_HAS_DLL */
-
-#if defined (TESTER_COMPONENT_EXEC_HAS_DLL) && (TESTER_COMPONENT_EXEC_HAS_DLL == 1)
-#  if defined (TESTER_COMPONENT_EXEC_BUILD_DLL)
-#    define TESTER_COMPONENT_EXEC_Export ACE_Proper_Export_Flag
-#    define TESTER_COMPONENT_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TESTER_COMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TESTER_COMPONENT_EXEC_BUILD_DLL */
-#    define TESTER_COMPONENT_EXEC_Export ACE_Proper_Import_Flag
-#    define TESTER_COMPONENT_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TESTER_COMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TESTER_COMPONENT_EXEC_BUILD_DLL */
-#else /* TESTER_COMPONENT_EXEC_HAS_DLL == 1 */
-#  define TESTER_COMPONENT_EXEC_Export
-#  define TESTER_COMPONENT_EXEC_SINGLETON_DECLARATION(T)
-#  define TESTER_COMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TESTER_COMPONENT_EXEC_HAS_DLL == 1 */
-
-// Set TESTER_COMPONENT_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TESTER_COMPONENT_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TESTER_COMPONENT_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TESTER_COMPONENT_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TESTER_COMPONENT_EXEC_NTRACE */
-
-#if (TESTER_COMPONENT_EXEC_NTRACE == 1)
-#  define TESTER_COMPONENT_EXEC_TRACE(X)
-#else /* (TESTER_COMPONENT_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TESTER_COMPONENT_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TESTER_COMPONENT_EXEC_NTRACE == 1) */
-
-#endif /* TESTER_COMPONENT_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/SA_POP/Tester/Tester_Component_stub_export.h b/SA_POP/Tester/Tester_Component_stub_export.h
deleted file mode 100644
index c092c5bacbf..00000000000
--- a/SA_POP/Tester/Tester_Component_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TESTER_COMPONENT_STUB
-// ------------------------------
-#ifndef TESTER_COMPONENT_STUB_EXPORT_H
-#define TESTER_COMPONENT_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TESTER_COMPONENT_STUB_HAS_DLL)
-#  define TESTER_COMPONENT_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TESTER_COMPONENT_STUB_HAS_DLL */
-
-#if !defined (TESTER_COMPONENT_STUB_HAS_DLL)
-#  define TESTER_COMPONENT_STUB_HAS_DLL 1
-#endif /* ! TESTER_COMPONENT_STUB_HAS_DLL */
-
-#if defined (TESTER_COMPONENT_STUB_HAS_DLL) && (TESTER_COMPONENT_STUB_HAS_DLL == 1)
-#  if defined (TESTER_COMPONENT_STUB_BUILD_DLL)
-#    define TESTER_COMPONENT_STUB_Export ACE_Proper_Export_Flag
-#    define TESTER_COMPONENT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TESTER_COMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TESTER_COMPONENT_STUB_BUILD_DLL */
-#    define TESTER_COMPONENT_STUB_Export ACE_Proper_Import_Flag
-#    define TESTER_COMPONENT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TESTER_COMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TESTER_COMPONENT_STUB_BUILD_DLL */
-#else /* TESTER_COMPONENT_STUB_HAS_DLL == 1 */
-#  define TESTER_COMPONENT_STUB_Export
-#  define TESTER_COMPONENT_STUB_SINGLETON_DECLARATION(T)
-#  define TESTER_COMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TESTER_COMPONENT_STUB_HAS_DLL == 1 */
-
-// Set TESTER_COMPONENT_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TESTER_COMPONENT_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TESTER_COMPONENT_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TESTER_COMPONENT_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TESTER_COMPONENT_STUB_NTRACE */
-
-#if (TESTER_COMPONENT_STUB_NTRACE == 1)
-#  define TESTER_COMPONENT_STUB_TRACE(X)
-#else /* (TESTER_COMPONENT_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TESTER_COMPONENT_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TESTER_COMPONENT_STUB_NTRACE == 1) */
-
-#endif /* TESTER_COMPONENT_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/SA_POP/Tester/Tester_Component_svnt_export.h b/SA_POP/Tester/Tester_Component_svnt_export.h
deleted file mode 100644
index bee073162f3..00000000000
--- a/SA_POP/Tester/Tester_Component_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TESTER_COMPONENT_SVNT
-// ------------------------------
-#ifndef TESTER_COMPONENT_SVNT_EXPORT_H
-#define TESTER_COMPONENT_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TESTER_COMPONENT_SVNT_HAS_DLL)
-#  define TESTER_COMPONENT_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TESTER_COMPONENT_SVNT_HAS_DLL */
-
-#if !defined (TESTER_COMPONENT_SVNT_HAS_DLL)
-#  define TESTER_COMPONENT_SVNT_HAS_DLL 1
-#endif /* ! TESTER_COMPONENT_SVNT_HAS_DLL */
-
-#if defined (TESTER_COMPONENT_SVNT_HAS_DLL) && (TESTER_COMPONENT_SVNT_HAS_DLL == 1)
-#  if defined (TESTER_COMPONENT_SVNT_BUILD_DLL)
-#    define TESTER_COMPONENT_SVNT_Export ACE_Proper_Export_Flag
-#    define TESTER_COMPONENT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TESTER_COMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TESTER_COMPONENT_SVNT_BUILD_DLL */
-#    define TESTER_COMPONENT_SVNT_Export ACE_Proper_Import_Flag
-#    define TESTER_COMPONENT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TESTER_COMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TESTER_COMPONENT_SVNT_BUILD_DLL */
-#else /* TESTER_COMPONENT_SVNT_HAS_DLL == 1 */
-#  define TESTER_COMPONENT_SVNT_Export
-#  define TESTER_COMPONENT_SVNT_SINGLETON_DECLARATION(T)
-#  define TESTER_COMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TESTER_COMPONENT_SVNT_HAS_DLL == 1 */
-
-// Set TESTER_COMPONENT_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TESTER_COMPONENT_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TESTER_COMPONENT_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TESTER_COMPONENT_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TESTER_COMPONENT_SVNT_NTRACE */
-
-#if (TESTER_COMPONENT_SVNT_NTRACE == 1)
-#  define TESTER_COMPONENT_SVNT_TRACE(X)
-#else /* (TESTER_COMPONENT_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TESTER_COMPONENT_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TESTER_COMPONENT_SVNT_NTRACE == 1) */
-
-#endif /* TESTER_COMPONENT_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/SA_POP/examples/Space/source/Analysis/Analysis_Component.cidl b/SA_POP/examples/Space/source/Analysis/Analysis_Component.cidl
deleted file mode 100644
index 8b60ad8f75a..00000000000
--- a/SA_POP/examples/Space/source/Analysis/Analysis_Component.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _ANALYSIS_COMPONENT_CIDL_
-#define _ANALYSIS_COMPONENT_CIDL_
-
-#include "Analysis_Component.idl"
-
-composition session Analysis_Component
-{
-  home executor Analysis_Component_Factory_Exec
-  {
-    implements SPACE::Analysis_Component_Factory;
-    manages Analysis_Component_Exec;
-  };
-};
-
-#endif  // !defined _ANALYSIS_COMPONENT_CIDL_
diff --git a/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High.cidl b/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High.cidl
deleted file mode 100644
index 87d82b5627b..00000000000
--- a/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _BACKUP_GIZMO_HIGH_CIDL_
-#define _BACKUP_GIZMO_HIGH_CIDL_
-
-#include "Backup_Gizmo_High.idl"
-
-composition session Backup_Gizmo_Low
-{
-  home executor Backup_Gizmo_High_Factory_Exec
-  {
-    implements SPACE::Backup_Gizmo_High_Factory;
-    manages Backup_Gizmo_High_Exec;
-  };
-};
-
-#endif  // !defined _BACKUP_GIZMO_HIGH_CIDL_
diff --git a/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low.cidl b/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low.cidl
deleted file mode 100644
index 6e646899c96..00000000000
--- a/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _BACKUP_GIZMO_LOW_CIDL_
-#define _BACKUP_GIZMO_LOW_CIDL_
-
-#include "Backup_Gizmo_Low.idl"
-
-composition session Backup_Gizmo_Low
-{
-  home executor Backup_Gizmo_Low_Factory_Exec
-  {
-    implements SPACE::Backup_Gizmo_Low_Factory;
-    manages Backup_Gizmo_Low_Exec;
-  };
-};
-
-#endif  // !defined _BACKUP_GIZMO_LOW_CIDL_
diff --git a/SA_POP/examples/Space/source/Comm/Comm_Component.cidl b/SA_POP/examples/Space/source/Comm/Comm_Component.cidl
deleted file mode 100644
index a966eb535d4..00000000000
--- a/SA_POP/examples/Space/source/Comm/Comm_Component.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _COMM_COMPONENT_CIDL_
-#define _COMM_COMPONENT_CIDL_
-
-#include "Comm_Component.idl"
-
-composition session Comm_Component
-{
-  home executor Comm_Component_Factory_Exec
-  {
-    implements SPACE::Comm_Component_Factory;
-    manages Comm_Component_Exec;
-  };
-};
-
-#endif  // !defined _COMM_COMPONENT_CIDL_
diff --git a/SA_POP/examples/Space/source/Compression/Compression_Component.cidl b/SA_POP/examples/Space/source/Compression/Compression_Component.cidl
deleted file mode 100644
index e2e6aa14e37..00000000000
--- a/SA_POP/examples/Space/source/Compression/Compression_Component.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _COMPRESSION_COMPONENT_CIDL_
-#define _COMPRESSION_COMPONENT_CIDL_
-
-#include "Compression_Component.idl"
-
-composition session Compression_Component
-{
-  home executor Compression_Component_Factory_Exec
-  {
-    implements SPACE::Compression_Component_Factory;
-    manages Compression_Component_Exec;
-  };
-};
-
-#endif  // !defined _COMPRESSION_COMPONENT_CIDL_
diff --git a/SA_POP/examples/Space/source/Exec/Exec_Component.cidl b/SA_POP/examples/Space/source/Exec/Exec_Component.cidl
deleted file mode 100644
index b2a495cd4fd..00000000000
--- a/SA_POP/examples/Space/source/Exec/Exec_Component.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _EXEC_COMPONENT_CIDL_
-#define _EXEC_COMPONENT_CIDL_
-
-#include "Exec_Component.idl"
-
-composition session Exec_Component
-{
-  home executor Exec_Component_Factory_Exec
-  {
-    implements SPACE::Exec_Component_Factory;
-    manages Exec_Component_Exec;
-  };
-};
-
-#endif  // !defined _EXEC_COMPONENT_CIDL_
diff --git a/SA_POP/examples/Space/source/Filter/Filter_Component.cidl b/SA_POP/examples/Space/source/Filter/Filter_Component.cidl
deleted file mode 100644
index 0d03344009d..00000000000
--- a/SA_POP/examples/Space/source/Filter/Filter_Component.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _FILTER_COMPONENT_CIDL_
-#define _FILTER_COMPONENT_CIDL_
-
-#include "Filter_Component.idl"
-
-composition session Filter_Component
-{
-  home executor Filter_Component_Factory_Exec
-  {
-    implements SPACE::Filter_Component_Factory;
-    manages Filter_Component_Exec;
-  };
-};
-
-#endif  // !defined _FILTER_COMPONENT_CIDL_
diff --git a/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High.cidl b/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High.cidl
deleted file mode 100644
index a362e738e9c..00000000000
--- a/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _GIZMO1_HIGH_CIDL_
-#define _GIZMO1_HIGH_CIDL_
-
-#include "Gizmo1_High.idl"
-
-composition session Gizmo1_High
-{
-  home executor Gizmo1_High_Factory_Exec
-  {
-    implements SPACE::Gizmo1_High_Factory;
-    manages Gizmo1_High_Exec;
-  };
-};
-
-#endif  // !defined _GIZMO1_HIGH_CIDL_
diff --git a/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low.cidl b/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low.cidl
deleted file mode 100644
index 36b61d835e5..00000000000
--- a/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _GIZMO1_LOW_CIDL_
-#define _GIZMO1_LOW_CIDL_
-
-#include "Gizmo1_Low.idl"
-
-composition session Gizmo1_Low
-{
-  home executor Gizmo1_Low_Factory_Exec
-  {
-    implements SPACE::Gizmo1_Low_Factory;
-    manages Gizmo1_Low_Exec;
-  };
-};
-
-#endif  // !defined _GIZMO1_LOW_CIDL_
diff --git a/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium.cidl b/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium.cidl
deleted file mode 100644
index 89e0750fcd1..00000000000
--- a/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _GIZMO1_MEDIUM_CIDL_
-#define _GIZMO1_MEDIUM_CIDL_
-
-#include "Gizmo1_Medium.idl"
-
-composition session Gizmo1_Medium
-{
-  home executor Gizmo1_Medium_Factory_Exec
-  {
-    implements SPACE::Gizmo1_Medium_Factory;
-    manages Gizmo1_Medium_Exec;
-  };
-};
-
-#endif  // !defined _GIZMO1_MEDIUM_CIDL_
diff --git a/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High.cidl b/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High.cidl
deleted file mode 100644
index 8de97787a59..00000000000
--- a/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _GIZMO2_HIGH_CIDL_
-#define _GIZMO2_HIGH_CIDL_
-
-#include "Gizmo2_High.idl"
-
-composition session Gizmo2_High
-{
-  home executor Gizmo2_High_Factory_Exec
-  {
-    implements SPACE::Gizmo2_High_Factory;
-    manages Gizmo2_High_Exec;
-  };
-};
-
-#endif  // !defined _GIZMO2_HIGH_CIDL_
diff --git a/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium.cidl b/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium.cidl
deleted file mode 100644
index 85605f18763..00000000000
--- a/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _GIZMO2_MEDIUM_CIDL_
-#define _GIZMO2_MEDIUM_CIDL_
-
-#include "Gizmo2_Medium.idl"
-
-composition session Gizmo2_Medium
-{
-  home executor Gizmo2_Medium_Factory_Exec
-  {
-    implements SPACE::Gizmo2_Medium_Factory;
-    manages Gizmo2_Medium_Exec;
-  };
-};
-
-#endif  // !defined _GIZMO2_MEDIUM_CIDL_
diff --git a/SA_POP/examples/Space/source/Ground/Ground_Component.cidl b/SA_POP/examples/Space/source/Ground/Ground_Component.cidl
deleted file mode 100644
index afdb1ac417c..00000000000
--- a/SA_POP/examples/Space/source/Ground/Ground_Component.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _GROUND_COMPONENT_CIDL_
-#define _GROUND_COMPONENT_CIDL_
-
-#include "Ground_Component.idl"
-
-composition session Ground_Component
-{
-  home executor Ground_Station_Factory_Exec
-  {
-    implements SPACE::Ground_Station_Factory;
-    manages Ground_Station_Exec;
-  };
-};
-
-#endif  // !defined _GROUND_COMPONENT_CIDL_
diff --git a/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo.cidl b/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo.cidl
deleted file mode 100644
index b283dced00f..00000000000
--- a/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo.cidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- CIDL -*-
-
-// This file was generated by
-// $Id$
-
-#ifndef _PRIMARY_GIZMO_CIDL_
-#define _PRIMARY_GIZMO_CIDL_
-
-#include "Primary_Gizmo.idl"
-
-composition session Primary_Gizmo
-{
-  home executor Primary_Gizmo_Factory_Exec
-  {
-    implements SPACE::Primary_Gizmo_Factory;
-    manages Primary_Gizmo_Exec;
-  };
-};
-
-#endif  // !defined _PRIMARY_GIZMO_CIDL_
diff --git a/TM_Daemon/TM_Daemon.mpc b/TM_Daemon/TM_Daemon.mpc
index 9f89fa51a0a..ccdffc78add 100644
--- a/TM_Daemon/TM_Daemon.mpc
+++ b/TM_Daemon/TM_Daemon.mpc
@@ -1,19 +1,70 @@
-project(TM_Daemon_stub): dance_deployment_stub {
-  sharedname = TM_Daemon_stub
-  dynamicflags = TM_DAEMON_STUB_BUILD_DLL
+// $Id$
+// This file is generated with "generate_component_mpc.pl -b race_common, dance_deployment_stub -n TM_Daemon"
 
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=TM_DAEMON_STUB_Export \
+project(TM_Daemon_idl_gen) : componentidldefaults , race_idl  {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=TM_DAEMON_STUB_Export \
               -Wb,stub_export_include=TM_Daemon_stub_export.h \
-              -Wb,skel_export_macro=TM_DAEMON_SVNT_Export \
-              -Wb,skel_export_include=TM_Daemon_svnt_export.h
+              -Wb,skel_export_macro=TM_DAEMON_SKEL_Export \
+              -Wb,skel_export_include=TM_Daemon_skel_export.h \
+              -Wb,exec_export_macro=TM_DAEMON_EXEC_Export \
+              -Wb,exec_export_include=TM_Daemon_exec_export.h
 
   IDL_Files {
     TM_Daemon.idl
   }
+}
+
+project(TM_Daemon_stub) : ccm_stub , race_common, dance_deployment_stub  {
+  after += TM_Daemon_idl_gen 
+  libs  += 
+  
+  
+  sharedname = TM_Daemon_stub
+  dynamicflags   = TM_DAEMON_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
 
   Source_Files {
     TM_DaemonC.cpp
   }
+
+  Header_Files {
+    TM_DaemonC.h
+    TM_Daemon_stub_export.h
+  }
+
+  Inline_Files {
+    TM_DaemonC.inl
+  }
 }
+
+
+project(TM_Daemon_skel) : ciao_executor , race_common, dance_deployment_stub  {
+  after      +=  TM_Daemon_stub TM_Daemon_lem_stub
+  sharedname  = TM_Daemon_skel
+  libs       += TM_Daemon_stub
+ 
+  
+  
+  dynamicflags = TM_DAEMON_SKEL_BUILD_DLL
+  
+  IDL_Files {
+  }
+
+  Source_Files {
+    TM_DaemonS.cpp
+  }
+
+  Header_Files {
+    TM_DaemonS.h
+    TM_Daemon_skel_export.h
+  }
+
+  Inline_Files {
+    TM_DaemonS.inl
+  }
+}
+
+
diff --git a/TM_Daemon/TM_Daemon_stub_export.h b/TM_Daemon/TM_Daemon_stub_export.h
deleted file mode 100644
index 691f3a56c58..00000000000
--- a/TM_Daemon/TM_Daemon_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TM_DAEMON_STUB
-// ------------------------------
-#ifndef TM_DAEMON_STUB_EXPORT_H
-#define TM_DAEMON_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TM_DAEMON_STUB_HAS_DLL)
-#  define TM_DAEMON_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TM_DAEMON_STUB_HAS_DLL */
-
-#if !defined (TM_DAEMON_STUB_HAS_DLL)
-#  define TM_DAEMON_STUB_HAS_DLL 1
-#endif /* ! TM_DAEMON_STUB_HAS_DLL */
-
-#if defined (TM_DAEMON_STUB_HAS_DLL) && (TM_DAEMON_STUB_HAS_DLL == 1)
-#  if defined (TM_DAEMON_STUB_BUILD_DLL)
-#    define TM_DAEMON_STUB_Export ACE_Proper_Export_Flag
-#    define TM_DAEMON_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TM_DAEMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TM_DAEMON_STUB_BUILD_DLL */
-#    define TM_DAEMON_STUB_Export ACE_Proper_Import_Flag
-#    define TM_DAEMON_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TM_DAEMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TM_DAEMON_STUB_BUILD_DLL */
-#else /* TM_DAEMON_STUB_HAS_DLL == 1 */
-#  define TM_DAEMON_STUB_Export
-#  define TM_DAEMON_STUB_SINGLETON_DECLARATION(T)
-#  define TM_DAEMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TM_DAEMON_STUB_HAS_DLL == 1 */
-
-// Set TM_DAEMON_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TM_DAEMON_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TM_DAEMON_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TM_DAEMON_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TM_DAEMON_STUB_NTRACE */
-
-#if (TM_DAEMON_STUB_NTRACE == 1)
-#  define TM_DAEMON_STUB_TRACE(X)
-#else /* (TM_DAEMON_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TM_DAEMON_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TM_DAEMON_STUB_NTRACE == 1) */
-
-#endif /* TM_DAEMON_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TM_Proxy/SystemSnapshot.cpp b/TM_Proxy/SystemSnapshot.cpp
index 6dfdd5ad6d0..efc5e412c0e 100644
--- a/TM_Proxy/SystemSnapshot.cpp
+++ b/TM_Proxy/SystemSnapshot.cpp
@@ -1,35 +1,26 @@
 // $Id$
 #include "SystemSnapshot.h"
 
-namespace CIAO
+namespace CIAO_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Impl
 {
-  namespace RACE
+  SystemSnapshot_exec_i::SystemSnapshot_exec_i 
+  (::CIAO::TM_Daemon::Daemon_ptr TM,
+   Logger &logger)
+    : TM_Daemon_ (::CIAO::TM_Daemon::Daemon::_duplicate (TM)),
+      logger_ (logger)
   {
-    namespace TM_Proxy
-    {
-      namespace CIDL_TM_Proxy_Component_Impl
-      {
-        SystemSnapshot_exec_i::SystemSnapshot_exec_i 
-          (::CIAO::TM_Daemon::Daemon_ptr TM,
-          Logger &logger)
-          : TM_Daemon_ (::CIAO::TM_Daemon::Daemon::_duplicate (TM)),
-            logger_ (logger)
-        {
-        }
+  }
 
-        SystemSnapshot_exec_i::~SystemSnapshot_exec_i (void)
-        {
-        }
+  SystemSnapshot_exec_i::~SystemSnapshot_exec_i (void)
+  {
+  }
 
-        ::Deployment::Domain* 
-          SystemSnapshot_exec_i::getSnapshot ()
-        {
-          std::string msg = "Entering SystemSnapshot_exec_i::getSnapshot ()\n";
-          msg += "Leaving SystemSnapshot_exec_i::getSnapshot ()\n";
-          this->logger_.log (msg);          
-          return this->TM_Daemon_->getSnapshot ();
-        }
-      }
-    }
+  ::Deployment::Domain* 
+  SystemSnapshot_exec_i::getSnapshot ()
+  {
+    std::string msg = "Entering SystemSnapshot_exec_i::getSnapshot ()\n";
+    msg += "Leaving SystemSnapshot_exec_i::getSnapshot ()\n";
+    this->logger_.log (msg);          
+    return this->TM_Daemon_->getSnapshot ();
   }
 }
diff --git a/TM_Proxy/SystemSnapshot.h b/TM_Proxy/SystemSnapshot.h
index 53efd98f643..f0291866f17 100644
--- a/TM_Proxy/SystemSnapshot.h
+++ b/TM_Proxy/SystemSnapshot.h
@@ -13,41 +13,35 @@
 #include "TM_Proxy_exec_export.h"
 #include "tao/LocalObject.h"
 
-#include "TM_DaemonC.h"
-#include "Logger.h"
+#include "TM_Daemon/TM_DaemonC.h"
+#include "utils/Logger.h"
 
+using namespace CIAO::RACE;
 
-namespace CIAO
+
+namespace CIAO_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Impl
 {
-  namespace RACE
+  
+  class TM_PROXY_EXEC_Export SystemSnapshot_exec_i
+    : public virtual ::CIAO::RACE::TM_Proxy::CCM_SystemSnapshot,
+      public virtual TAO_Local_RefCounted_Object
   {
-    namespace TM_Proxy
-    {
-      namespace CIDL_TM_Proxy_Component_Impl
-      {
-        class TM_PROXY_EXEC_Export SystemSnapshot_exec_i
-          : public virtual ::CIAO::RACE::TM_Proxy::CCM_SystemSnapshot,
-          public virtual TAO_Local_RefCounted_Object
-        {
-        public:
-          SystemSnapshot_exec_i 
-            (::CIAO::TM_Daemon::Daemon_ptr TM,
-             Logger &logger);
+  public:
+    SystemSnapshot_exec_i 
+      (::CIAO::TM_Daemon::Daemon_ptr TM,
+       Logger &logger);
 
-          virtual ~SystemSnapshot_exec_i (void);
+    virtual ~SystemSnapshot_exec_i (void);
 
-          virtual ::Deployment::Domain* getSnapshot ();
+    virtual ::Deployment::Domain* getSnapshot ();
 
-        private:
+  private:
 
-          ::CIAO::TM_Daemon::Daemon_var TM_Daemon_;
+    ::CIAO::TM_Daemon::Daemon_var TM_Daemon_;
 
-          Logger &logger_;
+    Logger &logger_;
 
-        };
-      }
-    }
-  }
+  };
 }
 #include /**/ "ace/post.h"
 
diff --git a/TM_Proxy/TM_Proxy.cidl b/TM_Proxy/TM_Proxy.cidl
deleted file mode 100644
index c41d1d05196..00000000000
--- a/TM_Proxy/TM_Proxy.cidl
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-/*
- * @file TM_Proxy.cidl
- * @brief The file contains the TM_Proxy component defination.
- * @author Nishanth Shankaran <nshankar@nospam.com>
- *
- */
-
-#ifndef TM_PROXY_CIDL
-#define TM_PROXY_CIDL
-#include "TM_Proxy.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    module TM_Proxy
-    {
-      composition session TM_Proxy_Component_Impl
-      {
-        home executor TM_Proxy_Component_Home_Exec
-        {
-          implements TM_Proxy_Component_Home;
-          manages    TM_Proxy_Component_Exec;
-        };
-      };
-    };
-  };
-};
-
-#endif /* TM_PROXY_CIDL */
diff --git a/TM_Proxy/TM_Proxy.idl b/TM_Proxy/TM_Proxy.idl
index f4cc44f9846..319fd8cd70f 100644
--- a/TM_Proxy/TM_Proxy.idl
+++ b/TM_Proxy/TM_Proxy.idl
@@ -12,6 +12,7 @@
 
 #include "Components.idl"
 #include "DAnCE/Deployment/Deployment_TargetData.idl"
+
 module CIAO
 {
   module RACE
diff --git a/TM_Proxy/TM_Proxy.mpc b/TM_Proxy/TM_Proxy.mpc
index f4e6ca2078d..dbf9b6397f0 100644
--- a/TM_Proxy/TM_Proxy.mpc
+++ b/TM_Proxy/TM_Proxy.mpc
@@ -1,86 +1,88 @@
 // $Id$
-project(TM_Proxy_stub) : ccm_stub, dance_deployment_stub, race_idl {
-  sharedname = TM_Proxy_Component_stub
-  dynamicflags   = TM_PROXY_STUB_BUILD_DLL
+// This file is generated with "generate_component_mpc.pl -b race_common, dance_deployment_stub TM_Proxy"
 
-  idlflags -= -GT
-  idlflags += -St \
-              -Wb,stub_export_macro=TM_PROXY_STUB_Export \
+project(TM_Proxy_idl_gen) : componentidldefaults , race_idl  {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=TM_PROXY_STUB_Export \
               -Wb,stub_export_include=TM_Proxy_stub_export.h \
               -Wb,skel_export_macro=TM_PROXY_SVNT_Export \
-              -Wb,skel_export_include=TM_Proxy_svnt_export.h
+              -Wb,skel_export_include=TM_Proxy_svnt_export.h \
+              -Wb,exec_export_macro=TM_PROXY_EXEC_Export \
+              -Wb,exec_export_include=TM_Proxy_exec_export.h
 
   IDL_Files {
     TM_Proxy.idl
   }
+}
 
-  Source_Files {
-    TM_ProxyC.cpp
-  }
-
-  Header_Files {
-    TM_ProxyC.h
-    TM_Proxy_stub_export.h
-  }
+project(TM_Proxy_lem_gen) : ciaoidldefaults , race_idl  {
+  after += TM_Proxy_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=TM_PROXY_LEM_STUB_Export \
+              -Wb,stub_export_include=TM_Proxy_lem_stub_export.h \
+              -SS -Gxhst
 
-  Inline_Files {
-    TM_ProxyC.inl
+  IDL_Files {
+    TM_ProxyE.idl
   }
 }
 
-project(TM_Proxy_svnt) : ciao_servant, race_idl, dance_deployment_svnt {
-  after      += TM_Proxy_stub
-  sharedname  = TM_Proxy_Component_svnt
-  libs       += TM_Proxy_Component_stub
-
-  dynamicflags = TM_PROXY_SVNT_BUILD_DLL
-  idlflags -= -GT
-  idlflags += -St -SS \
-              -Wb,export_macro=TM_PROXY_SVNT_Export \
-              -Wb,export_include=TM_Proxy_svnt_export.h
-
-
-  CIDL_Files {
-    TM_Proxy.cidl
-  }
+project(TM_Proxy_lem_stub) : ccm_svnt , race_common, dance_deployment_stub  {
+  after += TM_Proxy_lem_gen TM_Proxy_stub 
+  libs  +=  TM_Proxy_stub
+  
+  
+  sharedname = TM_Proxy_lem_stub
+  dynamicflags   = TM_PROXY_LEM_STUB_BUILD_DLL
 
   IDL_Files {
-    TM_ProxyE.idl
   }
 
   Source_Files {
     TM_ProxyEC.cpp
-    TM_ProxyS.cpp
-    TM_Proxy_svnt.cpp
   }
 
   Header_Files {
     TM_ProxyEC.h
-    TM_ProxyS.h
-    TM_Proxy_svnt.h
-    TM_Proxy_svnt_export.h
+    TM_Proxy_lem_stub_export.h
   }
 
   Inline_Files {
     TM_ProxyEC.inl
-    TM_ProxyS.inl
   }
 }
 
-project(TM_Proxy_exec) : ciao_executor, race_common, naming {
-  after   +=  TM_Proxy_svnt \
-              TM_Daemon_stub
+project(TM_Proxy_stub) : ccm_stub , race_common, dance_deployment_stub  {
+  after += TM_Proxy_idl_gen 
+  libs  += 
+  
+  
+  sharedname = TM_Proxy_stub
+  dynamicflags   = TM_PROXY_STUB_BUILD_DLL
 
-  sharedname = TM_Proxy_Component_exec
+  IDL_Files {
+  }
 
-  libs += TM_Proxy_Component_stub \
-     	  RACE_utils \
-          TM_Proxy_Component_svnt \
-          TM_Daemon_stub
+  Source_Files {
+    TM_ProxyC.cpp
+  }
 
- includes += $(RACE_ROOT)/utils \
-             $(RACE_ROOT)/TM_Daemon
+  Header_Files {
+    TM_ProxyC.h
+    TM_Proxy_stub_export.h
+  }
 
+  Inline_Files {
+    TM_ProxyC.inl
+  }
+}
+
+project(TM_Proxy_exec) : ciao_executor , race_common, dance_deployment_stub, naming, tm_daemon_stub, race_utils  {
+  after   += TM_Proxy_lem_stub TM_Proxy_stub TM_Proxy_svnt
+  sharedname = TM_Proxy_exec
+  libs += TM_Proxy_stub TM_Proxy_lem_stub CIAO_Context_Impl TM_Proxy_svnt
+  
+  
   dynamicflags   = TM_PROXY_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -88,16 +90,46 @@ project(TM_Proxy_exec) : ciao_executor, race_common, naming {
 
   Source_Files {
     TM_Proxy_exec.cpp
-    Utility.cpp
     SystemSnapshot.cpp
     ResourceManager.cpp
+    Utility.cpp
   }
 
   Header_Files {
     TM_Proxy_exec.h
     TM_Proxy_exec_export.h
-    Utility.h
-    SystemSnapshot.h
-    ResourceManager.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(TM_Proxy_svnt) : ciao_servant , race_common, dance_deployment_stub, tm_daemon_stub  {
+  after      +=   TM_Proxy_lem_stub
+  sharedname  = TM_Proxy_svnt
+  libs       += TM_Proxy_stub TM_Proxy_lem_stub  
+  
+  
+  dynamicflags = TM_PROXY_SVNT_BUILD_DLL
+  
+  IDL_Files {
+  }
+
+  Source_Files {
+    TM_ProxyS.cpp
+    TM_Proxy_svnt.cpp
+  }
+
+  Header_Files {
+    TM_ProxyS.h
+    TM_Proxy_svnt.h
+    TM_Proxy_svnt_export.h
+  }
+
+  Inline_Files {
+    TM_ProxyS.inl
   }
 }
+
+
diff --git a/TM_Proxy/TM_Proxy_exec.cpp b/TM_Proxy/TM_Proxy_exec.cpp
index 3c539f89975..9c435db0516 100644
--- a/TM_Proxy/TM_Proxy_exec.cpp
+++ b/TM_Proxy/TM_Proxy_exec.cpp
@@ -9,188 +9,179 @@
 
 #include "ciao/Containers/Container_Base.h"
 
-namespace CIAO
+namespace CIAO_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Impl
 {
-  namespace RACE
+  TM_Proxy_Component_exec_i::TM_Proxy_Component_exec_i (void)
+    : logger_ ("TM_Proxy.log")
   {
-    namespace TM_Proxy
-    {
-      namespace CIDL_TM_Proxy_Component_Impl
+  }
+
+  TM_Proxy_Component_exec_i::~TM_Proxy_Component_exec_i (void)
+  {
+  }
+  // Attribute operations.
+  char *
+  TM_Proxy_Component_exec_i::TM_Name ()
+  {
+    return CORBA::string_dup (this->TM_Name_.in ());
+  }
+
+  void
+  TM_Proxy_Component_exec_i::TM_Name (const char * name )
+  {
+    this->TM_Name_ = CORBA::string_dup (name);
+  }
+
+  // Port operations.
+
+  ::CIAO::RACE::TM_Proxy::CCM_SystemSnapshot_ptr
+  TM_Proxy_Component_exec_i::get_snapshot ()
+  {
+    // Your code here.
+    return new SystemSnapshot_exec_i
+      (this->TM_Daemon_.in (), this->logger_);
+  }
+
+  ::CIAO::RACE::TM_Proxy::CCM_Utility_ptr
+  TM_Proxy_Component_exec_i::get_utils ()
+  {
+    // Your code here.
+    return new Utility_exec_i (this->TM_Daemon_.in(), this->logger_);
+  }
+
+  ::CIAO::RACE::TM_Proxy::CCM_ResourceManager_ptr
+  TM_Proxy_Component_exec_i::get_manager ()
+  {
+    // Your code here.
+    return ::CIAO::RACE::TM_Proxy::CCM_ResourceManager::_nil ();
+  }
+
+  // Operations from Components::SessionComponent
+
+  void
+  TM_Proxy_Component_exec_i::set_session_context (
+                                                  ::Components::SessionContext_ptr ctx)
+  {
+    this->context_ =
+      TM_Proxy_Component_Context::_narrow (ctx);
+    if (CORBA::is_nil (this->context_))
       {
-        TM_Proxy_Component_exec_i::TM_Proxy_Component_exec_i (void)
-          : logger_ ("TM_Proxy.log")
-        {
-        }
-
-        TM_Proxy_Component_exec_i::~TM_Proxy_Component_exec_i (void)
-        {
-        }
-        // Attribute operations.
-        char *
-          TM_Proxy_Component_exec_i::TM_Name ()
-        {
-          return CORBA::string_dup (this->TM_Name_.in ());
-        }
-
-        void
-          TM_Proxy_Component_exec_i::TM_Name (const char * name )
-        {
-          this->TM_Name_ = CORBA::string_dup (name);
-        }
-
-        // Port operations.
-
-        ::CIAO::RACE::TM_Proxy::CCM_SystemSnapshot_ptr
-          TM_Proxy_Component_exec_i::get_snapshot ()
-        {
-          // Your code here.
-          return new SystemSnapshot_exec_i
-            (this->TM_Daemon_.in (), this->logger_);
-        }
-
-        ::CIAO::RACE::TM_Proxy::CCM_Utility_ptr
-          TM_Proxy_Component_exec_i::get_utils ()
-        {
-          // Your code here.
-          return new Utility_exec_i (this->TM_Daemon_.in(), this->logger_);
-        }
-
-        ::CIAO::RACE::TM_Proxy::CCM_ResourceManager_ptr
-          TM_Proxy_Component_exec_i::get_manager ()
-        {
-          // Your code here.
-          return ::CIAO::RACE::TM_Proxy::CCM_ResourceManager::_nil ();
-        }
-
-        // Operations from Components::SessionComponent
-
-        void
-          TM_Proxy_Component_exec_i::set_session_context (
-          ::Components::SessionContext_ptr ctx)
-        {
-          this->context_ =
-            TM_Proxy_Component_Context::_narrow (ctx);
-          if (CORBA::is_nil (this->context_))
-          {
-            throw ::CORBA::INTERNAL ();
-          }
-        }
-
-        void
-          TM_Proxy_Component_exec_i::ciao_preactivate ()
-        {
-          // Your code here.
-        }
-
-        void
-          TM_Proxy_Component_exec_i::configuration_complete ()
-        {
-          std::stringstream msg;
-          msg << "TM_Proxy_Component_exec_i::"
-                 "configuration_complete (): Trying to obtain "
-                 "the object reference of the TM\n";
-          try
+        throw ::CORBA::INTERNAL ();
+      }
+  }
+
+  void
+  TM_Proxy_Component_exec_i::ciao_preactivate ()
+  {
+    // Your code here.
+  }
+
+  void
+  TM_Proxy_Component_exec_i::configuration_complete ()
+  {
+    std::stringstream msg;
+    msg << "TM_Proxy_Component_exec_i::"
+      "configuration_complete (): Trying to obtain "
+      "the object reference of the TM\n";
+    try
+      {
+        ::CORBA::ORB_ptr orb =
+          dynamic_cast<CIAO::Container_i *>  (this->context_->_ciao_the_Container())->the_ORB();
+
+        /// Trying to get the object reference from the Naming Service.
+        CORBA::Object_var naming_obj =
+          orb->resolve_initial_references ("NameService");
+        if (CORBA::is_nil (naming_obj.in ()))
           {
-            ::CORBA::ORB_ptr orb =
-              dynamic_cast<CIAO::Container_i *>  (this->context_->_ciao_the_Container())->the_ORB();
-
-            /// Trying to get the object reference from the Naming Service.
-            CORBA::Object_var naming_obj =
-              orb->resolve_initial_references ("NameService");
-            if (CORBA::is_nil (naming_obj.in ()))
-            {
-              msg << "Unable to resolve the Name Service.\n";
-              this->logger_.log (msg.str());
-              return;
-            }
-
-            CosNaming::NamingContext_var namingContext =
-              CosNaming::NamingContext::_narrow (naming_obj.in ());
-            CosNaming::Name name (1);
-            name.length (1);
-            name[0].id = CORBA::string_dup (this->TM_Name_.in ());
-            CORBA::Object_var TM = namingContext->resolve (name);
-            msg << "Now trying to resolve \""
-                << this->TM_Name_.in () << "\" from the naming service...";
-            this->TM_Daemon_ =
-              ::CIAO::TM_Daemon::Daemon::_narrow (TM.in ());
-
-            if (CORBA::is_nil (this->TM_Daemon_.in ()))
-            {
-              msg << "\nObject reference of TM_Daemon is nil!\n";
-
-            }
-            msg << "... done!\n"
-                << "Successfully obtained the object reference of the TM\n";
+            msg << "Unable to resolve the Name Service.\n";
+            this->logger_.log (msg.str());
+            return;
           }
-          catch (CORBA::Exception &ex)
+
+        CosNaming::NamingContext_var namingContext =
+          CosNaming::NamingContext::_narrow (naming_obj.in ());
+        CosNaming::Name name (1);
+        name.length (1);
+        name[0].id = CORBA::string_dup (this->TM_Name_.in ());
+        CORBA::Object_var TM = namingContext->resolve (name);
+        msg << "Now trying to resolve \""
+            << this->TM_Name_.in () << "\" from the naming service...";
+        this->TM_Daemon_ =
+          ::CIAO::TM_Daemon::Daemon::_narrow (TM.in ());
+
+        if (CORBA::is_nil (this->TM_Daemon_.in ()))
           {
-            msg <<  "Exception caught\n" << ex._info ().c_str();
-            msg <<  "\nUnable to resolve reference to "
-                << this->TM_Name_.in () << "\n";
+            msg << "\nObject reference of TM_Daemon is nil!\n";
+
           }
-          this->logger_.log (msg.str());
-          return;
-        }
-
-        void
-          TM_Proxy_Component_exec_i::ccm_activate ()
-        {
-          // Your code here.
-        }
-
-        void
-          TM_Proxy_Component_exec_i::ccm_passivate ()
-        {
-          // Your code here.
-        }
-
-        void
-          TM_Proxy_Component_exec_i::ccm_remove ()
-        {
-          // Your code here.
-        }
-
-        //==================================================================
-        // Home Executor Implementation Class:   TM_Proxy_Component_Home_exec_i
-        //==================================================================
-
-        TM_Proxy_Component_Home_exec_i::TM_Proxy_Component_Home_exec_i (void)
-        {
-        }
-
-        TM_Proxy_Component_Home_exec_i::~TM_Proxy_Component_Home_exec_i (void)
-        {
-        }
-
-        ::Components::EnterpriseComponent_ptr
-          TM_Proxy_Component_Home_exec_i::create ()
-        {
-          ::Components::EnterpriseComponent_ptr retval =
-            ::Components::EnterpriseComponent::_nil ();
-
-          ACE_NEW_THROW_EX (
-            retval,
-            TM_Proxy_Component_exec_i,
-            ::CORBA::NO_MEMORY ());
-
-          return retval;
-        }
-
-        extern "C" TM_PROXY_EXEC_Export ::Components::HomeExecutorBase_ptr
-          create_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Home_Impl (void)
-        {
-          ::Components::HomeExecutorBase_ptr retval =
-            ::Components::HomeExecutorBase::_nil ();
-
-          ACE_NEW_RETURN (
-            retval,
-            TM_Proxy_Component_Home_exec_i,
-            ::Components::HomeExecutorBase::_nil ());
-
-          return retval;
-        }
+        msg << "... done!\n"
+            << "Successfully obtained the object reference of the TM\n";
+      }
+    catch (CORBA::Exception &ex)
+      {
+        msg <<  "Exception caught\n" << ex._info ().c_str();
+        msg <<  "\nUnable to resolve reference to "
+            << this->TM_Name_.in () << "\n";
       }
-    }
+    this->logger_.log (msg.str());
+    return;
+  }
+
+  void
+  TM_Proxy_Component_exec_i::ccm_activate ()
+  {
+    // Your code here.
+  }
+
+  void
+  TM_Proxy_Component_exec_i::ccm_passivate ()
+  {
+    // Your code here.
+  }
+
+  void
+  TM_Proxy_Component_exec_i::ccm_remove ()
+  {
+    // Your code here.
+  }
+
+  //==================================================================
+  // Home Executor Implementation Class:   TM_Proxy_Component_Home_exec_i
+  //==================================================================
+
+  TM_Proxy_Component_Home_exec_i::TM_Proxy_Component_Home_exec_i (void)
+  {
+  }
+
+  TM_Proxy_Component_Home_exec_i::~TM_Proxy_Component_Home_exec_i (void)
+  {
+  }
+
+  ::Components::EnterpriseComponent_ptr
+  TM_Proxy_Component_Home_exec_i::create ()
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_THROW_EX (
+                      retval,
+                      TM_Proxy_Component_exec_i,
+                      ::CORBA::NO_MEMORY ());
+
+    return retval;
+  }
+
+  extern "C" TM_PROXY_EXEC_Export ::Components::HomeExecutorBase_ptr
+  create_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Home_Impl (void)
+  {
+    ::Components::HomeExecutorBase_ptr retval =
+      ::Components::HomeExecutorBase::_nil ();
+
+    ACE_NEW_RETURN (
+                    retval,
+                    TM_Proxy_Component_Home_exec_i,
+                    ::Components::HomeExecutorBase::_nil ());
+
+    return retval;
   }
 }
diff --git a/TM_Proxy/TM_Proxy_exec.h b/TM_Proxy/TM_Proxy_exec.h
index d393f21ebc2..33e65b3b405 100644
--- a/TM_Proxy/TM_Proxy_exec.h
+++ b/TM_Proxy/TM_Proxy_exec.h
@@ -13,96 +13,86 @@
 #include "TM_Proxy_exec_export.h"
 #include "tao/LocalObject.h"
 
-#include "TM_DaemonC.h"
+#include "TM_Daemon/TM_DaemonC.h"
 
-#include "Logger.h"
+#include "utils/Logger.h"
 
 #include "Utility.h"
 #include "ResourceManager.h"
 #include "SystemSnapshot.h"
 
 
+using namespace CIAO::RACE;
 
-namespace CIAO
+namespace CIAO_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Impl
 {
-  namespace RACE
+  class TM_PROXY_EXEC_Export TM_Proxy_Component_exec_i
+    : public virtual TM_Proxy_Component_Exec,
+      public virtual TAO_Local_RefCounted_Object
   {
-    namespace TM_Proxy
-    {
-      namespace CIDL_TM_Proxy_Component_Impl
-      {
-        class TM_PROXY_EXEC_Export TM_Proxy_Component_exec_i
-          : public virtual TM_Proxy_Component_Exec,
-            public virtual TAO_Local_RefCounted_Object
-        {
-          public:
-          TM_Proxy_Component_exec_i (void);
-          virtual ~TM_Proxy_Component_exec_i (void);
+  public:
+    TM_Proxy_Component_exec_i (void);
+    virtual ~TM_Proxy_Component_exec_i (void);
 
-          // Attribute operations.
-          virtual char*
-            TM_Name ();
+    // Attribute operations.
+    virtual char*
+      TM_Name ();
 
-          void
-            TM_Name (const char * name);
+    void
+      TM_Name (const char * name);
 
-          // Port operations.
+    // Port operations.
 
-          virtual ::CIAO::RACE::TM_Proxy::CCM_SystemSnapshot_ptr
-          get_snapshot ();
+    virtual ::CIAO::RACE::TM_Proxy::CCM_SystemSnapshot_ptr
+      get_snapshot ();
 
-          virtual ::CIAO::RACE::TM_Proxy::CCM_Utility_ptr
-          get_utils ();
+    virtual ::CIAO::RACE::TM_Proxy::CCM_Utility_ptr
+      get_utils ();
 
-          virtual ::CIAO::RACE::TM_Proxy::CCM_ResourceManager_ptr
-          get_manager ();
+    virtual ::CIAO::RACE::TM_Proxy::CCM_ResourceManager_ptr
+      get_manager ();
 
-          // Operations from Components::SessionComponent
+    // Operations from Components::SessionComponent
 
-          virtual void
-          set_session_context (
-            ::Components::SessionContext_ptr ctx);
+    virtual void
+      set_session_context (
+                           ::Components::SessionContext_ptr ctx);
 
-          virtual void ciao_preactivate ();
+    virtual void ciao_preactivate ();
 
-          virtual void configuration_complete ();
+    virtual void configuration_complete ();
 
-          virtual void ccm_activate ();
+    virtual void ccm_activate ();
 
-          virtual void ccm_passivate ();
+    virtual void ccm_passivate ();
 
-          virtual void ccm_remove ();
+    virtual void ccm_remove ();
 
-          private:
+  private:
 
-          TM_Proxy_Component_Context *context_;
+    TM_Proxy_Component_Context *context_;
 
-          ::CIAO::TM_Daemon::Daemon_var TM_Daemon_;
+    ::CIAO::TM_Daemon::Daemon_var TM_Daemon_;
 
-          ::CORBA::String_var TM_Name_;
+    ::CORBA::String_var TM_Name_;
 
-          Logger logger_;
+    Logger logger_;
+  };
 
+  class TM_PROXY_EXEC_Export TM_Proxy_Component_Home_exec_i
+    : public virtual TM_Proxy_Component_Home_Exec,
+      public virtual TAO_Local_RefCounted_Object
+  {
+  public:
+    TM_Proxy_Component_Home_exec_i (void);
+    virtual ~TM_Proxy_Component_Home_exec_i (void);
 
-        };
-
-        class TM_PROXY_EXEC_Export TM_Proxy_Component_Home_exec_i
-          : public virtual TM_Proxy_Component_Home_Exec,
-            public virtual TAO_Local_RefCounted_Object
-        {
-          public:
-          TM_Proxy_Component_Home_exec_i (void);
-          virtual ~TM_Proxy_Component_Home_exec_i (void);
-
-          virtual ::Components::EnterpriseComponent_ptr
-          create ();
-        };
+    virtual ::Components::EnterpriseComponent_ptr
+      create ();
+  };
 
-        extern "C" TM_PROXY_EXEC_Export ::Components::HomeExecutorBase_ptr
-        create_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Home_Impl (void);
-      }
-    }
-  }
+  extern "C" TM_PROXY_EXEC_Export ::Components::HomeExecutorBase_ptr
+  create_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Home_Impl (void);
 }
 
 #include /**/ "ace/post.h"
diff --git a/TM_Proxy/TM_Proxy_exec_export.h b/TM_Proxy/TM_Proxy_exec_export.h
deleted file mode 100644
index d7ae16a3acd..00000000000
--- a/TM_Proxy/TM_Proxy_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TM_PROXY_EXEC
-// ------------------------------
-#ifndef TM_PROXY_EXEC_EXPORT_H
-#define TM_PROXY_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TM_PROXY_EXEC_HAS_DLL)
-#  define TM_PROXY_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TM_PROXY_EXEC_HAS_DLL */
-
-#if !defined (TM_PROXY_EXEC_HAS_DLL)
-#  define TM_PROXY_EXEC_HAS_DLL 1
-#endif /* ! TM_PROXY_EXEC_HAS_DLL */
-
-#if defined (TM_PROXY_EXEC_HAS_DLL) && (TM_PROXY_EXEC_HAS_DLL == 1)
-#  if defined (TM_PROXY_EXEC_BUILD_DLL)
-#    define TM_PROXY_EXEC_Export ACE_Proper_Export_Flag
-#    define TM_PROXY_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TM_PROXY_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TM_PROXY_EXEC_BUILD_DLL */
-#    define TM_PROXY_EXEC_Export ACE_Proper_Import_Flag
-#    define TM_PROXY_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TM_PROXY_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TM_PROXY_EXEC_BUILD_DLL */
-#else /* TM_PROXY_EXEC_HAS_DLL == 1 */
-#  define TM_PROXY_EXEC_Export
-#  define TM_PROXY_EXEC_SINGLETON_DECLARATION(T)
-#  define TM_PROXY_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TM_PROXY_EXEC_HAS_DLL == 1 */
-
-// Set TM_PROXY_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TM_PROXY_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TM_PROXY_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TM_PROXY_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TM_PROXY_EXEC_NTRACE */
-
-#if (TM_PROXY_EXEC_NTRACE == 1)
-#  define TM_PROXY_EXEC_TRACE(X)
-#else /* (TM_PROXY_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TM_PROXY_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TM_PROXY_EXEC_NTRACE == 1) */
-
-#endif /* TM_PROXY_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TM_Proxy/TM_Proxy_stub_export.h b/TM_Proxy/TM_Proxy_stub_export.h
deleted file mode 100644
index 0ca4001da9e..00000000000
--- a/TM_Proxy/TM_Proxy_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TM_PROXY_STUB
-// ------------------------------
-#ifndef TM_PROXY_STUB_EXPORT_H
-#define TM_PROXY_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TM_PROXY_STUB_HAS_DLL)
-#  define TM_PROXY_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TM_PROXY_STUB_HAS_DLL */
-
-#if !defined (TM_PROXY_STUB_HAS_DLL)
-#  define TM_PROXY_STUB_HAS_DLL 1
-#endif /* ! TM_PROXY_STUB_HAS_DLL */
-
-#if defined (TM_PROXY_STUB_HAS_DLL) && (TM_PROXY_STUB_HAS_DLL == 1)
-#  if defined (TM_PROXY_STUB_BUILD_DLL)
-#    define TM_PROXY_STUB_Export ACE_Proper_Export_Flag
-#    define TM_PROXY_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TM_PROXY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TM_PROXY_STUB_BUILD_DLL */
-#    define TM_PROXY_STUB_Export ACE_Proper_Import_Flag
-#    define TM_PROXY_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TM_PROXY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TM_PROXY_STUB_BUILD_DLL */
-#else /* TM_PROXY_STUB_HAS_DLL == 1 */
-#  define TM_PROXY_STUB_Export
-#  define TM_PROXY_STUB_SINGLETON_DECLARATION(T)
-#  define TM_PROXY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TM_PROXY_STUB_HAS_DLL == 1 */
-
-// Set TM_PROXY_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TM_PROXY_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TM_PROXY_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TM_PROXY_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TM_PROXY_STUB_NTRACE */
-
-#if (TM_PROXY_STUB_NTRACE == 1)
-#  define TM_PROXY_STUB_TRACE(X)
-#else /* (TM_PROXY_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TM_PROXY_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TM_PROXY_STUB_NTRACE == 1) */
-
-#endif /* TM_PROXY_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TM_Proxy/TM_Proxy_svnt_export.h b/TM_Proxy/TM_Proxy_svnt_export.h
deleted file mode 100644
index a18afe2c301..00000000000
--- a/TM_Proxy/TM_Proxy_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TM_PROXY_SVNT
-// ------------------------------
-#ifndef TM_PROXY_SVNT_EXPORT_H
-#define TM_PROXY_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TM_PROXY_SVNT_HAS_DLL)
-#  define TM_PROXY_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TM_PROXY_SVNT_HAS_DLL */
-
-#if !defined (TM_PROXY_SVNT_HAS_DLL)
-#  define TM_PROXY_SVNT_HAS_DLL 1
-#endif /* ! TM_PROXY_SVNT_HAS_DLL */
-
-#if defined (TM_PROXY_SVNT_HAS_DLL) && (TM_PROXY_SVNT_HAS_DLL == 1)
-#  if defined (TM_PROXY_SVNT_BUILD_DLL)
-#    define TM_PROXY_SVNT_Export ACE_Proper_Export_Flag
-#    define TM_PROXY_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TM_PROXY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TM_PROXY_SVNT_BUILD_DLL */
-#    define TM_PROXY_SVNT_Export ACE_Proper_Import_Flag
-#    define TM_PROXY_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TM_PROXY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TM_PROXY_SVNT_BUILD_DLL */
-#else /* TM_PROXY_SVNT_HAS_DLL == 1 */
-#  define TM_PROXY_SVNT_Export
-#  define TM_PROXY_SVNT_SINGLETON_DECLARATION(T)
-#  define TM_PROXY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TM_PROXY_SVNT_HAS_DLL == 1 */
-
-// Set TM_PROXY_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TM_PROXY_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TM_PROXY_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TM_PROXY_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TM_PROXY_SVNT_NTRACE */
-
-#if (TM_PROXY_SVNT_NTRACE == 1)
-#  define TM_PROXY_SVNT_TRACE(X)
-#else /* (TM_PROXY_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TM_PROXY_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TM_PROXY_SVNT_NTRACE == 1) */
-
-#endif /* TM_PROXY_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TM_Proxy/Utility.cpp b/TM_Proxy/Utility.cpp
index 33651bd9033..a6c779db7b2 100644
--- a/TM_Proxy/Utility.cpp
+++ b/TM_Proxy/Utility.cpp
@@ -1,33 +1,24 @@
 // $Id$
 #include "Utility.h"
 
-namespace CIAO
+namespace CIAO_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Impl
 {
-  namespace RACE
+  Utility_exec_i::Utility_exec_i (::CIAO::TM_Daemon::Daemon_ptr TM,
+                                  Logger &logger)
+    : TM_Daemon_ (::CIAO::TM_Daemon::Daemon::_duplicate (TM)),
+      logger_ (logger)
   {
-    namespace TM_Proxy
-    {
-      namespace CIDL_TM_Proxy_Component_Impl
-      {
-        Utility_exec_i::Utility_exec_i (::CIAO::TM_Daemon::Daemon_ptr TM,
-          Logger &logger)
-          : TM_Daemon_ (::CIAO::TM_Daemon::Daemon::_duplicate (TM)),
-            logger_ (logger)
-        {
-        }
+  }
 
-        Utility_exec_i::~Utility_exec_i (void)
-        {
-        }
-        ::Deployment::Domain* 
-          Utility_exec_i::getInitialDomain ()
-        {
-          std::string msg = "Entering Utility_exec_i::getInitialDomain ()\n";
-          msg += "Leaving Utility_exec_i::getInitialDomain ()\n";
-          this->logger_.log (msg);          
-          return this->TM_Daemon_->getInitialDomain ();
-        }
-      }
-    }
+  Utility_exec_i::~Utility_exec_i (void)
+  {
+  }
+  ::Deployment::Domain* 
+  Utility_exec_i::getInitialDomain ()
+  {
+    std::string msg = "Entering Utility_exec_i::getInitialDomain ()\n";
+    msg += "Leaving Utility_exec_i::getInitialDomain ()\n";
+    this->logger_.log (msg);          
+    return this->TM_Daemon_->getInitialDomain ();
   }
 }
diff --git a/TM_Proxy/Utility.h b/TM_Proxy/Utility.h
index 6793b892d00..a63e4a1dedc 100644
--- a/TM_Proxy/Utility.h
+++ b/TM_Proxy/Utility.h
@@ -13,37 +13,30 @@
 #include "TM_Proxy_exec_export.h"
 #include "tao/LocalObject.h"
 
-#include "TM_DaemonC.h"
-#include "Logger.h"
+#include "TM_Daemon/TM_DaemonC.h"
+#include "utils/Logger.h"
 
-namespace CIAO
+using namespace CIAO::RACE;
+
+namespace CIAO_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Impl
 {
-  namespace RACE
+  class TM_PROXY_EXEC_Export Utility_exec_i
+    : public virtual ::CIAO::RACE::TM_Proxy::CCM_Utility,
+      public virtual TAO_Local_RefCounted_Object
   {
-    namespace TM_Proxy
-    {
-      namespace CIDL_TM_Proxy_Component_Impl
-      {
-        class TM_PROXY_EXEC_Export Utility_exec_i
-          : public virtual ::CIAO::RACE::TM_Proxy::CCM_Utility,
-            public virtual TAO_Local_RefCounted_Object
-        {
-          public:
-          Utility_exec_i (::CIAO::TM_Daemon::Daemon_ptr TM, Logger &logger);
-
-          virtual ~Utility_exec_i (void);
-
-          virtual ::Deployment::Domain* getInitialDomain ();
-
-        private:
-          ::CIAO::TM_Daemon::Daemon_var TM_Daemon_;
-
-          Logger &logger_;
-
-        };
-      }
-    }
-  }
+  public:
+    Utility_exec_i (::CIAO::TM_Daemon::Daemon_ptr TM, Logger &logger);
+
+    virtual ~Utility_exec_i (void);
+
+    virtual ::Deployment::Domain* getInitialDomain ();
+
+  private:
+    ::CIAO::TM_Daemon::Daemon_var TM_Daemon_;
+
+    Logger &logger_;
+
+  };
 }
 
 #include /**/ "ace/post.h"
diff --git a/common/OpString.mpc b/common/OpString.mpc
new file mode 100644
index 00000000000..5c8334125ef
--- /dev/null
+++ b/common/OpString.mpc
@@ -0,0 +1,87 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -b race_common -n OpString"
+
+project(OpString_idl_gen) : ciaoidldefaults , race_common, anytypecode  {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=OPSTRING_STUB_Export \
+              -Wb,stub_export_include=OpString_stub_export.h \
+              -Wb,skel_export_macro=OPSTRING_SKEL_Export \
+              -Wb,skel_export_include=OpString_skel_export.h \
+              -Wb,exec_export_macro=OPSTRING_EXEC_Export \
+              -Wb,exec_export_include=OpString_exec_export.h \
+              -SS 
+
+  IDL_Files {
+    idlflags += -Gxhst
+    OpString.idl
+  }
+
+  IDL_Files {
+    Goal.idl
+    QoS.idl
+    Utils.idl
+  }
+}
+
+project(OpString_stub) : ccm_stub , race_common, anytypecode, dance_deployment_stub  {
+  after += OpString_idl_gen RACE_common_stub
+  libs  += RACE_common_stub
+  
+  
+  sharedname = OpString_stub
+  dynamicflags   = OPSTRING_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    OpStringC.cpp
+    GoalC.cpp
+    QoSC.cpp
+    UtilsC.cpp
+  }
+
+  Header_Files {
+    OpStringC.h
+    GoalC.h
+    QoSC.h
+    UtilsC.h
+    OpString_stub_export.h
+  }
+
+  Inline_Files {
+    OpStringC.inl
+    GoalC.inl
+    QoSC.inl
+    UtilsC.inl
+  }
+}
+
+
+// project(OpString_skel) : ciao_executor , race_common  {
+//   after      +=  OpString_stub OpString_lem_stub
+//   sharedname  = OpString_skel
+//   libs       += OpString_stub
+ 
+  
+  
+//   dynamicflags = OPSTRING_SKEL_BUILD_DLL
+  
+//   IDL_Files {
+//   }
+
+//   Source_Files {
+//     OpStringS.cpp
+//   }
+
+//   Header_Files {
+//     OpStringS.h
+//     OpString_skel_export.h
+//   }
+
+//   Inline_Files {
+//     OpStringS.inl
+//   }
+// }
+
+
diff --git a/common/OpString_stub_export.h b/common/OpString_stub_export.h
deleted file mode 100644
index 671ab30d4c3..00000000000
--- a/common/OpString_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl OPSTRING_STUB
-// ------------------------------
-#ifndef OPSTRING_STUB_EXPORT_H
-#define OPSTRING_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (OPSTRING_STUB_HAS_DLL)
-#  define OPSTRING_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && OPSTRING_STUB_HAS_DLL */
-
-#if !defined (OPSTRING_STUB_HAS_DLL)
-#  define OPSTRING_STUB_HAS_DLL 1
-#endif /* ! OPSTRING_STUB_HAS_DLL */
-
-#if defined (OPSTRING_STUB_HAS_DLL) && (OPSTRING_STUB_HAS_DLL == 1)
-#  if defined (OPSTRING_STUB_BUILD_DLL)
-#    define OPSTRING_STUB_Export ACE_Proper_Export_Flag
-#    define OPSTRING_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define OPSTRING_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* OPSTRING_STUB_BUILD_DLL */
-#    define OPSTRING_STUB_Export ACE_Proper_Import_Flag
-#    define OPSTRING_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define OPSTRING_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* OPSTRING_STUB_BUILD_DLL */
-#else /* OPSTRING_STUB_HAS_DLL == 1 */
-#  define OPSTRING_STUB_Export
-#  define OPSTRING_STUB_SINGLETON_DECLARATION(T)
-#  define OPSTRING_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* OPSTRING_STUB_HAS_DLL == 1 */
-
-// Set OPSTRING_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (OPSTRING_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define OPSTRING_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define OPSTRING_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !OPSTRING_STUB_NTRACE */
-
-#if (OPSTRING_STUB_NTRACE == 1)
-#  define OPSTRING_STUB_TRACE(X)
-#else /* (OPSTRING_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define OPSTRING_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (OPSTRING_STUB_NTRACE == 1) */
-
-#endif /* OPSTRING_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/common/RACE_common.idl b/common/RACE_common.idl
index 7979280b01f..5224467b9df 100644
--- a/common/RACE_common.idl
+++ b/common/RACE_common.idl
@@ -82,14 +82,14 @@ module CIAO
 
 //       typedef sequence <FlowItem> PlannerFlow;
 
-//       struct Plan_Action
-//       {
-//         Action command;
-//         Deployment::DeploymentPlan plan;
-//         Deployment::PackageConfiguration package;
-//       };
-
-//       typedef sequence<Plan_Action> Plan_Actions;
+//        struct Plan_Action
+//        {
+//          Action command;
+//          Deployment::DeploymentPlan plan;
+//          Deployment::PackageConfiguration package;
+//        };
+
+//        typedef sequence<Plan_Action> Plan_Actions;
 
     };
 };
diff --git a/common/RACE_common.mpc b/common/RACE_common.mpc
index bafb19241be..f9fafe79ac1 100644
--- a/common/RACE_common.mpc
+++ b/common/RACE_common.mpc
@@ -1,67 +1,71 @@
-project(RACE_common_stub): anytypecode, race_idl {
+// $Id$
+// This file is generated with "generate_component_mpc.pl -b race_common -n RACE_common"
 
-//   libout       = $(ACE_ROOT)/lib	
-   sharedname = RACE_common_stub
-   idlflags += -Wb,stub_export_macro=RACE_COMMON_STUB_Export \
-               -Wb,stub_export_include=RACE_common_stub_export.h
+project(RACE_common_idl_gen) : ciaoidldefaults , anytypecode  {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=RACE_COMMON_STUB_Export \
+              -Wb,stub_export_include=RACE_common_stub_export.h \
+              -Wb,skel_export_macro=RACE_COMMON_SKEL_Export \
+              -Wb,skel_export_include=RACE_common_skel_export.h \
+              -Wb,exec_export_macro=RACE_COMMON_EXEC_Export \
+              -Wb,exec_export_include=RACE_common_exec_export.h \
+              -SS -Gxhst
 
-   dynamicflags   = RACE_COMMON_STUB_BUILD_DLL
+  IDL_Files {
+    RACE_common.idl
+  }
+}
 
-   IDL_Files {
-     RACE_common.idl
-   }
+project(RACE_common_stub) : ccm_stub , race_out, anytypecode  {
+  after += RACE_common_idl_gen 
+  libs  += 
+  
+  
+  sharedname = RACE_common_stub
+  dynamicflags   = RACE_COMMON_STUB_BUILD_DLL
 
-   Source_Files {
-     RACE_commonC.cpp
-   }
+  IDL_Files {
+  }
 
-   Header_Files {
-     RACE_commonC.h
-   }
+  Source_Files {
+    RACE_commonC.cpp
+  }
 
-   Inline_Files {
-     RACE_commonC.inl
-   }
- }
+  Header_Files {
+    RACE_commonC.h
+    RACE_common_stub_export.h
+  }
 
-project(OpString_stub): dance_deployment_stub, race_idl {
+  Inline_Files {
+    RACE_commonC.inl
+  }
+}
 
-//  libout       = $(ACE_ROOT)/lib	
-  after += RACE_common_stub
-  sharedname = OpString_stub
-  idlflags += -Wb,stub_export_macro=OPSTRING_STUB_Export \
-              -Wb,stub_export_include=OpString_stub_export.h \
-              -I $(CIAO_ROOT)/DAnCE/Deployment
 
-  dynamicflags   = OPSTRING_STUB_BUILD_DLL
+// project(RACE_common_skel) : ciao_executor , race_common  {
+//   after      +=  RACE_common_stub RACE_common_lem_stub
+//   sharedname  = RACE_common_skel
+//   libs       += RACE_common_stub
+ 
+  
+  
+//   dynamicflags = RACE_COMMON_SKEL_BUILD_DLL
+  
+//   IDL_Files {
+//   }
 
-  libs += RACE_common_stub
+//   Source_Files {
+//     RACE_commonS.cpp
+//   }
 
-  IDL_Files {
-    OpString.idl
-    Goal.idl
-    QoS.idl
-    Utils.idl
-  }
+//   Header_Files {
+//     RACE_commonS.h
+//     RACE_common_skel_export.h
+//   }
 
-  Header_Files {
-    OpStringC.h
-    GoalC.h
-    QoSC.h
-    UtilsC.h
-  }
+//   Inline_Files {
+//     RACE_commonS.inl
+//   }
+// }
 
-  Inline_Files {
-    OpStringC.inl
-    GoalC.inl
-    QoSC.inl
-    UtilsC.inl
-  }
 
-  Source_Files {
-    OpStringC.cpp
-    GoalC.cpp
-    QoSC.cpp
-    UtilsC.cpp
-  }
-}
diff --git a/common/RACE_common_stub_export.h b/common/RACE_common_stub_export.h
deleted file mode 100644
index 9e5283fbe6f..00000000000
--- a/common/RACE_common_stub_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// RACE_common_stub_export.h,v 1.1 2005/09/06 19:57:23 wotte Exp
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RACE_COMMON_STUB
-// ------------------------------
-#ifndef RACE_COMMON_STUB_EXPORT_H
-#define RACE_COMMON_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (RACE_COMMON_STUB_HAS_DLL)
-#  define RACE_COMMON_STUB_HAS_DLL 1
-#endif /* ! RACE_COMMON_STUB_HAS_DLL */
-
-#if defined (RACE_COMMON_STUB_HAS_DLL) && (RACE_COMMON_STUB_HAS_DLL == 1)
-#  if defined (RACE_COMMON_STUB_BUILD_DLL)
-#    define RACE_COMMON_STUB_Export ACE_Proper_Export_Flag
-#    define RACE_COMMON_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RACE_COMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RACE_COMMON_STUB_BUILD_DLL */
-#    define RACE_COMMON_STUB_Export ACE_Proper_Import_Flag
-#    define RACE_COMMON_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RACE_COMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RACE_COMMON_STUB_BUILD_DLL */
-#else /* RACE_COMMON_STUB_HAS_DLL == 1 */
-#  define RACE_COMMON_STUB_Export
-#  define RACE_COMMON_STUB_SINGLETON_DECLARATION(T)
-#  define RACE_COMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RACE_COMMON_STUB_HAS_DLL == 1 */
-
-// Set RACE_COMMON_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RACE_COMMON_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RACE_COMMON_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RACE_COMMON_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RACE_COMMON_STUB_NTRACE */
-
-#if (RACE_COMMON_STUB_NTRACE == 1)
-#  define RACE_COMMON_STUB_TRACE(X)
-#else /* (RACE_COMMON_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RACE_COMMON_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RACE_COMMON_STUB_NTRACE == 1) */
-
-#endif /* RACE_COMMON_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/common/RACE_common_svnt_export.h b/common/RACE_common_svnt_export.h
deleted file mode 100644
index fd12b524e69..00000000000
--- a/common/RACE_common_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// RACE_common_svnt_export.h,v 1.1 2005/09/06 19:57:23 wotte Exp
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RACE_COMMON_SVNT
-// ------------------------------
-#ifndef RACE_COMMON_SVNT_EXPORT_H
-#define RACE_COMMON_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (RACE_COMMON_SVNT_HAS_DLL)
-#  define RACE_COMMON_SVNT_HAS_DLL 1
-#endif /* ! RACE_COMMON_SVNT_HAS_DLL */
-
-#if defined (RACE_COMMON_SVNT_HAS_DLL) && (RACE_COMMON_SVNT_HAS_DLL == 1)
-#  if defined (RACE_COMMON_SVNT_BUILD_DLL)
-#    define RACE_COMMON_SVNT_Export ACE_Proper_Export_Flag
-#    define RACE_COMMON_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RACE_COMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RACE_COMMON_SVNT_BUILD_DLL */
-#    define RACE_COMMON_SVNT_Export ACE_Proper_Import_Flag
-#    define RACE_COMMON_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RACE_COMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RACE_COMMON_SVNT_BUILD_DLL */
-#else /* RACE_COMMON_SVNT_HAS_DLL == 1 */
-#  define RACE_COMMON_SVNT_Export
-#  define RACE_COMMON_SVNT_SINGLETON_DECLARATION(T)
-#  define RACE_COMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RACE_COMMON_SVNT_HAS_DLL == 1 */
-
-// Set RACE_COMMON_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RACE_COMMON_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RACE_COMMON_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RACE_COMMON_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RACE_COMMON_SVNT_NTRACE */
-
-#if (RACE_COMMON_SVNT_NTRACE == 1)
-#  define RACE_COMMON_SVNT_TRACE(X)
-#else /* (RACE_COMMON_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RACE_COMMON_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RACE_COMMON_SVNT_NTRACE == 1) */
-
-#endif /* RACE_COMMON_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/examples/E2E_Task/Subtask/Subtask.cidl b/examples/E2E_Task/Subtask/Subtask.cidl
deleted file mode 100644
index c27278e1a82..00000000000
--- a/examples/E2E_Task/Subtask/Subtask.cidl
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef SUBTASK_CIDL
-#define SUBTASK_CIDL
-
-#include "Subtask.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session Subtask
-    {
-      home executor Subtask_Factory_Exec
-      {
-        implements Subtask_Factory;
-        
-        manages Subtask_Exec;
-      };
-    };
-    
-  };
-};
-
-#endif  /* SUBTASK_CIDL */
diff --git a/examples/E2E_Task/Trigger/Trigger.cidl b/examples/E2E_Task/Trigger/Trigger.cidl
deleted file mode 100644
index f31690d932a..00000000000
--- a/examples/E2E_Task/Trigger/Trigger.cidl
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef TRIGGER_CIDL
-#define TRIGGER_CIDL
-
-#include "Trigger.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session Trigger
-    {
-      home executor Trigger_Factory_Exec
-      {
-        implements Trigger_Factory;
-    
-        manages Trigger_Exec;
-      };
-    };
-  };
-};
-
-
-#endif  /* TRIGGER_CIDL */