diff --git a/packages/base/any/oom-shim/APKG.yml b/packages/base/any/oom-shim/APKG.yml
index 21caf002..6a54841f 100644
--- a/packages/base/any/oom-shim/APKG.yml
+++ b/packages/base/any/oom-shim/APKG.yml
@@ -23,11 +23,7 @@ packages:
     provides: [ oom_shim ]
 
     files:
-<<<<<<< HEAD:packages/base/any/oom_shim/APKG.yml
-      builds/$BUILD_DIR/${TOOLCHAIN}/liboom_south.so : $libdir/
-=======
       builds/$BUILD_DIR/${TOOLCHAIN}/bin/liboom-south.so : $libdir/
->>>>>>> 33bb8c0690eb1fdc693283ffa35f06bcf2f00303:packages/base/any/oom-shim/APKG.yml
 
     changelog:  Initial code for 2016 OCP Demo
 
diff --git a/packages/base/any/oom-shim/builds/Makefile b/packages/base/any/oom-shim/builds/Makefile
index 484d66aa..0ccc185a 100644
--- a/packages/base/any/oom-shim/builds/Makefile
+++ b/packages/base/any/oom-shim/builds/Makefile
@@ -29,6 +29,9 @@ include $(BUILDER)/standardinit.mk
 
 DEPENDMODULES := AIM onlplib onlp oom_shim cjson cjson_util sff IOF timer_wheel OS
 
+#LIBONLP_PLATFORM_DEFAULTS := ../onlp-platform-defaults/$(BUILD_DIR)/bin/libonlp-platform-defaults.so
+#LIBONLP_PLATFORM := ../onlp-platform/$(BUILD_DIR)/bin/libonlp-platform.so
+LIBONLP := $(shell $(ONLPM) --find-file onlp:$(ARCH) libonlp.so)
 
 include $(BUILDER)/dependmodules.mk
 
@@ -44,7 +47,7 @@ GLOBAL_CFLAGS += -DONLP_CONFIG_API_LOCK_GLOBAL_SHARED=1
 GLOBAL_CFLAGS += -DONLP_CONFIG_INCLUDE_SHLOCK_GLOBAL_INIT=1
 
 GLOBAL_CFLAGS += -fPIC
-GLOBAL_LINK_LIBS += -lpthread $(LIBONLP_PLATFORM) $(LIBONLP_PLATFORM_DEFAULTS)
+GLOBAL_LINK_LIBS += -lpthread $(LIBONLP)
 
 include $(BUILDER)/targets.mk
 
diff --git a/packages/base/any/oom-shim/src/module/inc/oom_shim/oom-shim.h b/packages/base/any/oom-shim/src/module/inc/oom_shim/oom-shim.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/packages/base/any/oom-shim/src/module/src/Makefile b/packages/base/any/oom-shim/src/module/src/Makefile
new file mode 100644
index 00000000..87a73132
--- /dev/null
+++ b/packages/base/any/oom-shim/src/module/src/Makefile
@@ -0,0 +1,30 @@
+############################################################
+# <bsn.cl fy=2014 v=onl>
+# 
+#        Copyright 2014, 2015 Big Switch Networks, Inc.       
+# 
+# Licensed under the Eclipse Public License, Version 1.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+# 
+#        http://www.eclipse.org/legal/epl-v10.html
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the
+# License.
+# 
+# </bsn.cl>
+############################################################
+#
+# Local source generation targets.
+#
+############################################################
+
+include ../../../../init.mk
+
+ucli:
+	$(SUBMODULE_BIGCODE)/tools/uclihandlers.py onlpie_ucli.c
+
diff --git a/packages/base/any/oom-shim/src/oom_shim.mk b/packages/base/any/oom-shim/src/oom_shim.mk
index dde86cf9..106445d0 100644
--- a/packages/base/any/oom-shim/src/oom_shim.mk
+++ b/packages/base/any/oom-shim/src/oom_shim.mk
@@ -1,12 +1,14 @@
 
 ###############################################################################
 #
-# Inclusive Makefile for the oom-shim module.
+# Inclusive Makefile for the oom_shim module.
 #
-# Autogenerated 2016-02-12 16:50:50.721882
+# Autogenerated 2016-02-16 12:05:28.510482
 #
 ###############################################################################
-oom-shim_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-include $(oom-shim_BASEDIR)/module/make.mk
-include $(oom-shim_BASEDIR)/utest/_make.mk
+oom_shim_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+include $(oom_shim_BASEDIR)/module/make.mk
+include $(oom_shim_BASEDIR)/module/auto/make.mk
+include $(oom_shim_BASEDIR)/module/src/make.mk
+include $(oom_shim_BASEDIR)/utest/_make.mk
 
diff --git a/packages/base/powerpc/oom-shim/Makefile b/packages/base/powerpc/oom-shim/Makefile
new file mode 100644
index 00000000..dc1e7b86
--- /dev/null
+++ b/packages/base/powerpc/oom-shim/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
diff --git a/packages/base/powerpc/oom-shim/PKG.yml b/packages/base/powerpc/oom-shim/PKG.yml
new file mode 100644
index 00000000..9fe09577
--- /dev/null
+++ b/packages/base/powerpc/oom-shim/PKG.yml
@@ -0,0 +1,2 @@
+!include $ONL/packages/base/any/oom-shim/APKG.yml ARCH=powerpc TOOLCHAIN=powerpc-linux-gnu
+
diff --git a/packages/base/powerpc/oom-shim/builds/Makefile b/packages/base/powerpc/oom-shim/builds/Makefile
new file mode 100644
index 00000000..ee3b6e85
--- /dev/null
+++ b/packages/base/powerpc/oom-shim/builds/Makefile
@@ -0,0 +1,3 @@
+include $(ONL)/make/config.powerpc.mk
+include $(ONL)/packages/base/any/oom-shim/builds/Makefile
+
diff --git a/packages/base/powerpc/oom-shim/builds/oom-shim.mk b/packages/base/powerpc/oom-shim/builds/oom-shim.mk
new file mode 100644
index 00000000..4815edcf
--- /dev/null
+++ b/packages/base/powerpc/oom-shim/builds/oom-shim.mk
@@ -0,0 +1,10 @@
+
+###############################################################################
+#
+# Inclusive Makefile for the oom-shim module.
+#
+# Autogenerated 2016-02-15 20:59:29.632190
+#
+###############################################################################
+oom-shim_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+