diff --git a/orte/Makefile.am b/orte/Makefile.am
index e69de29bb2..529d118293 100644
--- a/orte/Makefile.am
+++ b/orte/Makefile.am
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+SUBDIRS = \
+        include \
+        class \
+	dps \
+        mca \
+        runtime \
+        util \
+        . \
+        dynamic-mca \
+        tools
+
+# Build the main ORTE library
+
+lib_LTLIBRARIES = liborte.la
+liborte_la_SOURCES =
+liborte_la_LIBADD = \
+        class/libclass.la \
+        dps/libdps.la \
+        mca/errmgr/base/libmca_errmgr_base.la \
+        mca/gpr/base/data_type_support/libmca_gpr_base_data_type.la \
+        mca/gpr/base/pack_api_cmd/libmca_gpr_base_pack.la \
+        mca/gpr/base/unpack_api_response/libmca_gpr_base_unpack.la \
+        mca/gpr/base/libmca_gpr_base.la $(MCA_gpr_STATIC_LTLIBS) \
+        mca/iof/base/libmca_iof_base.la $(MCA_iof_STATIC_LTLIBS) \
+        mca/ns/base/libmca_ns_base.la $(MCA_ns_STATIC_LTLIBS) \
+        mca/ns/base/data_type_support/libmca_ns_base_data_type.la \
+        mca/oob/base/libmca_oob_base.la $(MCA_oob_STATIC_LTLIBS) \
+        mca/pls/base/libmca_pls_base.la $(MCA_pls_STATIC_LTLIBS) \
+        mca/ras/base/libmca_ras_base.la $(MCA_ras_STATIC_LTLIBS) \
+        mca/rds/base/libmca_rds_base.la $(MCA_rds_STATIC_LTLIBS) \
+        mca/rmaps/base/libmca_rmaps_base.la $(MCA_rmaps_STATIC_LTLIBS) \
+        mca/rmgr/base/libmca_orte_rmgr_base.la $(MCA_rmgr_STATIC_LTLIBS) \
+        mca/rmgr/base/data_type_support/libmca_rmgr_base_data_type.la \
+        mca/rml/base/libmca_rml_base.la $(MCA_rml_STATIC_LTLIBS) \
+        mca/schema/base/libmca_schema_base.la $(MCA_schema_STATIC_LTLIBS) \
+        mca/soh/base/libmca_soh_base.la $(MCA_soh_STATIC_LTLIBS) \
+        mca/soh/base/data_type_support/libmca_soh_base_data_type.la \
+        runtime/libruntime.la \
+        util/libompiutil.la
+liborte_la_DEPENDENCIES = $(liborte_la_LIBADD)
diff --git a/orte/class/Makefile.am b/orte/class/Makefile.am
index e69de29bb2..6fc823c581 100644
--- a/orte/class/Makefile.am
+++ b/orte/class/Makefile.am
@@ -0,0 +1,44 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+noinst_LTLIBRARIES = libclass.la
+
+# Source code files
+
+headers = \
+        ompi_proc_table.h \
+        orte_bitmap.h \
+        orte_pointer_array.h \
+        orte_value_array.h
+
+libclass_la_SOURCES = \
+	$(headers) \
+        ompi_proc_table.c \
+        orte_bitmap.c \
+        orte_pointer_array.c \
+        orte_value_array.c
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/orte/class
+ompi_HEADERS = $(headers)
+else
+ompidir = $(includedir)
+endif
diff --git a/orte/dps/Makefile.am b/orte/dps/Makefile.am
index 25605f8309..9f01fa7169 100644
--- a/orte/dps/Makefile.am
+++ b/orte/dps/Makefile.am
@@ -21,25 +21,25 @@ noinst_LTLIBRARIES = libdps.la
 # Source code files
 
 headers = \
-    dps.h \
-    dps_types.h \
-    dps_internal.h
+        dps.h \
+        dps_types.h \
+        dps_internal.h
 
 libdps_la_SOURCES = \
-    $(headers) \
-    dps_internal_functions.c \
-    dps_load_unload.c \
-    dps_lookup.c \
-    dps_pack.c \
-    dps_peek.c \
-    dps_register.c \
-    dps_unpack.c \
-    orte_dps_open_close.c
+        $(headers) \
+        dps_internal_functions.c \
+        dps_load_unload.c \
+        dps_lookup.c \
+        dps_pack.c \
+        dps_peek.c \
+        dps_register.c \
+        dps_unpack.c \
+        orte_dps_open_close.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/dps
+ompidir = $(includedir)/openmpi/orte/dps
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/orte/dynamic-mca/Makefile.am b/orte/dynamic-mca/Makefile.am
index e69de29bb2..a8246c3c84 100644
--- a/orte/dynamic-mca/Makefile.am
+++ b/orte/dynamic-mca/Makefile.am
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+SUBDIRS = \
+        errmgr \
+        gpr \
+        iof \
+        ns \
+        oob \
+        pls \
+        ras \
+        rds \
+        rmaps \
+        rmgr \
+        rml \
+        schema \
+        soh
diff --git a/orte/include/Makefile.am b/orte/include/Makefile.am
index e69de29bb2..9ad210f81f 100644
--- a/orte/include/Makefile.am
+++ b/orte/include/Makefile.am
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+noinst_HEADERS = \
+        orte_constants.h \
+        orte_types.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/orte/include
+ompi_HEADERS = $(noinst_HEADERS)
+else
+ompidir = $(includedir)
+endif
diff --git a/orte/runtime/Makefile.am b/orte/runtime/Makefile.am
index 7861f2927c..8e21c64d0f 100644
--- a/orte/runtime/Makefile.am
+++ b/orte/runtime/Makefile.am
@@ -17,42 +17,37 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-AM_CPPFLAGS = -I$(top_builddir)/src/event
+AM_CPPFLAGS = -I$(top_builddir)/src/opal/event
 
 noinst_LTLIBRARIES = libruntime.la
 
 # Source code files
 
 headers = \
-    runtime.h \
-    runtime_types.h \
-    runtime_internal.h \
-    ompi_progress.h \
-    orte_wait.h \
-    opal.h
+        orte_wait.h \
+        runtime.h \
+        runtime_internal.h \
+        runtime_types.h
 
 libruntime_la_SOURCES = \
 	$(headers) \
-    orte_abort.c \
-    ompi_progress.c \
-    orte_finalize.c \
-    orte_system_init.c \
-    orte_system_finalize.c \
-    orte_init.c \
-    orte_init_stage1.c \
-    orte_init_stage2.c \
-    orte_monitor.c \
-    orte_setup_hnp.c \
-    orte_universe_exists.c \
-    orte_restart.c \
-    orte_wait.c \
-    opal_init.c \
-    opal_finalize.c
+        orte_abort.c \
+        orte_finalize.c \
+        orte_init.c \
+        orte_init_stage1.c \
+        orte_init_stage2.c \
+        orte_monitor.c \
+        orte_restart.c \
+        orte_setup_hnp.c \
+        orte_system_finalize.c \
+        orte_system_init.c \
+        orte_universe_exists.c \
+        orte_wait.c
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/runtime
+ompidir = $(includedir)/openmpi/orte/runtime
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/orte/tools/Makefile.am b/orte/tools/Makefile.am
index e69de29bb2..ffffa10688 100644
--- a/orte/tools/Makefile.am
+++ b/orte/tools/Makefile.am
@@ -0,0 +1,20 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+SUBDIRS = console orted orteprobe orterun
diff --git a/orte/util/Makefile.am b/orte/util/Makefile.am
index e69de29bb2..acd964e21b 100644
--- a/orte/util/Makefile.am
+++ b/orte/util/Makefile.am
@@ -0,0 +1,47 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = -DOMPI_PKGDATADIR=\"$(pkgdatadir)\"
+
+noinst_LTLIBRARIES = liborteutil.la
+
+# Source code files
+
+headers = \
+        orte_module_exchange.h \
+        proc_info.h \
+        session_dir.h \
+        universe_setup_file_io.h \
+        univ_info.h
+
+liborteutil_la_SOURCES = \
+        $(headers) \
+        orte_module_exchange.c \
+        proc_info.c \
+        session_dir.c \
+        universe_setup_file_io.c \
+        univ_info.c
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/orte/util
+ompi_HEADERS = $(headers)
+else
+ompidir = $(includedir)
+endif