[SBE-code-re-org][1] sbefw - core and app folders

Create a core and app folder inside sbefw

Change-Id: I4ee04eb5d6623a2272a20f5dd8b02ef795757b2e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50185
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

90 files changed, 416 insertions, 275 deletions

diff --git a/src/build/Makefile b/src/build/Makefile
index b0dc7c8b..07f7e12b 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -38,14 +38,23 @@ LLIBS += -lpk
 SUBDIRS += $(BOOT_SRCDIR)
 SUBDIRS += $(BUILDDATA_SRCDIR)
 
-SUBDIRS += ../sbefw
-LIB_DIRS += -L$(OBJDIR)/sbefw
-SBEFWLIB := $(OBJDIR)/sbefw/libsbefw.a
-LLIBS += -lsbefw
+SUBDIRS += ../sbefw/core
+LIB_DIRS += -L$(OBJDIR)/sbefw/core
+SBECORELIB := $(OBJDIR)/sbefw/core/libsbecore.a
+LLIBS += -lsbecore
 
-LIB_DIRS += -L$(OBJDIR)/sbefwseeprom
-SBEFWLIB := $(OBJDIR)/sbefwseeprom/libsbefwseeprom.a
-LLIBS += -lsbefwseeprom
+LIB_DIRS += -L$(OBJDIR)/sbefw/coreseeprom
+SBECORESEEPROMLIB := $(OBJDIR)/sbefw/sbecoreseeprom/libsbecoreseeprom.a
+LLIBS += -lsbecoreseeprom
+
+SUBDIRS += ../sbefw/app
+LIB_DIRS += -L$(OBJDIR)/sbefw/app
+SBEAPPLIB := $(OBJDIR)/sbefw/app/libsbeapp.a
+LLIBS += -lsbeapp
+
+LIB_DIRS += -L$(OBJDIR)/sbefw/appseeprom
+SBECORESEEPROMLIB := $(OBJDIR)/sbefw/sbeappseeprom/libsbeappseeprom.a
+LLIBS += -lsbeappseeprom
 
 # FAPI2 library
 SUBDIRS += $(PLAT_FAPI2_DIR)
@@ -114,8 +123,8 @@ SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/ppe2fsp.c
 SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/ppe2fsp_cmd.c
 SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/trac_interface.h
 SIMICS_PPETRACEPP_TAR_FILES += $(PK_SRCDIR)/trace/pk_trace.h
-SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_FW_DIR)/plugins/sbeUserDataParser.C
-SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_FW_DIR)/sbeFFDCType.H
+SIMICS_PARSERPLUGINS_TAR_FILES += $(SBECORE_FW_DIR)/plugins/sbeUserDataParser.C
+SIMICS_PARSERPLUGINS_TAR_FILES += $(SBECORE_FW_DIR)/sbeFFDCType.H
 
 SBE_TOOLS := $(IMG_DIR)/sbe_default_tool
 SBE_IPL_TOOLS := $(IMG_DIR)/p9_ipl_build
@@ -138,7 +147,7 @@ $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).dis: $(IMG
 	$(OBJDUMP) -S $< > $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).dis
 
 #create a linked ELF executable
-$(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out: ppe_trace_bin buildInfo $(SUBDIRS) _sbefw_seeprom  $(LINK_OBJS) $(LINK_SCRIPT_SEEPROM)
+$(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out: ppe_trace_bin buildInfo $(SUBDIRS) _sbecore_seeprom _sbeapp_seeprom  $(LINK_OBJS) $(LINK_SCRIPT_SEEPROM)
 	$(LD) -n -T$(LINK_SCRIPT_SEEPROM) -Map $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).map \
 		-Bstatic -o $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out $(BOOT_OBJDIR)/$(BOOT_OBJECTS) $(BUILDDATA_OBJDIR)/$(IMAGE_BASE_PPE_HEADER).o $(OBJS) $(LIB_DIRS) \
 	    --start-group $(LLIBS) --end-group
@@ -158,7 +167,7 @@ $(IMG_DIR)/$(IMAGE_SBE_NAME).bin $(IMG_DIR)/$(IMAGE_SBE_NAME).dis: $(IMG_DIR)/$(
 	$(OBJDUMP) -S $< > $(IMG_DIR)/$(IMAGE_SBE_NAME).dis
 
 # create a linked ELF executable
-$(IMG_DIR)/$(IMAGE_SBE_NAME).out: ppe_trace_bin  buildInfo $(SUBDIRS) _sbefw_seeprom $(LINK_OBJS) $(LINK_SCRIPT_SBE)
+$(IMG_DIR)/$(IMAGE_SBE_NAME).out: ppe_trace_bin  buildInfo $(SUBDIRS) _sbecore_seeprom _sbeapp_seeprom $(LINK_OBJS) $(LINK_SCRIPT_SBE)
 	$(LD) -e __system_reset  -T$(LINK_SCRIPT_SBE) -Map $(IMG_DIR)/$(IMAGE_SBE_NAME).map -Bstatic -o $(IMG_DIR)/$(IMAGE_SBE_NAME).out $(LIB_DIRS) $(BUILDDATA_OBJDIR)/base_sbe_fixed.o  --start-group $(LLIBS) --end-group
 
 # pass the link command file through the C preprocessor to evaluate macros and remove comments
@@ -197,7 +206,7 @@ tar:
 	@echo "Generated simics.tar in Sbe images Directory"
 
 .PHONY: all normalize compress defaultset appendloader add_LoaderAddr symbols report \
-		appendoverrides xml security tracehash topfixedheaders  $(SUBDIRS) _sbefw_seeprom \
+		appendoverrides xml security tracehash topfixedheaders  $(SUBDIRS) _sbecore_seeprom _sbeapp_seeprom\
 		tar install
 
 buildinfo: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin
@@ -262,8 +271,10 @@ platattr:
 # Build the subdirectories
 $(SUBDIRS):
 	$(MAKE) -I $(INCLUDES) -C $@ -f Makefile
-_sbefw_seeprom:
-	$(MAKE) -I $(INCLUDES) -C ../sbefw -f MakefileSeeprom
+_sbecore_seeprom:
+	$(MAKE) -I $(INCLUDES) -C ../sbefw/core -f MakefileSeeprom
+_sbeapp_seeprom:
+	$(MAKE) -I $(INCLUDES) -C ../sbefw/app -f MakefileSeeprom
 
 
 #Build the SBE XIP Tools
diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk
index eacf2415..0f5b009d 100644
--- a/src/build/img_defs.mk
+++ b/src/build/img_defs.mk
@@ -78,8 +78,8 @@ ifndef SBE_SRC_DIR
 export SBE_SRC_DIR = $(SBE_ROOT_DIR)/src
 endif
 
-ifndef SBE_FW_DIR
-export SBE_FW_DIR = $(SBE_SRC_DIR)/sbefw
+ifndef SBECORE_FW_DIR
+export SBECORE_FW_DIR = $(SBE_SRC_DIR)/sbefw/core
 endif
 
 ifndef BUILD_DIR
@@ -466,7 +466,7 @@ INCLUDES += -I$(PK_SRCDIR)/../include/std
 INCLUDES += -I$(PK_SRCDIR)/kernel
 INCLUDES += -I$(PK_SRCDIR)/ppe
 INCLUDES += -I$(PK_SRCDIR)/ppe42
-INCLUDES += -I$(SBE_FW_DIR)
+INCLUDES += -I$(SBECORE_FW_DIR)
 INCLUDES += -I$(BOOT_SRCDIR)
 INCLUDES += -I$(BUILDDATA_SRCDIR)
 INCLUDES += -I$(PK_SRCDIR)/trace
diff --git a/src/build/linkerscripts/linkseeprom.cmd b/src/build/linkerscripts/linkseeprom.cmd
index 74a73c1d..35fe8d22 100644
--- a/src/build/linkerscripts/linkseeprom.cmd
+++ b/src/build/linkerscripts/linkseeprom.cmd
@@ -98,7 +98,7 @@ SECTIONS
     ////////////////////////////////
     .text ALIGN(8): {
          _text_origin = .; _text_offset = . - _seeprom_origin;
-        *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) *\libistepmpipl.a:(.text* ) *\libistep5.a:(.text* ) *\libsbefwseeprom.a:(.text* ) } > seeprom
+        *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) *\libistepmpipl.a:(.text* ) *\libistep5.a:(.text* ) *\libsbecoreseeprom.a:(.text* ) } > seeprom
      _text_size = . - _text_origin;
 
    ////////////////////////////////
diff --git a/src/sbefw/Makefile b/src/sbefw/app/Makefile
index 89d16d37..de682146 100644
--- a/src/sbefw/Makefile
+++ b/src/sbefw/app/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/sbefw/Makefile $
+# $Source: src/sbefw/app/Makefile $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,18 +23,18 @@
 # IBM_PROLOG_END_TAG
 #export P2P_ENABLE = 1
 
-export SUB_OBJDIR = /sbefw
+export SUB_OBJDIR = /sbefw/app
 
 include img_defs.mk
-include sbefwfiles.mk
+include sbeappfiles.mk
 
-OBJS := $(addprefix $(OBJDIR)/, $(SBEFW_OBJECTS))
+OBJS := $(addprefix $(OBJDIR)/, $(SBEAPP_OBJECTS))
 
-libsbefw.a: $(OBJS)
-	$(AR) crs $(OBJDIR)/libsbefw.a $(OBJDIR)/*.o
+libsbeapp.a: $(OBJS)
+	$(AR) crs $(OBJDIR)/libsbeapp.a $(OBJDIR)/*.o
 
-.PHONY: clean sbefw
-sbefw: $(OBJS)
+.PHONY: clean sbeapp
+sbeapp: $(OBJS)
 
 $(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
 
diff --git a/src/sbefw/MakefileSeeprom b/src/sbefw/app/MakefileSeeprom
index 0a29f9f6..905121bb 100644
--- a/src/sbefw/MakefileSeeprom
+++ b/src/sbefw/app/MakefileSeeprom
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/sbefw/Makefile $
+# $Source: src/sbeapp/Makefile $
 #
 # OpenPOWER sbe Project
 #
@@ -24,20 +24,20 @@
 # IBM_PROLOG_END_TAG
 #export P2P_ENABLE = 1
 
-export SUB_OBJDIR = /sbefwseeprom
+export SUB_OBJDIR = /sbefw/appseeprom
 
 include img_defs.mk
-include sbefwseepromfiles.mk
+include sbeappseepromfiles.mk
 
 GCC-CFLAGS += -mlongcall
 GCC-DEFS += -D__SBEFW_SEEPROM__=1
-OBJS := $(addprefix $(OBJDIR)/, $(SBEFWSEEPROM_OBJECTS))
+OBJS := $(addprefix $(OBJDIR)/, $(SBEAPPSEEPROM_OBJECTS))
 
-libsbefwseeprom.a: $(OBJS)
-	$(AR) crs $(OBJDIR)/libsbefwseeprom.a $(OBJDIR)/*.o
+libsbeappseeprom.a: $(OBJS)
+	$(AR) crs $(OBJDIR)/libsbeappseeprom.a $(OBJDIR)/*.o
 
-.PHONY: clean sbefwseeprom
-sbefwseeprom: $(OBJS)
+.PHONY: clean sbeappseeprom
+sbeappseeprom: $(OBJS)
 
 $(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
 
diff --git a/src/sbefw/app/sbeapp.C b/src/sbefw/app/sbeapp.C
new file mode 100644
index 00000000..036cd551
--- /dev/null
+++ b/src/sbefw/app/sbeapp.C
@@ -0,0 +1,34 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/app/sbeapp.C $                                      */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* 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.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+#ifndef __SBEFW_SEEPROM__
+void helloWorld()
+{
+}
+#endif
+
+#ifdef __SBEFW_SEEPROM__
+void helloWorldSeeprom()
+{
+}
+#endif
diff --git a/src/sbefw/sbefwseepromfiles.mk b/src/sbefw/app/sbeappfiles.mk
index b2e72382..6cfbb542 100644
--- a/src/sbefw/sbefwseepromfiles.mk
+++ b/src/sbefw/app/sbeappfiles.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/sbefw/sbefwseepromfiles.mk $
+# $Source: src/sbefw/app/sbeappfiles.mk $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2017
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,14 +21,9 @@
 # permissions and limitations under the License.
 #
 # IBM_PROLOG_END_TAG
-SBEFWSEEPROM-CPP-SOURCES = sbecmdgeneric.C
-SBEFWSEEPROM-CPP-SOURCES += sbecmdmpipl.C
-SBEFWSEEPROM-CPP-SOURCES += sbecmdmemaccess.C
-SBEFWSEEPROM-CPP-SOURCES += sbeSecureMemRegionManager.C
-SBEFWSEEPROM-CPP-SOURCES += sbecmdiplcontrol.C
-SBEFWSEEPROM-CPP-SOURCES += sbecmdfastarray.C
+SBEAPP-CPP-SOURCES = sbeapp.C
 
-SBEFWSEEPROM-C-SOURCES =
-SBEFWSEEPROM-S-SOURCES =
+SBEAPP-C-SOURCES =
+SBEAPP-S-SOURCES =
 
-SBEFWSEEPROM_OBJECTS = $(SBEFWSEEPROM-C-SOURCES:.c=.o) $(SBEFWSEEPROM-CPP-SOURCES:.C=.o) $(SBEFWSEEPROM-S-SOURCES:.S=.o)
+SBEAPP_OBJECTS = $(SBEAPP-C-SOURCES:.c=.o) $(SBEAPP-CPP-SOURCES:.C=.o) $(SBEAPP-S-SOURCES:.S=.o)
diff --git a/src/sbefw/app/sbeappseepromfiles.mk b/src/sbefw/app/sbeappseepromfiles.mk
new file mode 100644
index 00000000..b79a1cd1
--- /dev/null
+++ b/src/sbefw/app/sbeappseepromfiles.mk
@@ -0,0 +1,29 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/sbefw/app/sbeappseepromfiles.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2015,2017
+#
+#
+# Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+# IBM_PROLOG_END_TAG
+SBEAPPSEEPROM-CPP-SOURCES = sbeapp.C
+
+SBEAPPSEEPROM-C-SOURCES =
+SBEAPPSEEPROM-S-SOURCES =
+
+SBEAPPSEEPROM_OBJECTS = $(SBEAPPSEEPROM-C-SOURCES:.c=.o) $(SBEAPPSEEPROM-CPP-SOURCES:.C=.o) $(SBEAPPSEEPROM-S-SOURCES:.S=.o)
diff --git a/src/sbefw/core/Makefile b/src/sbefw/core/Makefile
new file mode 100644
index 00000000..3245d86e
--- /dev/null
+++ b/src/sbefw/core/Makefile
@@ -0,0 +1,56 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/sbefw/core/Makefile $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016,2017
+#
+#
+# Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+# IBM_PROLOG_END_TAG
+#export P2P_ENABLE = 1
+
+export SUB_OBJDIR = /sbefw/core
+
+include img_defs.mk
+include sbecorefiles.mk
+
+OBJS := $(addprefix $(OBJDIR)/, $(SBECORE_OBJECTS))
+
+libsbecore.a: $(OBJS)
+	$(AR) crs $(OBJDIR)/libsbecore.a $(OBJDIR)/*.o
+
+.PHONY: clean sbecore
+sbecore: $(OBJS)
+
+$(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
+
+$(OBJDIR):
+	mkdir -p $(OBJDIR)
+
+
+#clean the kernel directory first, then the application level clean
+clean:
+	rm -fr $(OBJDIR)
+
+ifneq ($(MAKECMDGOALS),clean)
+include $(OBJS:.o=.d)
+endif
+
+
+
+
+
diff --git a/src/sbefw/core/MakefileSeeprom b/src/sbefw/core/MakefileSeeprom
new file mode 100644
index 00000000..c2ecf874
--- /dev/null
+++ b/src/sbefw/core/MakefileSeeprom
@@ -0,0 +1,59 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/sbecore/Makefile $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016,2017
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+# IBM_PROLOG_END_TAG
+#export P2P_ENABLE = 1
+
+export SUB_OBJDIR = /sbefw/coreseeprom
+
+include img_defs.mk
+include sbecoreseepromfiles.mk
+
+GCC-CFLAGS += -mlongcall
+GCC-DEFS += -D__SBEFW_SEEPROM__=1
+OBJS := $(addprefix $(OBJDIR)/, $(SBECORESEEPROM_OBJECTS))
+
+libsbecoreseeprom.a: $(OBJS)
+	$(AR) crs $(OBJDIR)/libsbecoreseeprom.a $(OBJDIR)/*.o
+
+.PHONY: clean sbecoreseeprom
+sbecoreseeprom: $(OBJS)
+
+$(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
+
+$(OBJDIR):
+	mkdir -p $(OBJDIR)
+
+
+#clean the kernel directory first, then the application level clean
+clean:
+	rm -fr $(OBJDIR)
+
+ifneq ($(MAKECMDGOALS),clean)
+include $(OBJS:.o=.d)
+endif
+
+
+
+
+
diff --git a/src/sbefw/assert.h b/src/sbefw/core/assert.h
index 49d86110..ad2824b7 100644
--- a/src/sbefw/assert.h
+++ b/src/sbefw/core/assert.h
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/assert.h $                                          */
+/* $Source: src/sbefw/core/assert.h $                                     */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/pk_app_cfg.h b/src/sbefw/core/pk_app_cfg.h
index 605d3b3c..1e5557de 100644
--- a/src/sbefw/pk_app_cfg.h
+++ b/src/sbefw/core/pk_app_cfg.h
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/pk_app_cfg.h $                                      */
+/* $Source: src/sbefw/core/pk_app_cfg.h $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/plugins/sbeUserDataParser.C b/src/sbefw/core/plugins/sbeUserDataParser.C
index fc6cff19..d853a1a6 100644
--- a/src/sbefw/plugins/sbeUserDataParser.C
+++ b/src/sbefw/core/plugins/sbeUserDataParser.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/plugins/sbeUserDataParser.C $                       */
+/* $Source: src/sbefw/core/plugins/sbeUserDataParser.C $                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/pool.C b/src/sbefw/core/pool.C
index e4650ecf..93c67bb4 100644
--- a/src/sbefw/pool.C
+++ b/src/sbefw/core/pool.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/pool.C $                                            */
+/* $Source: src/sbefw/core/pool.C $                                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/pool.H b/src/sbefw/core/pool.H
index 1ab107d2..325a5aa6 100644
--- a/src/sbefw/pool.H
+++ b/src/sbefw/core/pool.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/pool.H $                                            */
+/* $Source: src/sbefw/core/pool.H $                                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeFFDC.C b/src/sbefw/core/sbeFFDC.C
index b47091ed..affa9656 100644
--- a/src/sbefw/sbeFFDC.C
+++ b/src/sbefw/core/sbeFFDC.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeFFDC.C $                                         */
+/* $Source: src/sbefw/core/sbeFFDC.C $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeFFDC.H b/src/sbefw/core/sbeFFDC.H
index 75c4d757..2487a1f5 100644
--- a/src/sbefw/sbeFFDC.H
+++ b/src/sbefw/core/sbeFFDC.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeFFDC.H $                                         */
+/* $Source: src/sbefw/core/sbeFFDC.H $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeFFDCType.H b/src/sbefw/core/sbeFFDCType.H
index 38e277c8..b32f4d8e 100644
--- a/src/sbefw/sbeFFDCType.H
+++ b/src/sbefw/core/sbeFFDCType.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeFFDCType.H $                                     */
+/* $Source: src/sbefw/core/sbeFFDCType.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeFifoMsgUtils.C b/src/sbefw/core/sbeFifoMsgUtils.C
index bed08a42..41d2ca20 100644
--- a/src/sbefw/sbeFifoMsgUtils.C
+++ b/src/sbefw/core/sbeFifoMsgUtils.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeFifoMsgUtils.C $                                 */
+/* $Source: src/sbefw/core/sbeFifoMsgUtils.C $                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeFifoMsgUtils.H b/src/sbefw/core/sbeFifoMsgUtils.H
index 877f0b17..214b65e5 100644
--- a/src/sbefw/sbeFifoMsgUtils.H
+++ b/src/sbefw/core/sbeFifoMsgUtils.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeFifoMsgUtils.H $                                 */
+/* $Source: src/sbefw/core/sbeFifoMsgUtils.H $                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeHostMsg.C b/src/sbefw/core/sbeHostMsg.C
index 720e1e89..46ff5189 100644
--- a/src/sbefw/sbeHostMsg.C
+++ b/src/sbefw/core/sbeHostMsg.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeHostMsg.C $                                      */
+/* $Source: src/sbefw/core/sbeHostMsg.C $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2017                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeHostMsg.H b/src/sbefw/core/sbeHostMsg.H
index 1b4b7ad3..d6bd8576 100644
--- a/src/sbefw/sbeHostMsg.H
+++ b/src/sbefw/core/sbeHostMsg.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeHostMsg.H $                                      */
+/* $Source: src/sbefw/core/sbeHostMsg.H $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeHostUtils.C b/src/sbefw/core/sbeHostUtils.C
index 2a0156fc..ea0605a3 100644
--- a/src/sbefw/sbeHostUtils.C
+++ b/src/sbefw/core/sbeHostUtils.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeHostUtils.C $                                    */
+/* $Source: src/sbefw/core/sbeHostUtils.C $                               */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeHostUtils.H b/src/sbefw/core/sbeHostUtils.H
index 33fc9db8..3ffa48e1 100644
--- a/src/sbefw/sbeHostUtils.H
+++ b/src/sbefw/core/sbeHostUtils.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeHostUtils.H $                                    */
+/* $Source: src/sbefw/core/sbeHostUtils.H $                               */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeMemAccessInterface.C b/src/sbefw/core/sbeMemAccessInterface.C
index 1dde9faf..bb341f38 100644
--- a/src/sbefw/sbeMemAccessInterface.C
+++ b/src/sbefw/core/sbeMemAccessInterface.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeMemAccessInterface.C $                           */
+/* $Source: src/sbefw/core/sbeMemAccessInterface.C $                      */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeMemAccessInterface.H b/src/sbefw/core/sbeMemAccessInterface.H
index fb01ff5d..386eba26 100644
--- a/src/sbefw/sbeMemAccessInterface.H
+++ b/src/sbefw/core/sbeMemAccessInterface.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeMemAccessInterface.H $                           */
+/* $Source: src/sbefw/core/sbeMemAccessInterface.H $                      */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeSecureMemRegionManager.C b/src/sbefw/core/sbeSecureMemRegionManager.C
index 822ee040..ef81ca87 100644
--- a/src/sbefw/sbeSecureMemRegionManager.C
+++ b/src/sbefw/core/sbeSecureMemRegionManager.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeSecureMemRegionManager.C $                       */
+/* $Source: src/sbefw/core/sbeSecureMemRegionManager.C $                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2017                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeSecureMemRegionManager.H b/src/sbefw/core/sbeSecureMemRegionManager.H
index 934fba0d..1d5fc4bd 100644
--- a/src/sbefw/sbeSecureMemRegionManager.H
+++ b/src/sbefw/core/sbeSecureMemRegionManager.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeSecureMemRegionManager.H $                       */
+/* $Source: src/sbefw/core/sbeSecureMemRegionManager.H $                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2017                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeSecurity.C b/src/sbefw/core/sbeSecurity.C
index 5f7643be..3e0090df 100644
--- a/src/sbefw/sbeSecurity.C
+++ b/src/sbefw/core/sbeSecurity.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeSecurity.C $                                     */
+/* $Source: src/sbefw/core/sbeSecurity.C $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2017                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeSecurity.H b/src/sbefw/core/sbeSecurity.H
index cda2a732..3d7ad838 100644
--- a/src/sbefw/sbeSecurity.H
+++ b/src/sbefw/core/sbeSecurity.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeSecurity.H $                                     */
+/* $Source: src/sbefw/core/sbeSecurity.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2017                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeSpMsg.C b/src/sbefw/core/sbeSpMsg.C
index 04556f52..b6afb700 100644
--- a/src/sbefw/sbeSpMsg.C
+++ b/src/sbefw/core/sbeSpMsg.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeSpMsg.C $                                        */
+/* $Source: src/sbefw/core/sbeSpMsg.C $                                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2017                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeSpMsg.H b/src/sbefw/core/sbeSpMsg.H
index 6b7ca836..86f7b9e6 100644
--- a/src/sbefw/sbeSpMsg.H
+++ b/src/sbefw/core/sbeSpMsg.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeSpMsg.H $                                        */
+/* $Source: src/sbefw/core/sbeSpMsg.H $                                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeTimerSvc.C b/src/sbefw/core/sbeTimerSvc.C
index 9909be83..eea43b17 100644
--- a/src/sbefw/sbeTimerSvc.C
+++ b/src/sbefw/core/sbeTimerSvc.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeTimerSvc.C $                                     */
+/* $Source: src/sbefw/core/sbeTimerSvc.C $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeTimerSvc.H b/src/sbefw/core/sbeTimerSvc.H
index a4a4a240..39ac046d 100644
--- a/src/sbefw/sbeTimerSvc.H
+++ b/src/sbefw/core/sbeTimerSvc.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeTimerSvc.H $                                     */
+/* $Source: src/sbefw/core/sbeTimerSvc.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeXipUtils.H b/src/sbefw/core/sbeXipUtils.H
index f95f0cac..29df84f2 100644
--- a/src/sbefw/sbeXipUtils.H
+++ b/src/sbefw/core/sbeXipUtils.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeXipUtils.H $                                     */
+/* $Source: src/sbefw/core/sbeXipUtils.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbe_host_intf.H b/src/sbefw/core/sbe_host_intf.H
index ed119bc9..f392851c 100644
--- a/src/sbefw/sbe_host_intf.H
+++ b/src/sbefw/core/sbe_host_intf.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbe_host_intf.H $                                   */
+/* $Source: src/sbefw/core/sbe_host_intf.H $                              */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbe_sp_intf.H b/src/sbefw/core/sbe_sp_intf.H
index 8c66a096..23881746 100644
--- a/src/sbefw/sbe_sp_intf.H
+++ b/src/sbefw/core/sbe_sp_intf.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbe_sp_intf.H $                                     */
+/* $Source: src/sbefw/core/sbe_sp_intf.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdCntrlTimer.C b/src/sbefw/core/sbecmdCntrlTimer.C
index db07076a..e24698ae 100644
--- a/src/sbefw/sbecmdCntrlTimer.C
+++ b/src/sbefw/core/sbecmdCntrlTimer.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdCntrlTimer.C $                                */
+/* $Source: src/sbefw/core/sbecmdCntrlTimer.C $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdCntrlTimer.H b/src/sbefw/core/sbecmdCntrlTimer.H
index f945da46..8adec307 100644
--- a/src/sbefw/sbecmdCntrlTimer.H
+++ b/src/sbefw/core/sbecmdCntrlTimer.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdCntrlTimer.H $                                */
+/* $Source: src/sbefw/core/sbecmdCntrlTimer.H $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/src/sbefw/sbecmdcntlinst.C b/src/sbefw/core/sbecmdcntlinst.C
index 17967bc0..8674c97a 100644
--- a/src/sbefw/sbecmdcntlinst.C
+++ b/src/sbefw/core/sbecmdcntlinst.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdcntlinst.C $                                  */
+/* $Source: src/sbefw/core/sbecmdcntlinst.C $                             */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdcntlinst.H b/src/sbefw/core/sbecmdcntlinst.H
index 3ca70b52..f0515602 100644
--- a/src/sbefw/sbecmdcntlinst.H
+++ b/src/sbefw/core/sbecmdcntlinst.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdcntlinst.H $                                  */
+/* $Source: src/sbefw/core/sbecmdcntlinst.H $                             */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdcntrldmt.C b/src/sbefw/core/sbecmdcntrldmt.C
index c1311a34..4fac1d59 100644
--- a/src/sbefw/sbecmdcntrldmt.C
+++ b/src/sbefw/core/sbecmdcntrldmt.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdcntrldmt.C $                                  */
+/* $Source: src/sbefw/core/sbecmdcntrldmt.C $                             */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdcntrldmt.H b/src/sbefw/core/sbecmdcntrldmt.H
index e83d5b7e..a598e037 100644
--- a/src/sbefw/sbecmdcntrldmt.H
+++ b/src/sbefw/core/sbecmdcntrldmt.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdcntrldmt.H $                                  */
+/* $Source: src/sbefw/core/sbecmdcntrldmt.H $                             */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdfastarray.C b/src/sbefw/core/sbecmdfastarray.C
index 84319ff2..78b08921 100644
--- a/src/sbefw/sbecmdfastarray.C
+++ b/src/sbefw/core/sbecmdfastarray.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdfastarray.C $                                 */
+/* $Source: src/sbefw/core/sbecmdfastarray.C $                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdfastarray.H b/src/sbefw/core/sbecmdfastarray.H
index f498d5e8..950420b3 100644
--- a/src/sbefw/sbecmdfastarray.H
+++ b/src/sbefw/core/sbecmdfastarray.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdfastarray.H $                                 */
+/* $Source: src/sbefw/core/sbecmdfastarray.H $                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/src/sbefw/sbecmdgeneric.C b/src/sbefw/core/sbecmdgeneric.C
index cbba9caa..593e012f 100644
--- a/src/sbefw/sbecmdgeneric.C
+++ b/src/sbefw/core/sbecmdgeneric.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdgeneric.C $                                   */
+/* $Source: src/sbefw/core/sbecmdgeneric.C $                              */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdgeneric.H b/src/sbefw/core/sbecmdgeneric.H
index af14541f..05bc435d 100644
--- a/src/sbefw/sbecmdgeneric.H
+++ b/src/sbefw/core/sbecmdgeneric.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdgeneric.H $                                   */
+/* $Source: src/sbefw/core/sbecmdgeneric.H $                              */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdiplcontrol.C b/src/sbefw/core/sbecmdiplcontrol.C
index 25c203b2..ae811c4c 100644
--- a/src/sbefw/sbecmdiplcontrol.C
+++ b/src/sbefw/core/sbecmdiplcontrol.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdiplcontrol.C $                                */
+/* $Source: src/sbefw/core/sbecmdiplcontrol.C $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdiplcontrol.H b/src/sbefw/core/sbecmdiplcontrol.H
index 8429473a..7b05f3f7 100644
--- a/src/sbefw/sbecmdiplcontrol.H
+++ b/src/sbefw/core/sbecmdiplcontrol.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdiplcontrol.H $                                */
+/* $Source: src/sbefw/core/sbecmdiplcontrol.H $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdmemaccess.C b/src/sbefw/core/sbecmdmemaccess.C
index 9ea19d34..1160043d 100644
--- a/src/sbefw/sbecmdmemaccess.C
+++ b/src/sbefw/core/sbecmdmemaccess.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdmemaccess.C $                                 */
+/* $Source: src/sbefw/core/sbecmdmemaccess.C $                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdmemaccess.H b/src/sbefw/core/sbecmdmemaccess.H
index 8d4b2e4c..54c9aa39 100644
--- a/src/sbefw/sbecmdmemaccess.H
+++ b/src/sbefw/core/sbecmdmemaccess.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdmemaccess.H $                                 */
+/* $Source: src/sbefw/core/sbecmdmemaccess.H $                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdmpipl.C b/src/sbefw/core/sbecmdmpipl.C
index d3f68e51..3179382f 100644
--- a/src/sbefw/sbecmdmpipl.C
+++ b/src/sbefw/core/sbecmdmpipl.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdmpipl.C $                                     */
+/* $Source: src/sbefw/core/sbecmdmpipl.C $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdmpipl.H b/src/sbefw/core/sbecmdmpipl.H
index 72d62927..0acb3efd 100644
--- a/src/sbefw/sbecmdmpipl.H
+++ b/src/sbefw/core/sbecmdmpipl.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdmpipl.H $                                     */
+/* $Source: src/sbefw/core/sbecmdmpipl.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdparser.C b/src/sbefw/core/sbecmdparser.C
index 8074b244..1671f8a3 100644
--- a/src/sbefw/sbecmdparser.C
+++ b/src/sbefw/core/sbecmdparser.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdparser.C $                                    */
+/* $Source: src/sbefw/core/sbecmdparser.C $                               */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdparser.H b/src/sbefw/core/sbecmdparser.H
index f969aec2..3d90c007 100644
--- a/src/sbefw/sbecmdparser.H
+++ b/src/sbefw/core/sbecmdparser.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdparser.H $                                    */
+/* $Source: src/sbefw/core/sbecmdparser.H $                               */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdprocessor.C b/src/sbefw/core/sbecmdprocessor.C
index a0cea086..aacf892a 100644
--- a/src/sbefw/sbecmdprocessor.C
+++ b/src/sbefw/core/sbecmdprocessor.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdprocessor.C $                                 */
+/* $Source: src/sbefw/core/sbecmdprocessor.C $                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdreceiver.C b/src/sbefw/core/sbecmdreceiver.C
index 4bfeae09..ca716c65 100644
--- a/src/sbefw/sbecmdreceiver.C
+++ b/src/sbefw/core/sbecmdreceiver.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdreceiver.C $                                  */
+/* $Source: src/sbefw/core/sbecmdreceiver.C $                             */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdregaccess.C b/src/sbefw/core/sbecmdregaccess.C
index dd5f4e89..40d3537c 100644
--- a/src/sbefw/sbecmdregaccess.C
+++ b/src/sbefw/core/sbecmdregaccess.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdregaccess.C $                                 */
+/* $Source: src/sbefw/core/sbecmdregaccess.C $                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdregaccess.H b/src/sbefw/core/sbecmdregaccess.H
index 4468b955..05c10d8d 100644
--- a/src/sbefw/sbecmdregaccess.H
+++ b/src/sbefw/core/sbecmdregaccess.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdregaccess.H $                                 */
+/* $Source: src/sbefw/core/sbecmdregaccess.H $                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdringaccess.C b/src/sbefw/core/sbecmdringaccess.C
index 217f5b67..1db28734 100644
--- a/src/sbefw/sbecmdringaccess.C
+++ b/src/sbefw/core/sbecmdringaccess.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdringaccess.C $                                */
+/* $Source: src/sbefw/core/sbecmdringaccess.C $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdringaccess.H b/src/sbefw/core/sbecmdringaccess.H
index 6df11f20..54314c15 100644
--- a/src/sbefw/sbecmdringaccess.H
+++ b/src/sbefw/core/sbecmdringaccess.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdringaccess.H $                                */
+/* $Source: src/sbefw/core/sbecmdringaccess.H $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdscomaccess.C b/src/sbefw/core/sbecmdscomaccess.C
index b3524a9a..f2b42608 100644
--- a/src/sbefw/sbecmdscomaccess.C
+++ b/src/sbefw/core/sbecmdscomaccess.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdscomaccess.C $                                */
+/* $Source: src/sbefw/core/sbecmdscomaccess.C $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdscomaccess.H b/src/sbefw/core/sbecmdscomaccess.H
index df897a97..bd448053 100644
--- a/src/sbefw/sbecmdscomaccess.H
+++ b/src/sbefw/core/sbecmdscomaccess.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdscomaccess.H $                                */
+/* $Source: src/sbefw/core/sbecmdscomaccess.H $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdsram.C b/src/sbefw/core/sbecmdsram.C
index f4732d5c..ce05f7f6 100644
--- a/src/sbefw/sbecmdsram.C
+++ b/src/sbefw/core/sbecmdsram.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdsram.C $                                      */
+/* $Source: src/sbefw/core/sbecmdsram.C $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdsram.H b/src/sbefw/core/sbecmdsram.H
index f274c9d3..3dd0977b 100644
--- a/src/sbefw/sbecmdsram.H
+++ b/src/sbefw/core/sbecmdsram.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdsram.H $                                      */
+/* $Source: src/sbefw/core/sbecmdsram.H $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdtracearray.C b/src/sbefw/core/sbecmdtracearray.C
index a15bf8be..89641d15 100644
--- a/src/sbefw/sbecmdtracearray.C
+++ b/src/sbefw/core/sbecmdtracearray.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdtracearray.C $                                */
+/* $Source: src/sbefw/core/sbecmdtracearray.C $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdtracearray.H b/src/sbefw/core/sbecmdtracearray.H
index ade451a4..af8362fd 100644
--- a/src/sbefw/sbecmdtracearray.H
+++ b/src/sbefw/core/sbecmdtracearray.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbecmdtracearray.H $                                */
+/* $Source: src/sbefw/core/sbecmdtracearray.H $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/core/sbecorefiles.mk b/src/sbefw/core/sbecorefiles.mk
new file mode 100644
index 00000000..3cfe235f
--- /dev/null
+++ b/src/sbefw/core/sbecorefiles.mk
@@ -0,0 +1,60 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/sbefw/core/sbecorefiles.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2015,2017
+#
+#
+# Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+# IBM_PROLOG_END_TAG
+SBECORE-CPP-SOURCES = sbemain.C
+SBECORE-CPP-SOURCES += sbeirq.C
+SBECORE-CPP-SOURCES += sbecmdreceiver.C
+SBECORE-CPP-SOURCES += sbecmdprocessor.C
+SBECORE-CPP-SOURCES += sbecmdparser.C
+SBECORE-CPP-SOURCES += sbecmdscomaccess.C
+SBECORE-CPP-SOURCES += sbecmdiplcontrol.C
+SBECORE-CPP-SOURCES += pool.C
+SBECORE-CPP-SOURCES += sbecmdgeneric.C
+SBECORE-CPP-SOURCES += sbeFifoMsgUtils.C
+SBECORE-CPP-SOURCES += sbecmdmemaccess.C
+SBECORE-CPP-SOURCES += sbeHostUtils.C
+SBECORE-CPP-SOURCES += sbecmdcntrldmt.C
+SBECORE-CPP-SOURCES += sbecmdsram.C
+SBECORE-CPP-SOURCES += sberegaccess.C
+SBECORE-CPP-SOURCES += sbecmdcntlinst.C
+SBECORE-CPP-SOURCES += sbecmdregaccess.C
+SBECORE-CPP-SOURCES += sbeFFDC.C
+SBECORE-CPP-SOURCES += sbecmdringaccess.C
+SBECORE-CPP-SOURCES += sbescom.C
+SBECORE-CPP-SOURCES += sbecmdmpipl.C
+SBECORE-CPP-SOURCES += sbefapiutil.C
+SBECORE-CPP-SOURCES += sbeutil.C
+SBECORE-CPP-SOURCES += sbecmdtracearray.C
+SBECORE-CPP-SOURCES += sbeTimerSvc.C
+SBECORE-CPP-SOURCES += sbecmdCntrlTimer.C
+SBECORE-CPP-SOURCES += sbeHostMsg.C
+SBECORE-CPP-SOURCES += sbeSpMsg.C
+SBECORE-CPP-SOURCES += sbeglobals.C
+SBECORE-CPP-SOURCES += sbeMemAccessInterface.C
+SBECORE-CPP-SOURCES += sbeSecureMemRegionManager.C
+SBECORE-CPP-SOURCES += sbeSecurity.C
+
+SBECORE-C-SOURCES =
+SBECORE-S-SOURCES =
+
+SBECORE_OBJECTS = $(SBECORE-C-SOURCES:.c=.o) $(SBECORE-CPP-SOURCES:.C=.o) $(SBECORE-S-SOURCES:.S=.o)
diff --git a/src/sbefw/core/sbecoreseepromfiles.mk b/src/sbefw/core/sbecoreseepromfiles.mk
new file mode 100644
index 00000000..5c82f5a3
--- /dev/null
+++ b/src/sbefw/core/sbecoreseepromfiles.mk
@@ -0,0 +1,34 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/sbefw/core/sbecoreseepromfiles.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2015,2017
+#
+#
+# Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+# IBM_PROLOG_END_TAG
+SBECORESEEPROM-CPP-SOURCES = sbecmdgeneric.C
+SBECORESEEPROM-CPP-SOURCES += sbecmdmpipl.C
+SBECORESEEPROM-CPP-SOURCES += sbecmdmemaccess.C
+SBECORESEEPROM-CPP-SOURCES += sbeSecureMemRegionManager.C
+SBECORESEEPROM-CPP-SOURCES += sbecmdiplcontrol.C
+SBECORESEEPROM-CPP-SOURCES += sbecmdfastarray.C
+
+SBECORESEEPROM-C-SOURCES =
+SBECORESEEPROM-S-SOURCES =
+
+SBECORESEEPROM_OBJECTS = $(SBECORESEEPROM-C-SOURCES:.c=.o) $(SBECORESEEPROM-CPP-SOURCES:.C=.o) $(SBECORESEEPROM-S-SOURCES:.S=.o)
diff --git a/src/sbefw/sbeerrorcodes.H b/src/sbefw/core/sbeerrorcodes.H
index ded7dc19..01665ba8 100644
--- a/src/sbefw/sbeerrorcodes.H
+++ b/src/sbefw/core/sbeerrorcodes.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeerrorcodes.H $                                   */
+/* $Source: src/sbefw/core/sbeerrorcodes.H $                              */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeevents.H b/src/sbefw/core/sbeevents.H
index fbb0dcd4..783dc183 100644
--- a/src/sbefw/sbeevents.H
+++ b/src/sbefw/core/sbeevents.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeevents.H $                                       */
+/* $Source: src/sbefw/core/sbeevents.H $                                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeexeintf.H b/src/sbefw/core/sbeexeintf.H
index 22bd7745..80d89586 100644
--- a/src/sbefw/sbeexeintf.H
+++ b/src/sbefw/core/sbeexeintf.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeexeintf.H $                                      */
+/* $Source: src/sbefw/core/sbeexeintf.H $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbefapiutil.C b/src/sbefw/core/sbefapiutil.C
index 6d976beb..b7cabc29 100644
--- a/src/sbefw/sbefapiutil.C
+++ b/src/sbefw/core/sbefapiutil.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbefapiutil.C $                                     */
+/* $Source: src/sbefw/core/sbefapiutil.C $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbefapiutil.H b/src/sbefw/core/sbefapiutil.H
index d8136107..c2e72387 100644
--- a/src/sbefw/sbefapiutil.H
+++ b/src/sbefw/core/sbefapiutil.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbefapiutil.H $                                     */
+/* $Source: src/sbefw/core/sbefapiutil.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbefifo.H b/src/sbefw/core/sbefifo.H
index 6a4332e9..20385e26 100644
--- a/src/sbefw/sbefifo.H
+++ b/src/sbefw/core/sbefifo.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbefifo.H $                                         */
+/* $Source: src/sbefw/core/sbefifo.H $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeglobals.C b/src/sbefw/core/sbeglobals.C
index d8a69b8e..8d9ef020 100644
--- a/src/sbefw/sbeglobals.C
+++ b/src/sbefw/core/sbeglobals.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeglobals.C $                                      */
+/* $Source: src/sbefw/core/sbeglobals.C $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2017                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeglobals.H b/src/sbefw/core/sbeglobals.H
index 02248014..c26967a6 100644
--- a/src/sbefw/sbeglobals.H
+++ b/src/sbefw/core/sbeglobals.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeglobals.H $                                      */
+/* $Source: src/sbefw/core/sbeglobals.H $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2017                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeirq.C b/src/sbefw/core/sbeirq.C
index d7ce601c..9db6809c 100644
--- a/src/sbefw/sbeirq.C
+++ b/src/sbefw/core/sbeirq.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeirq.C $                                          */
+/* $Source: src/sbefw/core/sbeirq.C $                                     */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeirq.H b/src/sbefw/core/sbeirq.H
index 1862be6a..5700cc9d 100644
--- a/src/sbefw/sbeirq.H
+++ b/src/sbefw/core/sbeirq.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeirq.H $                                          */
+/* $Source: src/sbefw/core/sbeirq.H $                                     */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbemain.C b/src/sbefw/core/sbemain.C
index cf56dd47..e49fc029 100644
--- a/src/sbefw/sbemain.C
+++ b/src/sbefw/core/sbemain.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbemain.C $                                         */
+/* $Source: src/sbefw/core/sbemain.C $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sberegaccess.C b/src/sbefw/core/sberegaccess.C
index 14cd371b..03ffd852 100644
--- a/src/sbefw/sberegaccess.C
+++ b/src/sbefw/core/sberegaccess.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sberegaccess.C $                                    */
+/* $Source: src/sbefw/core/sberegaccess.C $                               */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sberegaccess.H b/src/sbefw/core/sberegaccess.H
index 9e47200a..420cf795 100644
--- a/src/sbefw/sberegaccess.H
+++ b/src/sbefw/core/sberegaccess.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sberegaccess.H $                                    */
+/* $Source: src/sbefw/core/sberegaccess.H $                               */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbescom.C b/src/sbefw/core/sbescom.C
index c38827c8..7c4105a0 100644
--- a/src/sbefw/sbescom.C
+++ b/src/sbefw/core/sbescom.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbescom.C $                                         */
+/* $Source: src/sbefw/core/sbescom.C $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbescom.H b/src/sbefw/core/sbescom.H
index 86c16379..5d242cdf 100644
--- a/src/sbefw/sbescom.H
+++ b/src/sbefw/core/sbescom.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbescom.H $                                         */
+/* $Source: src/sbefw/core/sbescom.H $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbestates.H b/src/sbefw/core/sbestates.H
index 419456aa..4f97c363 100644
--- a/src/sbefw/sbestates.H
+++ b/src/sbefw/core/sbestates.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbestates.H $                                       */
+/* $Source: src/sbefw/core/sbestates.H $                                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbetrace.H b/src/sbefw/core/sbetrace.H
index d73a2f95..5c3ea7b5 100644
--- a/src/sbefw/sbetrace.H
+++ b/src/sbefw/core/sbetrace.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbetrace.H $                                        */
+/* $Source: src/sbefw/core/sbetrace.H $                                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeutil.C b/src/sbefw/core/sbeutil.C
index 0d116337..bc53e7a4 100644
--- a/src/sbefw/sbeutil.C
+++ b/src/sbefw/core/sbeutil.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeutil.C $                                         */
+/* $Source: src/sbefw/core/sbeutil.C $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeutil.H b/src/sbefw/core/sbeutil.H
index 8653b6b2..75ea07b5 100644
--- a/src/sbefw/sbeutil.H
+++ b/src/sbefw/core/sbeutil.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/sbeutil.H $                                         */
+/* $Source: src/sbefw/core/sbeutil.H $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/vector b/src/sbefw/core/vector
index 053d9bfc..bbb0818d 100644
--- a/src/sbefw/vector
+++ b/src/sbefw/core/vector
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/sbefw/vector $                                            */
+/* $Source: src/sbefw/core/vector $                                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbefwfiles.mk b/src/sbefw/sbefwfiles.mk
deleted file mode 100644
index fbf9c3cd..00000000
--- a/src/sbefw/sbefwfiles.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/sbefw/sbefwfiles.mk $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2017
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
-#
-# 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.
-#
-# IBM_PROLOG_END_TAG
-SBEFW-CPP-SOURCES = sbemain.C
-SBEFW-CPP-SOURCES += sbeirq.C
-SBEFW-CPP-SOURCES += sbecmdreceiver.C
-SBEFW-CPP-SOURCES += sbecmdprocessor.C
-SBEFW-CPP-SOURCES += sbecmdparser.C
-SBEFW-CPP-SOURCES += sbecmdscomaccess.C
-SBEFW-CPP-SOURCES += sbecmdiplcontrol.C
-SBEFW-CPP-SOURCES += pool.C
-SBEFW-CPP-SOURCES += sbecmdgeneric.C
-SBEFW-CPP-SOURCES += sbeFifoMsgUtils.C
-SBEFW-CPP-SOURCES += sbecmdmemaccess.C
-SBEFW-CPP-SOURCES += sbeHostUtils.C
-SBEFW-CPP-SOURCES += sbecmdcntrldmt.C
-SBEFW-CPP-SOURCES += sbecmdsram.C
-SBEFW-CPP-SOURCES += sberegaccess.C
-SBEFW-CPP-SOURCES += sbecmdcntlinst.C
-SBEFW-CPP-SOURCES += sbecmdregaccess.C
-SBEFW-CPP-SOURCES += sbeFFDC.C
-SBEFW-CPP-SOURCES += sbecmdringaccess.C
-SBEFW-CPP-SOURCES += sbescom.C
-SBEFW-CPP-SOURCES += sbecmdmpipl.C
-SBEFW-CPP-SOURCES += sbefapiutil.C
-SBEFW-CPP-SOURCES += sbeutil.C
-SBEFW-CPP-SOURCES += sbecmdtracearray.C
-SBEFW-CPP-SOURCES += sbeTimerSvc.C
-SBEFW-CPP-SOURCES += sbecmdCntrlTimer.C
-SBEFW-CPP-SOURCES += sbeHostMsg.C
-SBEFW-CPP-SOURCES += sbeSpMsg.C
-SBEFW-CPP-SOURCES += sbeglobals.C
-SBEFW-CPP-SOURCES += sbeMemAccessInterface.C
-SBEFW-CPP-SOURCES += sbeSecureMemRegionManager.C
-SBEFW-CPP-SOURCES += sbeSecurity.C
-
-SBEFW-C-SOURCES =
-SBEFW-S-SOURCES =
-
-SBEFW_OBJECTS = $(SBEFW-C-SOURCES:.c=.o) $(SBEFW-CPP-SOURCES:.C=.o) $(SBEFW-S-SOURCES:.S=.o)