Index: /experimental/components/DepacketizerSimpleBPSK/branches/DepacketizerSimpleBPSK-metadata/xml/DepacketizerSimpleBPSK.spd.xml
===================================================================
--- /experimental/components/DepacketizerSimpleBPSK/branches/DepacketizerSimpleBPSK-metadata/xml/DepacketizerSimpleBPSK.spd.xml	(revision 4369)
+++ /experimental/components/DepacketizerSimpleBPSK/branches/DepacketizerSimpleBPSK-metadata/xml/DepacketizerSimpleBPSK.spd.xml	(revision 4932)
@@ -12,13 +12,13 @@
     </author>
     <propertyfile type="PRF">
-        <localfile name="DepacketizerSimpleBPSK.prf.xml"/>
+        <localfile name="xml/DepacketizerSimpleBPSK/DepacketizerSimpleBPSK.prf.xml"/>
     </propertyfile>
     <descriptor>
-        <localfile name="DepacketizerSimpleBPSK.scd.xml"/>
+        <localfile name="xml/DepacketizerSimpleBPSK/DepacketizerSimpleBPSK.scd.xml"/>
     </descriptor>
     <implementation id="DCE:ec91b296-a5d3-11db-8ac0-00123f63025f" aepcompliance="aep_compliant">
         <description>Default implementation description</description> 
         <code type="Executable">
-            <localfile name="/bin/DepacketizerSimpleBPSK"/>
+            <localfile name="bin/DepacketizerSimpleBPSK"/>
         </code>
         <processor name="x86"/>
Index: /experimental/components/DepacketizerSimpleBPSK/branches/DepacketizerSimpleBPSK-metadata/src/main.cpp
===================================================================
--- /experimental/components/DepacketizerSimpleBPSK/branches/DepacketizerSimpleBPSK-metadata/src/main.cpp	(revision 4703)
+++ /experimental/components/DepacketizerSimpleBPSK/branches/DepacketizerSimpleBPSK-metadata/src/main.cpp	(revision 4932)
@@ -1,5 +1,5 @@
 /****************************************************************************
 
-Copyright 2007 Virginia Polytechnic Institute and State University
+Copyright 2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE DepacketizerSimpleBPSK.
@@ -22,9 +22,10 @@
 
 #include <iostream>
-
 #include "ossie/ossieSupport.h"
-#include "ossie/debug.h"
 
 #include "DepacketizerSimpleBPSK.h"
+
+using namespace std;
+using namespace standardInterfaces;  // For standard OSSIE interface classes
 
 
@@ -32,11 +33,17 @@
 
 {
-    ossieDebugLevel = 0;
-
     ossieSupport::ORB *orb = new ossieSupport::ORB;
     omni_mutex component_running_mutex;
     omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    ossieSupport::ossieComponent depacketizer(orb, argc, argv);
+    if (argc != 3) {
+        cout << argv[0] << " <id> <usage name> " << endl;
+        exit (-1);
+    }
+
+    char *uuid = argv[1];
+    char *label = argv[2];
+
+    cout << "Identifier - " << uuid << "  Label - " << label << endl;
 
     DepacketizerSimpleBPSK_i* depacketizer_servant;
@@ -45,10 +52,8 @@
     // Create the depacketizer component servant and object reference
 
-    depacketizer_servant = new DepacketizerSimpleBPSK_i(depacketizer.getUuid(), component_running);
+    depacketizer_servant = new DepacketizerSimpleBPSK_i(uuid, component_running);
     depacketizer_var = depacketizer_servant->_this();
 
-    PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(depacketizer_var);
-
-    depacketizer.bind(depacketizer_var);
+    orb->bind_object_to_name((CORBA::Object_ptr) depacketizer_var, label);
 
     // This bit is ORB specific
@@ -58,14 +63,5 @@
 
     component_running->wait();
-
-    depacketizer.unbind();
-
-    DEBUG(4, DepacketizerSimpleBPSK, "Deactivate object.");
-    orb->poa->deactivate_object(servantId);
-
-    DEBUG(4, DepacketizerSimpleBPSK, "Destroy POA.");
-    orb->poa->destroy(false, false);
-
-    DEBUG(4, DepacketizerSimpleBPSK, "Shutdown orb.");
+    orb->unbind_name(label);
     orb->orb->shutdown(0);
 
Index: /experimental/components/DepacketizerSimpleBPSK/branches/DepacketizerSimpleBPSK-metadata/Makefile.am
===================================================================
--- /experimental/components/DepacketizerSimpleBPSK/branches/DepacketizerSimpleBPSK-metadata/Makefile.am	(revision 4475)
+++ /experimental/components/DepacketizerSimpleBPSK/branches/DepacketizerSimpleBPSK-metadata/Makefile.am	(revision 4932)
@@ -2,5 +2,5 @@
 
 bin_PROGRAMS = DepacketizerSimpleBPSK
-bindir = $(prefix)/dom/bin
+bindir = $(prefix)/bin
 
 DepacketizerSimpleBPSK_SOURCES =            \
@@ -14,5 +14,5 @@
 
 ossieName = DepacketizerSimpleBPSK
-xmldir = $(prefix)/dom/xml/$(ossieName)
+xmldir = $(prefix)/xml/$(ossieName)
 dist_xml_DATA =                             \
     xml/DepacketizerSimpleBPSK.prf.xml      \