SBE code restructure: sbe -> src rename

Change-Id: I6e4378d0e71a00ed2b239658d43f180df2a9b748 RTC:159709 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28875 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: RAJA DAS <rajadas2@in.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
author: Shakeeb <shakeebbk@in.ibm.com> 2016-08-27 10:50:49 -0500
committer: Sachin Gupta <sgupta2m@in.ibm.com> 2016-08-30 06:01:06 -0400
commit: f2d94b5f809410300fe10dc9d0786790018463a0 (patch)
tree: 467f90297b0eb7c5c6672653d778ed4734c0d5a3
parent: 49b557dcae32250e8e06c4de895c0b7ba0e8009e (diff)
download: talos-sbe-f2d94b5f809410300fe10dc9d0786790018463a0.tar.gz
talos-sbe-f2d94b5f809410300fe10dc9d0786790018463a0.zip
277 files changed, 2851 insertions, 1079 deletions
diff --git a/Makefile b/Makefile
index 63876e0f..a3e65abf 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +22,7 @@
 # permissions and limitations under the License.
 #
 # IBM_PROLOG_END_TAG
-BUILD_DIR = sbe/image
+BUILD_DIR = src/image
 .PHONY: install all clean
 
 install:
diff --git a/env.bash b/env.bash
index 6662a005..e43bc8b2 100755
--- a/env.bash
+++ b/env.bash
@@ -30,7 +30,7 @@ if [ -e ./customrc ]; then
 fi
 
 export PATH=${PATH}:${SBEROOT}/import/chips/p9/xip/bin/
-export PATH=${PATH}:${SBEROOT}/sbe/tools/ppetracepp/
+export PATH=${PATH}:${SBEROOT}/src/tools/ppetracepp/
 
 if [ -n "${SANDBOXROOT}" ]; then
     if [ -n "${SANDBOXNAME}" ]; then
@@ -42,7 +42,7 @@ export DEFAULT_MACHINE=nimbus
 
 # The following ENV variables are required by the pre/post commit hooks
 export PROJECT_NAME=sbe
-export TOOLSDIR=$SBEROOT/sbe/tools/hooks
+export TOOLSDIR=$SBEROOT/src/tools/hooks
 export HOOKSDIR=$SBEROOT/.git/hooks
 export IMPORT_REL_PATH=import
 export IMPORT_DIR=$SBEROOT/$IMPORT_REL_PATH
diff --git a/releaseNotes.html b/releaseNotes.html
new file mode 100644
index 00000000..a3f59188
--- /dev/null
+++ b/releaseNotes.html
@@ -0,0 +1,373 @@
+<html>
+    <head><title>Release notes for sbe0819a_1633.910</title></head>
+    <style type="text/css">
+        table.release {
+            border-width: 1px;
+            border-spacing: 2px;
+            border-style: outset;
+            border-color: gray;
+            border-collapse: separate;
+            background-color: white;
+        }
+        table.release th {
+            border-width: 1px;
+            padding: 1px;
+            border-style: inset;
+            border-color: gray;
+            background-color: white;
+        }
+        table.release td {
+            border-width: 1px;
+            padding: 1px;
+            border-style: inset;
+            border-color: gray;
+            background-color: white;
+        }
+    </style>
+    <body>
+<h1>Level: sbe0819a_1633.910</h1>
+<h2>Included commits:</h2>
+<table class='release'>
+    <tr>
+        <th>RTC/CQ Number(s)</th>
+        <th>Subject</th>
+        <th>Git Commit</th>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Put ring from image spec sync</td>
+        <td>9849b6490911716d2678a0ee11cb4845d4e2adf1</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Fix ATTR_PG bug for MC chiplets</td>
+        <td>bf52a8374b379f68944778e567f128ec74c03cc5</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/149027.hover.html' target='_blank'>149027</a> </td>
+        <td>Adding git release tool</td>
+        <td>4b1b51154e726eb42bcd79b4431cbede19ad1857</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>changed ATTR_PG value for XB from E01D to E00D</td>
+        <td>a6f37a6568c7f4897e55f172ccc36801c9bf96fb</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Removed xip binary copy from SBE CI</td>
+        <td>a17cccba209defe2630dbda9f22ecfb065d1b272</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Override support for putring functionality</td>
+        <td>3b12216bcd8ef5ad69d9d8608da2b90085011961</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/157865.hover.html' target='_blank'>157865</a> </td>
+        <td>move ppeSetFixed.pl from tools/image to tools/scripts</td>
+        <td>f3119c88cbd60368049f04be205f0af739106a0e</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Update backing build</td>
+        <td>c2489e67aea982dada8ccd24067ac5fe1f5e93f3</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Fix plat_getTargetHandle API for PERV</td>
+        <td>2130b673b1583a2cb97094dc01b3fbb5e5b4f7d1</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Update error xml files</td>
+        <td>c78745af2aeb76f0f273989e7674c3a8df02550e</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/151554.hover.html' target='_blank'>151554</a> </td>
+        <td>Updating SBE parser format</td>
+        <td>2ed48f86577c97de6c94fd8943503272cda569a1</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/158865.hover.html' target='_blank'>158865</a> </td>
+        <td>Use mirrored PK</td>
+        <td>e67cfb9a6b07cac85af697a69b1a15a22cd6adb5</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Removed unused directories</td>
+        <td>2e07787574a2a6ec5c9390be80033ed3aa903798</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Reset fapi2::current_err</td>
+        <td>c5fd5f21e808eeab00bfd1a14b3a42709110c9a2</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Fixes to make sure merged commit's CI succeed</td>
+        <td>9ccd3c019341f455b12eaa2fbf54958467241bca</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Minor fix of Level2 HWP for p9_sbe_tp_chiplet_init1</td>
+        <td>adad8bf8a88d87e89b9e06f615891510eb8d9bc4</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/157141.hover.html' target='_blank'>157141</a> </td>
+        <td>Plat support for getTarget(ordinal)</td>
+        <td>e6c7501067304187c3a76035a70289ed90563033</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>CORE/CACHE: istep4 functional fix collection</td>
+        <td>1ced6e68784f966de6ef5f179a5f29c7a30d5034</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>p9_sbe_attributes xml file updates</td>
+        <td>a03c164d7ca6b2af132e63525a3e0d9fc4f250ba</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Facilitate FSP CI</td>
+        <td>a102fea1862d3d91007e9b3f5bba50a63abca35a</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>scan HWP updates</td>
+        <td>1e6f5999e7331073d8467d397beec381450b4574</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Add p9_proc_gettracearray procedure</td>
+        <td>f0969169982444138e26903226708da8fa0e9f54</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/157965.hover.html' target='_blank'>157965</a> </td>
+        <td>PPE42 PK lib locaton changes</td>
+        <td>ecca9de5aef67319455b2357e7e0b7429f07b055</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>PK/Kernel: allow user to override PK_BASE_FREQ_HZ</td>
+        <td>ba1c411e05cd8c0f3dea4e5516196afcc1e07ee0</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/154819.hover.html' target='_blank'>154819</a> </td>
+        <td>Add PK_TRACE_CRIT and PK_TRACE_DBG_SUPPRESS trace directives</td>
+        <td>38b7e94b4cc28a5f4e307a49f56e4c3b5a382bc1</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>FAPI2 for ppe_closed</td>
+        <td>a0f3a63ddf21ec8b87e69ed17366d01318865147</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/154506.hover.html' target='_blank'>154506</a> </td>
+        <td>PK API for timebase reference update (SBE)</td>
+        <td>982ecc855d9eedf5c6c7d379d2a30bd312d6a419</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/151762.hover.html' target='_blank'>151762</a> </td>
+        <td>Make changes to build cme stop_gpe pstate_gpe binary images</td>
+        <td>93383d1128ea51f47839e21a1e89dd457fa3a16c</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>PK/TRACE: Add marker to pk trace of trace buffer wrap helping EPM</td>
+        <td>1498f2af6732bda3ffed4f96b84aab7caa88192e</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Combined Stop/PState Cme Image + unified interrupt handler</td>
+        <td>f01c6730e6b143686bfe9e886f1db57022a7af50</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Initial checkin of pstate and ./pk support codes and creation of ./ppe dir.</td>
+        <td>0378001b9ef45375ec10957f69812ed3bf7588fd</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Fixing bug in ATTR_BOOT_FLAGS</td>
+        <td>a5c7436bdca39144ed7bd1c9c227a3b35e6f3672</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/150291.hover.html' target='_blank'>150291</a> </td>
+        <td>Use ATTR_BOOT_FLAGS</td>
+        <td>4e863e12407cf415d0fbaa43c475931e87b8d627</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>FFDC generation updates</td>
+        <td>5b33fe317122fb88061bc733301ecf54bf216164</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Update prologs of mirrored files to have apache license</td>
+        <td>4dec61e1a2e0e633304759a1dfb99ec9c53b7057</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Enable the import tree to have PPE prologs</td>
+        <td>961d6b94e387948fef086331bfa55200bd133fe0</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Wrappers for SCOM functions</td>
+        <td>6938cd95a6809e31ee004f9c7ef5b434fe29d8dd</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>PPE Multicast implementation</td>
+        <td>7f869c2a0d359eca3a10856ae0b22753c9046854</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Fapi delay updates</td>
+        <td>962aa94a55df0d09464a9cc13ec2c96aa75fab13</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Adding tor_append_ring API</td>
+        <td>655afca35c1ede61e4cd9b3bce269c9b7b870f0c</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>SBE:PUTRING: Add sim clock cycles to fapi2::delay funciton</td>
+        <td>cf6cfd2d21a358b44bc9bd0cddbfea76284aad73</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>SBE:PUTRING: Instance ring tor offset fix</td>
+        <td>e186d22a0bc4674c8d1bc38cb357206affdae10e</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>p9_tor / p9_ringId: fixing layering violation</td>
+        <td>9b1f4a99e8a585733f07603d730d11299f2e7c67</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Update parseErrorInfo.pl to support collectFfdc tags for SBE</td>
+        <td>aef707527e8ab621acc7e804e0e6cc31ed7d7e64</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/127348.hover.html' target='_blank'>127348</a> </td>
+        <td>Support HB to Cronus attribute dump/sync</td>
+        <td>11e2a30a3e75eef093b7655fc819b9c439a48433</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>p9_ringId / p9_ring_identification: cleanup extern declarations</td>
+        <td>02f5df28d926ff10b329f6751cb7f8e082cbbe87</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>p9_sbe_chiplet_reset: Change NX_1 hang pulse period to 68s</td>
+        <td>b899d4bd8c1ad0e0ed796290845f4a0f2d8c2084</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Procedures modified for DD1 changes</td>
+        <td>30a1e543482d9a9f5b84e1695306aedcfcab5773</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/158078.hover.html' target='_blank'>158078</a> </td>
+        <td>p9_putRingUtils: clean up duplicated code</td>
+        <td>6a399b429b3cbcbdd737da73f4dd2ccd2d8bbd04</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>p9_sbe_tp_chiplet_init3 updates</td>
+        <td>59100688dd126cb1829404b1330f864726ec5c80</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/126566.hover.html' target='_blank'>126566</a> </td>
+        <td>Variable buffer api additions</td>
+        <td>bd26a5dd0dee2c77523d5aab4e2c8266104b0638</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Attibutes modified for 9067 model.</td>
+        <td>da6e22da6a89e02d662de9803c5de6a2657c2536</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>p9_sbe_scominit_errors.xml -- add empty file to establish PPE mirror</td>
+        <td>d209a545d188f1b6588ed65881480bcf3acee030</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/158310.hover.html' target='_blank'>158310</a> </td>
+        <td>p9_ring_id.h: move ring IDs to plain C header file</td>
+        <td>33e6f53df0429c7f78c7acdb4883b565a6b2179d</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Initialise PIBMEM</td>
+        <td>c0a7b0e8a2a0c0f4a39ea96692269263f372e9a1</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Fapi2 getTargetType changes in putring code</td>
+        <td>50b9693f93c981a895f3f31eac5cacbc89a64156</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Update backing build</td>
+        <td>5158bb6ba51ff138262635b28db6f7a19060485c</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Rename tor_get_ring API as tor_access_ring</td>
+        <td>cbeb098cb6c698433eca02c5f1638de4338b4dd9</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/153701.hover.html' target='_blank'>153701</a> </td>
+        <td>OCC Special Timeout handling</td>
+        <td>7e5f4e067f3341f9f6fd903810db6d2cba1db72f</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Ensure fapi2::Target honors platform value type.</td>
+        <td>cd59fc76eabf7ec747c4649327a4a5da151d6a8c</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>Changes to support SBE error parsing in HB/HWSV</td>
+        <td>3ae768f317ef8bc173c0e41ec41dd8ba276ed0d5</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>fapi2: Update hw_access functions to honor platform value type.</td>
+        <td>27afcc1223080e209038a495323d2ffe848169b6</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>fapi2: Update misc functions to honor platform value type.</td>
+        <td>f4dbd0b4027971e2e1a032ff3d1106cb87494392</td>
+    </tr>
+    <tr>
+        <td><a href='https://jazz07.rchland.ibm.com:13443/jazz/oslc/workitems/154516.hover.html' target='_blank'>154516</a> </td>
+        <td>p9_pm_init: Level 2: Implement functionality</td>
+        <td>74c8ca8afb704051c8c76bf7c7019e1aa222ebc5</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>FAPI_INF entering and exiting message updates</td>
+        <td>9f18c1ec9885a17c153fa3ac0e847d02244bb2cf</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>scan HWP updates</td>
+        <td>b8f5ddbd7962831dc51701a782cccb3b8549cb6a</td>
+    </tr>
+    <tr>
+        <td> </td>
+        <td>alternate multicast implementation</td>
+        <td>97decbc40b9d1ba6de94ada555b81c703624ee09</td>
+    </tr>
+</table>
+    </body>
+</html>
diff --git a/sb b/sb
index 46c68223..3488c7d9 100755
--- a/sb
+++ b/sb
@@ -24,8 +24,8 @@
 #
 # IBM_PROLOG_END_TAG
 
-SBE_TOOLS_PATH="sbe/build/tools"
-SBE_CITEST_PATH="sbe/test/citest"
+SBE_TOOLS_PATH="src/build/tools"
+SBE_CITEST_PATH="src/test/citest"
 
 sb_helptext()
 {
diff --git a/sbe/image/Mirror_WA_attributes.xml b/sbe/image/Mirror_WA_attributes.xml
deleted file mode 100644
index ea4bac8a..00000000
--- a/sbe/image/Mirror_WA_attributes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $Id: proc_pll_ring_attributes.xml,v 1.17 2014/11/13 20:14:02 szhong Exp $ -->
-<!-- proc_pll_ring_attributes.xml -->
-<attributes>
-  <attribute>
-    <id>ATTR_CHIP_UNIT_POS</id>
-    <targetType>TARGET_TYPE_PERV</targetType>
-    <description></description>
-    <valueType>uint8</valueType>
-  </attribute>
-  <!-- ********************************************************************* -->
-</attributes>
diff --git a/sbe/image/base_sbe_fixed.S b/sbe/image/base_sbe_fixed.S
deleted file mode 100644
index eb88482f..00000000
--- a/sbe/image/base_sbe_fixed.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/// \file sbefixed.S
-/// \brief code to generated fixed section in pibmem image
-///
-#include "p9_xip_image.h"
-#include "proc_sbe_fixed.H"
-
-
-	.macro	..checku, x:req, bits:req, err="Unsigned value too large"
-
-	.if	(((\bits) <= 0) || ((\bits) > 63))
-	.error	"The number of bits must be in the range 0 < bits < 64"
-	.endif
-
-	.iflt	(\x)
-	.error  "An unsigned value is required here"
-        .endif
-
-	.ifgt	((\x) - (0xffffffffffffffff >> (64 - (\bits))))
-	.error	"\err"
-	.endif
-
-	.endm
-
-
-    .macro  ..check_u16, u16
-	..checku (\u16), 16, "Unsigned immediate is larger than 16 bits"
-    .endm
-
-
-    .macro  ..set_default_space, s
-	..check_u16 (\s)
-    .set    _PGAS_DEFAULT_SPACE, (\s)
-    .endm
-
-    .section .fixed, "a", @progbits
-
-
-    // Create the .fixed section
-    .proc_sbe_fixed_system
-    .proc_sbe_fixed_proc_chip
-    .proc_sbe_fixed_perv
-    .proc_sbe_fixed_core
-    .proc_sbe_fixed_ex
-    .proc_sbe_fixed_eq
diff --git a/sbe/image/buildInfo.py b/sbe/image/buildInfo.py
deleted file mode 100755
index 919d4722..00000000
--- a/sbe/image/buildInfo.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/python
-
-# This script will create header file sbe_build_info.H which will have
-# buld information required by SBE code.
-import os
-buildInfoFileName = "sbe_build_info.H"
-
-def buildInfo():
-    header = \
-"#ifndef SBE_BUILD_INFO_H  \n\
-#define SBE_BUILD_INFO_H  \n\n"
-
-    footer = "\n#endif  // SBE_BUILD_INFO_H"
-    commitId = "0x" + os.popen("git rev-parse --short=8 HEAD").read().rstrip()
-
-    f = open( buildInfoFileName, 'w')
-
-    f.write(header)
-    f.write("//Define SBE Commit ID \n")
-    f.write("#define SBE_COMMIT_ID " + commitId + "\n")
-    f.write(footer)
-    f.close()
-
-# Call buildInfo
-buildInfo()
diff --git a/sbe/image/p9_sbe.H b/sbe/image/p9_sbe.H
deleted file mode 100644
index a5f2c78b..00000000
--- a/sbe/image/p9_sbe.H
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __P9_SBE_H
-#define __P9_SBE_H
-
-/// \file p9_sbe.H
-/// \brief A header to be included into all SBE assembler files and C++
-/// hardware procedures that interact with SBE images.
-///
-/// This header #include-s all generally useful headers required for SBE code
-/// development as well as defining other needed facilities.  Note that any
-/// sub-includes must be done in an assembler-safe way.
-
-#include "sbe_common.H"
-//#include "p9_scom_addresses.H"
-//#include "p9_istep_num.H"
-
-// The #include of fapiHwpReturnCodes.H must be made here (instead of in
-// sbe_common.H) to guarantee that the P9-local copy is used.
-//#include "fapiHwpReturnCodes.H"
-
-#ifdef __ASSEMBLER__
-
-        // p9_sbe.H 'recursively' inserts itself into any hook code extracted
-        // from an assembly context that includes p9_sbe.H.
-
-	##`#include "p9_sbe.H"
-
-#endif  // __ASSEMBLER__
-
-#endif  // __P9_SBE_H
diff --git a/sbe/sample/link.cmd b/sbe/sample/link.cmd
deleted file mode 100644
index 458de312..00000000
--- a/sbe/sample/link.cmd
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// Need to do this so that elf32-powerpc is not modified!
-#undef powerpc
-
-#ifndef INITIAL_STACK_SIZE
-#define INITIAL_STACK_SIZE 256
-#endif
-
-OUTPUT_FORMAT(elf32-powerpc);
-
-MEMORY
-{
- sram : ORIGIN = 0xFFF40000, LENGTH = 0xc0000
-}
-
-SECTIONS
-{
-    . = 0xfff40000;
-    .text          : {. = ALIGN(512); *(.vectors) *(.text)} > sram
-
-    ////////////////////////////////
-    // Read-only Data
-    ////////////////////////////////
-
-    . = ALIGN(8);
-    _RODATA_SECTION_BASE = .;
-
-    // SDA2 constant sections .sdata2 and .sbss2 must be adjacent to each
-    // other.  Our SDATA sections are small so we'll use strictly positive
-    // offsets. 
-
-    _SDA2_BASE_ = .;
-   .sdata2 . : { *(.sdata2) } > sram
-   .sbss2  . : { *(.sbss2) } > sram
-
-   // Other read-only data.  
-
-   .rodata . : { *(.rodata*) *(.got2) } > sram
-
-    _RODATA_SECTION_SIZE = . - _RODATA_SECTION_BASE;
-
-    ////////////////////////////////
-    // Read-write Data
-    ////////////////////////////////
-
-    . = ALIGN(8);
-    _DATA_SECTION_BASE = .;
-
-    // SDA sections .sdata and .sbss must be adjacent to each
-    // other.  Our SDATA sections are small so we'll use strictly positive
-    // offsets. 
-
-    _SDA_BASE_ = .;
-    .sdata  . : { *(.sdata)  } > sram
-    .sbss   . : { *(.sbss)   } > sram
-
-    // Other read-write data
-    // It's not clear why boot.S is generating empty .glink,.iplt
-
-   .rela   . : { *(.rela*) } > sram
-   .rwdata . : { *(.data) *(.bss) } > sram
-//  .iplt . : { *(.iplt) } > sram
-
-   _PK_INITIAL_STACK_LIMIT = .;
-   . = . + INITIAL_STACK_SIZE;
-   _PK_INITIAL_STACK = . - 1;
-
-}
diff --git a/sbe/sample/pk_scom.h b/sbe/sample/pk_scom.h
deleted file mode 100644
index 52fd5893..00000000
--- a/sbe/sample/pk_scom.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//-----------------------------------------------------------------------------
-// *! (C) Copyright International Business Machines Corp. 2014
-// *! All Rights Reserved -- Property of IBM
-// *! *** IBM Confidential ***
-//-----------------------------------------------------------------------------
-
-/// \file sample_main.c
-/// \brief Sample program that creates and starts a thread
-///
-/// This file demonstrates how to create a thread and run it.  It also provides
-/// an example of how to add traces to the code.
-
-#ifndef __PK_SCOM_H__
-#define __PK_SCOM_H__
-
-/// SCOM operations return non-zero error codes that may or may not indicate
-/// an actual error, depending on which SCOM is begin accessed.  This error
-/// code is returned as the value of get/putscom().  The error code value
-/// increases with teh severity of the error.
-#define CFAM_FSI_STATUS_0x00001007  0x00001007
-typedef union cfam_fsi_status_reg {
-  uint64_t value;
-  struct  {
-    uint64_t ignore_fields1   : 17  ;
-    uint64_t pib_error_code   : 3   ;
-    uint64_t igore_fields2    : 44  ;
-  }  fields;
-}  cfam_fsi_status_reg_t;
-
-#define PCB_ERROR_NONE              0
-#define PCB_ERROR_RESOURCE_OCCUPIED 1
-#define PCB_ERROR_CHIPLET_OFFLINE   2
-#define PCB_ERROR_PARTIAL_GOOD      3
-#define PCB_ERROR_ADDRESS_ERROR     4
-#define PCB_ERROR_CLOCK_ERROR       5
-#define PCB_ERROR_PACKET_ERROR      6
-#define PCB_ERROR_TIMEOUT           7
-
-uint32_t putscom( uint32_t i_chiplet, uint32_t i_address, uint64_t i_data);
-
-uint32_t getscom( uint32_t i_chiplet, uint32_t i_address, uint64_t *o_data);
-
-#endif  // __PK_SCOM_H__
diff --git a/sbe/sample/pk_trace_wrap.c b/sbe/sample/pk_trace_wrap.c
deleted file mode 100644
index 2fc0d68f..00000000
--- a/sbe/sample/pk_trace_wrap.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "pk_trace_wrap.h"
-#include "pk.h"
-#include "pk_trace.h"
-
-
-void pk_trace_wrap(const char* str)
-{
-    PK_TRACE("testsetest");
-}
diff --git a/sbe/sample/pk_trace_wrap.h b/sbe/sample/pk_trace_wrap.h
deleted file mode 100644
index 1c98fadc..00000000
--- a/sbe/sample/pk_trace_wrap.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __PK_WRAP_WRAP_H__
-#define __PK_WRAP_WRAP__H__
-
-
-void pk_trace_wrap(const char*);
-
-#endif  // __PK_WRAP_WRAP_H__
diff --git a/sbe/sample/topfiles.mk b/sbe/sample/topfiles.mk
deleted file mode 100644
index bd1f0e6d..00000000
--- a/sbe/sample/topfiles.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-TOP-C-SOURCES = pk_trace_wrap.c pk_scom.c
-TOP-CPP-SOURCES = sample_main.C
-TOP-S-SOURCES =
-
-
-TOP_OBJECTS = $(TOP-C-SOURCES:.c=.o) $(TOP-CPP-SOURCES:.C=.o) $(TOP-S-SOURCES:.S=.o)
diff --git a/sbe/sbefw/Makefile b/sbe/sbefw/Makefile
deleted file mode 100644
index d0ecafeb..00000000
--- a/sbe/sbefw/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#export P2P_ENABLE = 1
-
-export SUB_OBJDIR = /sbefw
-
-include img_defs.mk
-include sbefwfiles.mk
-
-OBJS := $(addprefix $(OBJDIR)/, $(SBEFW_OBJECTS))
-
-libsbefw.a: $(OBJS)
-	$(AR) crs $(OBJDIR)/libsbefw.a $(OBJDIR)/*.o
-
-.PHONY: clean sbefw
-sbefw: $(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/sbe/sbefw/assert.h b/sbe/sbefw/assert.h
deleted file mode 100644
index e7e128a2..00000000
--- a/sbe/sbefw/assert.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  @file assert.h
- *
- *  @brief This file contains the assert macro for SBE
- */
-#ifndef SBE_ASSERT_H
-#define SBE_ASSERT_H
-#include "sbetrace.H"
-#include "sbeutil.H"
-
-//@TODO via RTC 129166
-//inject exception to halt SBE. Also see if we can use some
-//PK kernel API.
-#ifndef NDEBUG
-#define assert(expr) \
-    if( !(expr ))  \
-    {  \
-        SBE_ERROR("assertion failed: "#expr); \
-        PK_PANIC(SBE::PANIC_ASSERT); \
-    } \
-
-#else
-#define assert(expr)
-#endif  //NDEBUG
-
-#endif // SBE_ASSERT_H
diff --git a/sbe/sbefw/pool.H b/sbe/sbefw/pool.H
deleted file mode 100644
index bc9b002d..00000000
--- a/sbe/sbefw/pool.H
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#ifndef SBE_VECTOR_POOL_H
-#define SBE_VECTOR_POOL_H
-
-namespace SBEVECTORPOOL
-{
-
-// Size of a block  for a vector
-static const size_t G_BLOCKSIZE = 512;
-
-//Pool size
-static const size_t G_POOLSIZE = 4;
-
-typedef struct
-{
-    size_t refCount;
-    uint8_t data[G_BLOCKSIZE] __attribute__ ((aligned (8)));
-}vectorMemPool_t;
-
-/**
-  * @brief Returns memory pool block.
-  *
-  * @return  Memory block if available, NULL otherwise.
-  */
-vectorMemPool_t * allocMem();
-
-/**
-  * @brief Release memory pool block.
-  *
-  * @param[in] i_pool pool pointer.
-  */
-void releaseMem( vectorMemPool_t * i_pool );
-
-} // namespace SBEVECTORPOOL
-#endif //SBE_VECTOR_POOL_H
diff --git a/sbe/sbefw/sbeXipUtils.H b/sbe/sbefw/sbeXipUtils.H
deleted file mode 100644
index c77b60c1..00000000
--- a/sbe/sbefw/sbeXipUtils.H
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef SBE_XIP_UTILS_H
-#define SBE_XIP_UTILS_H
-
-#include "p9_xip_image.h"
-#include "ppe42_scom.h"  // for PPE_STVD
-#include "sbe_link.H"  // for SBE_BASE_ORIGIN, SBE_SEEPROM_BASE_ORIGIN
-
-// Unconditional jump to a memory location
-#define JUMP_TO_ADDR(VAL ) \
-{ \
-asm volatile ( \
-    "mtlr  %0 \n\t" \
-    :   \
-    : "r" (VAL)); \
-asm volatile ( \
-    "blr  \n\t" \
-    :   \
-    );\
-}
-
-// PIBMEM start address
-const uint32_t g_pibMemAddr = SBE_BASE_ORIGIN;
-// SEEPROM start address
-const uint32_t g_headerAddr = SBE_SEEPROM_BASE_ORIGIN;
-// IVPR register address
-const uint32_t g_ivprLoc = 0xC0000160;
-
-// Get XIP image header
-inline P9XipHeader * getXipHdr()
-{
-    P9XipHeader *hdr = (P9XipHeader *)( g_headerAddr );
-    return hdr;
-}
-
-// Get Section start addess
-inline uint8_t * getSectionAddr( P9XipSection * i_section )
-{
-    return ( (uint8_t *)( g_headerAddr + i_section->iv_offset));
-}
-#endif // SBE_XIP_UTILS_H
diff --git a/sbe/sbefw/sbecmdcntlinst.H b/sbe/sbefw/sbecmdcntlinst.H
deleted file mode 100644
index 61323703..00000000
--- a/sbe/sbefw/sbecmdcntlinst.H
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * @file: ppe/sbe/sbefw/sbecmdcntlinst.H
- *
- * @brief This file contains the Interfaces for Control Instructions chip-ops
- *
- */
-
-#ifndef __SBEFW_SBECMDCNTLINST_H
-#define __SBEFW_SBECMDCNTLINST_H
-
-#include <stdint.h>
-
-/**
-  * @brief sbeCntlInst : Implements SBE Control instructions ChipOp
-  *
-  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
-  *
-  * @return    Rc from the FIFO access utility
-  */
-uint32_t sbeCntlInst (uint8_t *i_pArg);
-
-#endif /* __SBEFW_SBECMDCNTLINST_H */
diff --git a/sbe/sbefw/sbecmdcntrldmt.H b/sbe/sbefw/sbecmdcntrldmt.H
deleted file mode 100644
index 5d3d4caf..00000000
--- a/sbe/sbefw/sbecmdcntrldmt.H
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * @file: ppe/sbe/sbefw/sbecmdcntrldmt.H
- *
- * @brief This file contains the Core State Control Messages API header
- *
- */
-
-#ifndef __SBEFW_SBECMDCNTRLDMT_H
-#define __SBEFW_SBECMDCNTRLDMT_H
-
-#include <stdint.h>
-
-// Define for the Sleep interval between continuous HWP calls
-// for DMT functionality in Millisecond
-static const uint8_t  SBE_DMT_SLEEP_INTERVAL = 1;
-
-// Bit-32 used to checkstop the system
-static const uint64_t  N3_FIR_CORE_CHECKSTOP_BIT = 32;
-
-/**
-  * @brief Callback for Timer Expiry for DMT
-  *
-  * @return void
-  */
-void sbeDmtPkExpiryCallback(void *arg);
-
-/**
-  * @brief Control Deadman Timer command (0xD101)
-  *
-  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
-  *
-  * @return    RC from the PSU access utility
-  */
-uint32_t sbeControlDeadmanTimer(uint8_t *i_pArg);
-
-#endif // __SBEFW_SBECMDCNTRLDMT_H
diff --git a/sbe/sbefw/sbecmdgeneric.H b/sbe/sbefw/sbecmdgeneric.H
deleted file mode 100644
index 465f82be..00000000
--- a/sbe/sbefw/sbecmdgeneric.H
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * @file: ppe/sbe/sbefw/sbecmdgeneric.H
- *
- * @brief This file contains the SBE Generic command details
- *
- */
-
-#ifndef __SBEFW_SBECMDGENERIC_H
-#define __SBEFW_SBECMDGENERIC_H
-
-#include <stdint.h>
-
-
-/**
-  * @brief SBE Generic capabilities  (0xA802)
-  *
-  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
-  *
-  * @return    Rc from the FIFO access utility
-  */
-uint32_t sbeGetCapabilities(uint8_t *i_pArg);
-
-#endif // __SBEFW_SBECMDGENERIC_H
diff --git a/sbe/sbefw/sbecmdmemaccess.H b/sbe/sbefw/sbecmdmemaccess.H
deleted file mode 100644
index 1b7dddc0..00000000
--- a/sbe/sbefw/sbecmdmemaccess.H
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * @file: ppe/sbe/sbefw/sbecmdmemaccess.H
- *
- * @brief This file contains the Interfaces for the Memory Access chip-ops
- *
- */
-
-#ifndef __SBEFW_SBECMDMEMACCESS_H
-#define __SBEFW_SBECMDMEMACCESS_H
-
-#include <stdint.h>
-
-/**
-  * @brief sbeGetMem : Implements SBE Get Memory ChipOp
-  *
-  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
-  *
-  * @return    Rc from the FIFO access utility
-  */
-uint32_t sbeGetMem (uint8_t *i_pArg);
-
-/**
-  * @brief sbePutMem : Implements SBE Put Memory ChipOp
-  *
-  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
-  *
-  * @return    Rc from the FIFO access utility
-  */
-uint32_t sbePutMem  (uint8_t *i_pArg);
-
-#endif /* __SBEFW_SBECMDMEMACCESS_H */
diff --git a/sbe/sbefw/sbecmdregaccess.H b/sbe/sbefw/sbecmdregaccess.H
deleted file mode 100644
index b297fc59..00000000
--- a/sbe/sbefw/sbecmdregaccess.H
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * @file: ppe/sbe/sbefw/sbecmdregaccess.H
- *
- * @brief This file contains the Interfaces for the SCOM Access chip-ops
- *
- */
-
-#ifndef __SBEFW_SBECMDREGACCESS_H
-#define __SBEFW_SBECMDREGACCESS_H
-
-#include <stdint.h>
-
-/**
-  * @brief sbeGetRegs : Get the reg data
-  *
-  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
-  *
-  * @return    Rc from the FIFO access utility
-  */
-uint32_t sbeGetReg(uint8_t *i_pArg);
-
-
-/**
-  * @brief sbePutRegs : Put the reg data
-  *
-  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
-  *
-  * @return    Rc from the FIFO access utility
-  */
-uint32_t sbePutReg(uint8_t *i_pArg);
-
-
-#endif /* __SBEFW_SBECMDREGACCESS_H */
diff --git a/sbe/sbefw/sbecmdsram.H b/sbe/sbefw/sbecmdsram.H
deleted file mode 100644
index 1dbc87e1..00000000
--- a/sbe/sbefw/sbecmdsram.H
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * @file: ppe/sbe/sbefw/sbecmdsram.H
- *
- * @brief This file contains the Interfaces for the Sram Access chip-ops
- *
- */
-
-#ifndef __SBEFW_SBECMDSRAM_H
-#define __SBEFW_SBECMDSRAM_H
-
-#include <stdint.h>
-
-static const uint8_t SBE_32BIT_ALIGN_FACTOR = 4;
-static const uint8_t SBE_64BIT_ALIGN_FACTOR = 8;
-
-static const uint64_t SBE_FWCTRLFLG3_FSP_ATTACHED = 0X1000000000000000;
-
-/*
- * @brief Granule size in Bytes for 'Get from Hwp'/'Put to Hwp'
- */
-static const uint32_t SBE_OCC_SRAM_GRANULE = 128;
-
-/**
-  * @brief sbeGetOccSram : Implements SBE Get Occ Sram ChipOp
-  *
-  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
-  *
-  * @return    Rc from the FIFO access utility
-  */
-uint32_t sbeGetOccSram (uint8_t *i_pArg);
-
-/**
-  * @brief sbePutOccSram : Implements SBE Put Occ Sram ChipOp
-  *
-  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
-  *
-  * @return    Rc from the FIFO access utility
-  */
-uint32_t sbePutOccSram  (uint8_t *i_pArg);
-
-#endif /* __SBEFW_SBECMDSRAM_H */
diff --git a/sbe/sbefw/sbeerrorcodes.H b/sbe/sbefw/sbeerrorcodes.H
deleted file mode 100644
index 29942806..00000000
--- a/sbe/sbefw/sbeerrorcodes.H
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * @file: ppe/sbe/sbefw/sbeerrorcodes.H
- *
- * @brief This file contains the SBE internal error status codes
- *
- */
-
-#ifndef __SBEFW_SBEERRORCODES_H
-#define __SBEFW_SBEERRORCODES_H
-
-#include <stdint.h>
-
-
-/**
- * @brief enums SBE internal error codes
- *
-*/
-enum sbeInternalResponseCodes
-{
-    SBE_FIFO_RESET_RECEIVED  = 0xFA00,
-    SBE_FIFO_RESET_HANDLING_FAILED = 0xFB00,
-    SBE_FUNC_NOT_SUPPORTED   = 0xFC00,
-};
-
-
-#endif // __SBEFW_SBEERRORCODES_H
-\ No newline at end of file
diff --git a/sbe/test/ffdc.xml b/sbe/test/ffdc.xml
deleted file mode 100755
index 6e2f36ff..00000000
--- a/sbe/test/ffdc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-      <!--Collect FFDC -->
-    <test>
-    <subtest>
-        <testcase>
-            <simcmd>sbe-trace 0</simcmd>
-        </testcase>
-        <testcase>
-            <simcmd>p9Proc0.sbe.ppe->ppe_state</simcmd>
-        </testcase>
-        <testcase>
-            <simcmd>p9Proc0.proc_fifo->upstream_hw_fifo</simcmd>
-        </testcase>
-        <testcase>
-            <simcmd>p9Proc0.proc_fifo->downstream_hw_fifo</simcmd>
-        </testcase>
-    </subtest>
-    </test>
diff --git a/sbe/test/testAduMem.xml b/sbe/test/testAduMem.xml
deleted file mode 100644
index dde43724..00000000
--- a/sbe/test/testAduMem.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testAduMem_ecc.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testAduMem_itag.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testAduMem_withEccItag.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testAduMem_noEccNoItag.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-
diff --git a/sbe/test/testCntlInstruction.xml b/sbe/test/testCntlInstruction.xml
deleted file mode 100755
index 1231ac86..00000000
--- a/sbe/test/testCntlInstruction.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testCntlInstruction.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-
diff --git a/sbe/test/testGeneric.xml b/sbe/test/testGeneric.xml
deleted file mode 100755
index 5073121c..00000000
--- a/sbe/test/testGeneric.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-      <!-- SBE Get Capabilities Test case -->
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testGetCapabilities.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
diff --git a/sbe/test/testIstepSuccess.py b/sbe/test/testIstepSuccess.py
deleted file mode 100755
index 8c42a504..00000000
--- a/sbe/test/testIstepSuccess.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import sys
-sys.path.append("targets/p9_nimbus/sbeTest" )
-import testUtil
-err = False
-#from testWrite import *
-
-TESTDATA = [0,0,0,3,
-            0,0,0xA1,0x01,
-            0,0x02,0x00,0x2]
-
-EXPDATA = [0xc0,0xde,0xa1,0x01,
-           0x0,0x0,0x0,0x0,
-           0x00,0x0,0x0,0x03];
-
-# MAIN Test Run Starts Here...
-#-------------------------------------------------
-def main( ):
-    testUtil.runCycles( 10000000 )
-    testUtil.writeUsFifo( TESTDATA )
-    testUtil.writeEot( )
-    testUtil.readDsFifo( EXPDATA )
-    testUtil.readEot( )
-#-------------------------------------------------
-# Calling all test code
-#-------------------------------------------------
-main()
-
-if err:
-    print ("\nTest Suite completed with error(s)")
-    #sys.exit(1)
-else:
-    print ("\nTest Suite completed with no errors")
-    #sys.exit(0);
-
diff --git a/sbe/test/testPutGetMem.xml b/sbe/test/testPutGetMem.xml
deleted file mode 100644
index d8939eb2..00000000
--- a/sbe/test/testPutGetMem.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testPutMem.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testGetMem_expdata.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-
diff --git a/sbe/test/testRegAccess.xml b/sbe/test/testRegAccess.xml
deleted file mode 100755
index 3a236345..00000000
--- a/sbe/test/testRegAccess.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testStopInstruction.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testPutGetRegGpr.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testPutGetRegFpr.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testPutGetRegSpr.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-      <testcase>
-          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testStartInstruction.py</simcmd>
-          <exitonerror>yes</exitonerror>
-      </testcase>
-
diff --git a/sbe/test/testSram.xml b/sbe/test/testSram.xml
deleted file mode 100755
index b44ddb6d..00000000
--- a/sbe/test/testSram.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-      <testcase>
-          <!-- TODO RTC - 150091 - Add the Occ sram test case -->
-          <!--<simcmd>run-python-file targets/p9_nimbus/sbeTest/testSram.py</simcmd>-->
-          <!--<exitonerror>yes</exitonerror>-->
-      </testcase>
-
diff --git a/sbe/test/testStartInstruction.py b/sbe/test/testStartInstruction.py
deleted file mode 100644
index c2f2c5da..00000000
--- a/sbe/test/testStartInstruction.py
+++ /dev/null
@@ -1,41 +0,0 @@
-import sys
-sys.path.append("targets/p9_nimbus/sbeTest" )
-import testUtil
-err = False
-#from testWrite import *
-
-LOOP_COUNT = 1
-
-
-# Start All thread in Core0 with warn flag true
-INST_START0_ALL_TESTDATA_WITH_WARN_FLG =      [0,0,0,0x03,
-                                              0,0,0xa7,0x01,
-                                              0,1,0x20,0xf0]
-
-INST_EXPDATA  =     [0xc0,0xde,0xa7,0x01,
-                     0x0,0x0,0x0,0x0,
-                     0x00,0x0,0x0,0x03]
-
-# MAIN Test Run Starts Here...
-#-------------------------------------------------
-def main( ):
-    testUtil.runCycles( 10000000 )
-
-    #stop all thread in core0
-    testUtil.writeUsFifo( INST_START0_ALL_TESTDATA_WITH_WARN_FLG )
-    testUtil.writeEot( )
-    testUtil.readDsFifo( INST_EXPDATA )
-    testUtil.readEot( )
-
-#-------------------------------------------------
-# Calling all test code
-#-------------------------------------------------
-main()
-
-if err:
-    print ("\nTest Suite completed with error(s)")
-    #sys.exit(1)
-else:
-    print ("\nTest Suite completed with no errors")
-    #sys.exit(0);
-
diff --git a/sbe/test/testStopInstruction.py b/sbe/test/testStopInstruction.py
deleted file mode 100644
index 414c35b4..00000000
--- a/sbe/test/testStopInstruction.py
+++ /dev/null
@@ -1,41 +0,0 @@
-import sys
-sys.path.append("targets/p9_nimbus/sbeTest" )
-import testUtil
-err = False
-#from testWrite import *
-
-LOOP_COUNT = 1
-
-
-# Stop All thread in Core0 with warn flag true
-INST_STOP0_ALL_TESTDATA_WITH_WARN_FLG =      [0,0,0,0x03,
-                                              0,0,0xa7,0x01,
-                                              0,1,0x20,0xf1]
-
-INST_EXPDATA  =     [0xc0,0xde,0xa7,0x01,
-                     0x0,0x0,0x0,0x0,
-                     0x00,0x0,0x0,0x03]
-
-# MAIN Test Run Starts Here...
-#-------------------------------------------------
-def main( ):
-    testUtil.runCycles( 10000000 )
-
-    #stop all thread in core0
-    testUtil.writeUsFifo( INST_STOP0_ALL_TESTDATA_WITH_WARN_FLG )
-    testUtil.writeEot( )
-    testUtil.readDsFifo( INST_EXPDATA )
-    testUtil.readEot( )
-
-#-------------------------------------------------
-# Calling all test code
-#-------------------------------------------------
-main()
-
-if err:
-    print ("\nTest Suite completed with error(s)")
-    #sys.exit(1)
-else:
-    print ("\nTest Suite completed with no errors")
-    #sys.exit(0);
-
diff --git a/sbe/.empty b/src/.empty
index e69de29b..e69de29b 100644
--- a/sbe/.empty
+++ b/src/.empty
diff --git a/sbe/boot/Makefile b/src/boot/Makefile
index c4753aa7..95e29143 100644
--- a/sbe/boot/Makefile
+++ b/src/boot/Makefile
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/boot/Makefile $
+# $Source: src/boot/Makefile $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/boot/bootfiles.mk b/src/boot/bootfiles.mk
index 3e524155..0836e59f 100644
--- a/sbe/boot/bootfiles.mk
+++ b/src/boot/bootfiles.mk
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/boot/bootfiles.mk $
+# $Source: src/boot/bootfiles.mk $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/boot/loader_l1.S b/src/boot/loader_l1.S
index d6fecf63..1699b239 100644
--- a/sbe/boot/loader_l1.S
+++ b/src/boot/loader_l1.S
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/boot/loader_l1.S $                                        */
+/* $Source: src/boot/loader_l1.S $                                        */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/boot/loader_l2.c b/src/boot/loader_l2.c
index b08a2278..4f575bea 100644
--- a/sbe/boot/loader_l2.c
+++ b/src/boot/loader_l2.c
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/boot/loader_l2.c $                                        */
+/* $Source: src/boot/loader_l2.c $                                        */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/boot/loader_l2_setup.S b/src/boot/loader_l2_setup.S
index 2bfc7474..99da6d5c 100644
--- a/sbe/boot/loader_l2_setup.S
+++ b/src/boot/loader_l2_setup.S
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/boot/loader_l2_setup.S $                                  */
+/* $Source: src/boot/loader_l2_setup.S $                                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/boot/otprom_init.S b/src/boot/otprom_init.S
index 8d7c9979..719e158a 100644
--- a/sbe/boot/otprom_init.S
+++ b/src/boot/otprom_init.S
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/boot/otprom_init.S $
+# $Source: src/boot/otprom_init.S $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/boot/pibmem_repair.S b/src/boot/pibmem_repair.S
index 6e8fab19..98b1ecfa 100644
--- a/sbe/boot/pibmem_repair.S
+++ b/src/boot/pibmem_repair.S
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/boot/pibmem_repair.S $                                    */
+/* $Source: src/boot/pibmem_repair.S $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/build/models/n10_e9027_tp026_soa_sc_u285_01/base b/src/build/models/n10_e9027_tp026_soa_sc_u285_01/base
index a5314f90..a5314f90 100644
--- a/sbe/build/models/n10_e9027_tp026_soa_sc_u285_01/base
+++ b/src/build/models/n10_e9027_tp026_soa_sc_u285_01/base
diff --git a/sbe/build/models/n10_e9030_tp029_soa_sc_u339_01/base b/src/build/models/n10_e9030_tp029_soa_sc_u339_01/base
index 06c64ab4..06c64ab4 100644
--- a/sbe/build/models/n10_e9030_tp029_soa_sc_u339_01/base
+++ b/src/build/models/n10_e9030_tp029_soa_sc_u339_01/base
diff --git a/sbe/build/models/n10_e9031_tp030_soa_sc_u008_01/base b/src/build/models/n10_e9031_tp030_soa_sc_u008_01/base
index 34f0793e..34f0793e 100644
--- a/sbe/build/models/n10_e9031_tp030_soa_sc_u008_01/base
+++ b/src/build/models/n10_e9031_tp030_soa_sc_u008_01/base
diff --git a/sbe/build/models/n10_e9031_tp030_soa_sc_u012_01/base b/src/build/models/n10_e9031_tp030_soa_sc_u012_01/base
index 34f0793e..34f0793e 100644
--- a/sbe/build/models/n10_e9031_tp030_soa_sc_u012_01/base
+++ b/src/build/models/n10_e9031_tp030_soa_sc_u012_01/base
diff --git a/sbe/build/models/n10_e9031_tp030_soa_sc_u022_01/base b/src/build/models/n10_e9031_tp030_soa_sc_u022_01/base
index 34f0793e..34f0793e 100644
--- a/sbe/build/models/n10_e9031_tp030_soa_sc_u022_01/base
+++ b/src/build/models/n10_e9031_tp030_soa_sc_u022_01/base
diff --git a/sbe/build/tools/CommitSbeImageToCMVC.py b/src/build/tools/CommitSbeImageToCMVC.py
index e667cd7f..b6f4eca8 100755
--- a/sbe/build/tools/CommitSbeImageToCMVC.py
+++ b/src/build/tools/CommitSbeImageToCMVC.py
@@ -1,4 +1,27 @@
 #!/usr/bin/python
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/tools/CommitSbeImageToCMVC.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 '''
 ###########################################################
 #    @file    CommitSbeImageToCMVC.py
diff --git a/sbe/build/tools/Debug/sbe-debug.py b/src/build/tools/Debug/sbe-debug.py
index 75ea689c..a6c20c47 100755
--- a/sbe/build/tools/Debug/sbe-debug.py
+++ b/src/build/tools/Debug/sbe-debug.py
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/tools/Debug/sbe-debug.py $
+# $Source: src/build/tools/Debug/sbe-debug.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/README b/src/build/tools/README
index 3f27a6b0..3f27a6b0 100644
--- a/sbe/build/tools/README
+++ b/src/build/tools/README
diff --git a/sbe/build/tools/conv_rel_branch.pl b/src/build/tools/conv_rel_branch.pl
index e9406e29..05ef52ea 100755
--- a/sbe/build/tools/conv_rel_branch.pl
+++ b/src/build/tools/conv_rel_branch.pl
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/tools/conv_rel_branch.pl $
+# $Source: src/build/tools/conv_rel_branch.pl $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/gitRelease.pm b/src/build/tools/gitRelease.pm
index 6af4d708..e6a52e87 100755
--- a/sbe/build/tools/gitRelease.pm
+++ b/src/build/tools/gitRelease.pm
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/tools/gitRelease.pm $
+# $Source: src/build/tools/gitRelease.pm $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/perl.modules/gitUtil.pm b/src/build/tools/perl.modules/gitUtil.pm
index 603868df..561c15cd 100644
--- a/sbe/build/tools/perl.modules/gitUtil.pm
+++ b/src/build/tools/perl.modules/gitUtil.pm
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/tools/perl.modules/gitUtil.pm $
+# $Source: src/build/tools/perl.modules/gitUtil.pm $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/sandbox-create b/src/build/tools/sandbox-create
index f52397d5..2f634358 100755
--- a/sbe/build/tools/sandbox-create
+++ b/src/build/tools/sandbox-create
@@ -1,4 +1,27 @@
 #!/bin/bash
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/tools/sandbox-create $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 
 echo " Creating ODE sandbox..."
 
diff --git a/sbe/build/tools/sbeCmvcConstants.py b/src/build/tools/sbeCmvcConstants.py
index a281c251..65a2d8a3 100755
--- a/sbe/build/tools/sbeCmvcConstants.py
+++ b/src/build/tools/sbeCmvcConstants.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/tools/sbeCmvcConstants.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 '''
 ###########################################################
 #    @file    sbeCmvcConstants.py
diff --git a/sbe/build/tools/sbeCmvcUtility.py b/src/build/tools/sbeCmvcUtility.py
index 4df59338..793029af 100755
--- a/sbe/build/tools/sbeCmvcUtility.py
+++ b/src/build/tools/sbeCmvcUtility.py
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/tools/sbeCmvcUtility.py $
+# $Source: src/build/tools/sbeCmvcUtility.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/sbeGitTool.pl b/src/build/tools/sbeGitTool.pl
index f0acd0c0..4bb70348 100755
--- a/sbe/build/tools/sbeGitTool.pl
+++ b/src/build/tools/sbeGitTool.pl
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/tools/sbeGitTool.pl $
+# $Source: src/build/tools/sbeGitTool.pl $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/sbePatchUtility.py b/src/build/tools/sbePatchUtility.py
index 1ae1bb63..b5103610 100644
--- a/sbe/build/tools/sbePatchUtility.py
+++ b/src/build/tools/sbePatchUtility.py
@@ -1,4 +1,27 @@
 #!/usr/bin/python
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/tools/sbePatchUtility.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 '''
 ###########################################################
 #    @file  sbeCmvcUtility.py
@@ -102,7 +125,7 @@ def utilExecuteShell(i_ppe_root, i_sandbox_path, i_shell_file):
         sb_name=os.path.basename(i_sandbox_path)
 
     # Find the file and execute
-    l_path_name = i_ppe_root + '/sbe/build/'
+    l_path_name = i_ppe_root + '/src/build/'
     l_shell_path=utilcode.utilFindFile(i_shell_file, l_path_name)
     print "  [ %s ]"%l_shell_path
 
diff --git a/sbe/build/tools/sbePrime.py b/src/build/tools/sbePrime.py
index 021bad74..479ee051 100755
--- a/sbe/build/tools/sbePrime.py
+++ b/src/build/tools/sbePrime.py
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/tools/sbePrime.py $
+# $Source: src/build/tools/sbePrime.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/hwpf/include/buffer_traits.H b/src/hwpf/include/buffer_traits.H
index 6a6219a6..1b299fd6 100644
--- a/sbe/hwpf/include/buffer_traits.H
+++ b/src/hwpf/include/buffer_traits.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/buffer_traits.H $                            */
+/* $Source: src/hwpf/include/buffer_traits.H $                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/error_info.H b/src/hwpf/include/error_info.H
index 5ef16d59..cc0ae9a2 100644
--- a/sbe/hwpf/include/error_info.H
+++ b/src/hwpf/include/error_info.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/error_info.H $                               */
+/* $Source: src/hwpf/include/error_info.H $                               */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/error_info_defs.H b/src/hwpf/include/error_info_defs.H
index 04d17dd8..0f425b1f 100644
--- a/sbe/hwpf/include/error_info_defs.H
+++ b/src/hwpf/include/error_info_defs.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/error_info_defs.H $                          */
+/* $Source: src/hwpf/include/error_info_defs.H $                          */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/fapi2.H b/src/hwpf/include/fapi2.H
index 31b77509..136c69e2 100644
--- a/sbe/hwpf/include/fapi2.H
+++ b/src/hwpf/include/fapi2.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/fapi2.H $                                    */
+/* $Source: src/hwpf/include/fapi2.H $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/fapi2AttributeService.H b/src/hwpf/include/fapi2AttributeService.H
index 8140ba78..1f8eca5a 100644
--- a/sbe/hwpf/include/fapi2AttributeService.H
+++ b/src/hwpf/include/fapi2AttributeService.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/fapi2AttributeService.H $                    */
+/* $Source: src/hwpf/include/fapi2AttributeService.H $                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/fapi2Structs.H b/src/hwpf/include/fapi2Structs.H
index e56c4cfa..75584f2b 100644
--- a/sbe/hwpf/include/fapi2Structs.H
+++ b/src/hwpf/include/fapi2Structs.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/fapi2Structs.H $                             */
+/* $Source: src/hwpf/include/fapi2Structs.H $                             */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/fapi2_hw_access.H b/src/hwpf/include/fapi2_hw_access.H
index 2a5c2889..f4af3515 100644
--- a/sbe/hwpf/include/fapi2_hw_access.H
+++ b/src/hwpf/include/fapi2_hw_access.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/fapi2_hw_access.H $                          */
+/* $Source: src/hwpf/include/fapi2_hw_access.H $                          */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2012,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/hwpf/include/fapi2_target.H b/src/hwpf/include/fapi2_target.H
index e8cbf759..6c031b7c 100644
--- a/sbe/hwpf/include/fapi2_target.H
+++ b/src/hwpf/include/fapi2_target.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/fapi2_target.H $                             */
+/* $Source: src/hwpf/include/fapi2_target.H $                             */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/ffdc.H b/src/hwpf/include/ffdc.H
index d8e49a5c..47a977e7 100644
--- a/sbe/hwpf/include/ffdc.H
+++ b/src/hwpf/include/ffdc.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/ffdc.H $                                     */
+/* $Source: src/hwpf/include/ffdc.H $                                     */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/hw_access.H b/src/hwpf/include/hw_access.H
index 0f9f3dfb..53ad6b14 100644
--- a/sbe/hwpf/include/hw_access.H
+++ b/src/hwpf/include/hw_access.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/hw_access.H $                                */
+/* $Source: src/hwpf/include/hw_access.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2012,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/hwpf/include/hwp_ffdc_classes.H b/src/hwpf/include/hwp_ffdc_classes.H
index a44a292d..90a3f9ce 100644
--- a/sbe/hwpf/include/hwp_ffdc_classes.H
+++ b/src/hwpf/include/hwp_ffdc_classes.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/hwp_ffdc_classes.H $                         */
+/* $Source: src/hwpf/include/hwp_ffdc_classes.H $                         */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/plat/hwp_executor.H b/src/hwpf/include/plat/hwp_executor.H
index 12f3fa08..ae7b5823 100644
--- a/sbe/hwpf/include/plat/hwp_executor.H
+++ b/src/hwpf/include/plat/hwp_executor.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/hwp_executor.H $                        */
+/* $Source: src/hwpf/include/plat/hwp_executor.H $                        */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/plat/multicast.H b/src/hwpf/include/plat/multicast.H
index 664a2222..46d64be8 100644
--- a/sbe/hwpf/include/plat/multicast.H
+++ b/src/hwpf/include/plat/multicast.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/multicast.H $                           */
+/* $Source: src/hwpf/include/plat/multicast.H $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/plat/plat_attributes.H b/src/hwpf/include/plat/plat_attributes.H
index 1153e5dd..6aec47e3 100644
--- a/sbe/hwpf/include/plat/plat_attributes.H
+++ b/src/hwpf/include/plat/plat_attributes.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/plat_attributes.H $                     */
+/* $Source: src/hwpf/include/plat/plat_attributes.H $                     */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/plat/plat_error_scope.H b/src/hwpf/include/plat/plat_error_scope.H
index b6ac62e4..505ec6cb 100644
--- a/sbe/hwpf/include/plat/plat_error_scope.H
+++ b/src/hwpf/include/plat/plat_error_scope.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: $                                                             */
+/* $Source: src/hwpf/include/plat/plat_error_scope.H $                    */
 /*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
+/* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/hwpf/include/plat/plat_hw_access.H b/src/hwpf/include/plat/plat_hw_access.H
index b0f95fe2..89c02f2a 100644
--- a/sbe/hwpf/include/plat/plat_hw_access.H
+++ b/src/hwpf/include/plat/plat_hw_access.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/plat_hw_access.H $                      */
+/* $Source: src/hwpf/include/plat/plat_hw_access.H $                      */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/hwpf/include/plat/plat_includes.H b/src/hwpf/include/plat/plat_includes.H
index cda58a31..62f8a9b0 100644
--- a/sbe/hwpf/include/plat/plat_includes.H
+++ b/src/hwpf/include/plat/plat_includes.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/plat_includes.H $                       */
+/* $Source: src/hwpf/include/plat/plat_includes.H $                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/plat/plat_ring_traverse.H b/src/hwpf/include/plat/plat_ring_traverse.H
index 63c3d54c..5fc470e2 100644
--- a/sbe/hwpf/include/plat/plat_ring_traverse.H
+++ b/src/hwpf/include/plat/plat_ring_traverse.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/plat_ring_traverse.H $                  */
+/* $Source: src/hwpf/include/plat/plat_ring_traverse.H $                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/hwpf/include/plat/plat_target.H b/src/hwpf/include/plat/plat_target.H
index f786b22c..a4eca5a8 100644
--- a/sbe/hwpf/include/plat/plat_target.H
+++ b/src/hwpf/include/plat/plat_target.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/plat_target.H $                         */
+/* $Source: src/hwpf/include/plat/plat_target.H $                         */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/plat/plat_target_definitions.H b/src/hwpf/include/plat/plat_target_definitions.H
index 1ed4dfe5..daa9d228 100644
--- a/sbe/hwpf/include/plat/plat_target_definitions.H
+++ b/src/hwpf/include/plat/plat_target_definitions.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/plat_target_definitions.H $             */
+/* $Source: src/hwpf/include/plat/plat_target_definitions.H $             */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/plat/plat_target_filter.H b/src/hwpf/include/plat/plat_target_filter.H
index 44886997..aec258ab 100644
--- a/sbe/hwpf/include/plat/plat_target_filter.H
+++ b/src/hwpf/include/plat/plat_target_filter.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/plat_target_filter.H $                  */
+/* $Source: src/hwpf/include/plat/plat_target_filter.H $                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/plat/plat_target_parms.H b/src/hwpf/include/plat/plat_target_parms.H
index 10556be2..17103a78 100644
--- a/sbe/hwpf/include/plat/plat_target_parms.H
+++ b/src/hwpf/include/plat/plat_target_parms.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/plat_target_parms.H $                   */
+/* $Source: src/hwpf/include/plat/plat_target_parms.H $                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/plat/plat_target_utils.H b/src/hwpf/include/plat/plat_target_utils.H
index 51daa1f6..c6ec5f37 100644
--- a/sbe/hwpf/include/plat/plat_target_utils.H
+++ b/src/hwpf/include/plat/plat_target_utils.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/plat_target_utils.H $                   */
+/* $Source: src/hwpf/include/plat/plat_target_utils.H $                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/plat/plat_trace.H b/src/hwpf/include/plat/plat_trace.H
index e892498e..e4a2463f 100644
--- a/sbe/hwpf/include/plat/plat_trace.H
+++ b/src/hwpf/include/plat/plat_trace.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/plat_trace.H $                          */
+/* $Source: src/hwpf/include/plat/plat_trace.H $                          */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/plat/target.H b/src/hwpf/include/plat/target.H
index 9b8866b2..01250260 100644
--- a/sbe/hwpf/include/plat/target.H
+++ b/src/hwpf/include/plat/target.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/plat/target.H $                              */
+/* $Source: src/hwpf/include/plat/target.H $                              */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/return_code.H b/src/hwpf/include/return_code.H
index 03f3266f..385dd676 100644
--- a/sbe/hwpf/include/return_code.H
+++ b/src/hwpf/include/return_code.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/return_code.H $                              */
+/* $Source: src/hwpf/include/return_code.H $                              */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/set_sbe_error.H b/src/hwpf/include/set_sbe_error.H
index bf69b294..ed817cdf 100644
--- a/sbe/hwpf/include/set_sbe_error.H
+++ b/src/hwpf/include/set_sbe_error.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/set_sbe_error.H $                            */
+/* $Source: src/hwpf/include/set_sbe_error.H $                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/utils.H b/src/hwpf/include/utils.H
index 1083f6b3..71de13ad 100644
--- a/sbe/hwpf/include/utils.H
+++ b/src/hwpf/include/utils.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/utils.H $                                    */
+/* $Source: src/hwpf/include/utils.H $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/include/vector.H b/src/hwpf/include/vector.H
index ce121cb7..7dd03d79 100644
--- a/sbe/hwpf/include/vector.H
+++ b/src/hwpf/include/vector.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/include/vector.H $                                   */
+/* $Source: src/hwpf/include/vector.H $                                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/src/Makefile b/src/hwpf/src/Makefile
index 4ee92f4f..950c0ccc 100644
--- a/sbe/hwpf/src/Makefile
+++ b/src/hwpf/src/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/hwpf/src/Makefile $
+# $Source: src/hwpf/src/Makefile $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/hwpf/src/fapi2sbefiles.mk b/src/hwpf/src/fapi2sbefiles.mk
index edbceab0..b9c42fad 100644
--- a/sbe/hwpf/src/fapi2sbefiles.mk
+++ b/src/hwpf/src/fapi2sbefiles.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/hwpf/src/fapi2sbefiles.mk $
+# $Source: src/hwpf/src/fapi2sbefiles.mk $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/hwpf/src/ffdc.C b/src/hwpf/src/ffdc.C
index 8843b7bd..806082d5 100644
--- a/sbe/hwpf/src/ffdc.C
+++ b/src/hwpf/src/ffdc.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/src/ffdc.C $                                         */
+/* $Source: src/hwpf/src/ffdc.C $                                         */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/hwpf/src/plat/Makefile b/src/hwpf/src/plat/Makefile
index 8bf9c50c..a6588194 100644
--- a/sbe/hwpf/src/plat/Makefile
+++ b/src/hwpf/src/plat/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/hwpf/src/plat/Makefile $
+# $Source: src/hwpf/src/plat/Makefile $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/hwpf/src/plat/fapi2sbeplatfiles.mk b/src/hwpf/src/plat/fapi2sbeplatfiles.mk
index 80e8d811..e555635b 100644
--- a/sbe/hwpf/src/plat/fapi2sbeplatfiles.mk
+++ b/src/hwpf/src/plat/fapi2sbeplatfiles.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/hwpf/src/plat/fapi2sbeplatfiles.mk $
+# $Source: src/hwpf/src/plat/fapi2sbeplatfiles.mk $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/hwpf/src/plat/plat_hw_access.C b/src/hwpf/src/plat/plat_hw_access.C
index 0b7d2ad4..5c2af1a8 100644
--- a/sbe/hwpf/src/plat/plat_hw_access.C
+++ b/src/hwpf/src/plat/plat_hw_access.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/src/plat/plat_hw_access.C $                          */
+/* $Source: src/hwpf/src/plat/plat_hw_access.C $                          */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/hwpf/src/plat/plat_utils.C b/src/hwpf/src/plat/plat_utils.C
index fd7e75d1..44cce502 100644
--- a/sbe/hwpf/src/plat/plat_utils.C
+++ b/src/hwpf/src/plat/plat_utils.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/src/plat/plat_utils.C $                              */
+/* $Source: src/hwpf/src/plat/plat_utils.C $                              */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/src/plat/target.C b/src/hwpf/src/plat/target.C
index 501952b3..7d7e4e0e 100644
--- a/sbe/hwpf/src/plat/target.C
+++ b/src/hwpf/src/plat/target.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/src/plat/target.C $                                  */
+/* $Source: src/hwpf/src/plat/target.C $                                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/hwpf/src/plat_ring_traverse.C b/src/hwpf/src/plat_ring_traverse.C
index 17577f5c..b7bdb73c 100644
--- a/sbe/hwpf/src/plat_ring_traverse.C
+++ b/src/hwpf/src/plat_ring_traverse.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/hwpf/src/plat_ring_traverse.C $                           */
+/* $Source: src/hwpf/src/plat_ring_traverse.C $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/hwpf/src/return_code.C b/src/hwpf/src/return_code.C
index 3dbd7052..77ca80c8 100644
--- a/sbe/hwpf/src/return_code.C
+++ b/src/hwpf/src/return_code.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: $                                                             */
+/* $Source: src/hwpf/src/return_code.C $                                  */
 /*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
+/* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/image/Makefile b/src/image/Makefile
index d0588948..7de0cfbc 100644
--- a/sbe/image/Makefile
+++ b/src/image/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/image/Makefile $
+# $Source: src/image/Makefile $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -124,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_ROOT_DIR)/sbe/sbefw/plugins/sbeUserDataParser.C
-SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_ROOT_DIR)/sbe/sbefw/sbeFFDCType.H
+SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_FW_DIR)/plugins/sbeUserDataParser.C
+SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_FW_DIR)/sbeFFDCType.H
 
 SBE_TOOLS := $(BASE_OBJDIR)/sbe_default_tool
 
@@ -225,7 +224,7 @@ ATTRFILES += $(IMPORT_XML_DIR)/attribute_info/pervasive_attributes.xml
 # TODO via RTC 142708
 # Workaound for ATTR_CHIP_UNIT_POS. Remove Mirror_WA_attributes.xml once fapi
 # support is in.
-ATTRFILES += $(IMPORT_XML_DIR)/../../../../../sbe/image/Mirror_WA_attributes.xml
+ATTRFILES += $(IMAGE_SRCDIR)/Mirror_WA_attributes.xml
 ATTRFILES += $(IMPORT_XML_DIR)/attribute_info/p9_sbe_load_bootloader_attributes.xml
 ATTRFILES += $(IMPORT_XML_DIR)/attribute_info/core_attributes.xml
 ATTRFILES += $(IMPORT_XML_DIR)/attribute_info/nest_attributes.xml
diff --git a/src/image/Mirror_WA_attributes.xml b/src/image/Mirror_WA_attributes.xml
new file mode 100644
index 00000000..6552eb27
--- /dev/null
+++ b/src/image/Mirror_WA_attributes.xml
@@ -0,0 +1,34 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/image/Mirror_WA_attributes.xml $                          -->
+<!--                                                                        -->
+<!-- OpenPOWER sbe Project                                                  -->
+<!--                                                                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!--                                                                        -->
+<!--                                                                        -->
+<!-- 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                                                     -->
+<!-- $Id: proc_pll_ring_attributes.xml,v 1.17 2014/11/13 20:14:02 szhong Exp $ -->
+<!-- proc_pll_ring_attributes.xml -->
+<attributes>
+  <attribute>
+    <id>ATTR_CHIP_UNIT_POS</id>
+    <targetType>TARGET_TYPE_PERV</targetType>
+    <description></description>
+    <valueType>uint8</valueType>
+  </attribute>
+  <!-- ********************************************************************* -->
+</attributes>
diff --git a/sbe/image/base_ppe_header.S b/src/image/base_ppe_header.S
index 5e106504..cf8e7c58 100644
--- a/sbe/image/base_ppe_header.S
+++ b/src/image/base_ppe_header.S
@@ -1,3 +1,26 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/image/base_ppe_header.S $                                 */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
 //-----------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2014
 // *! All Rights Reserved -- Property of IBM
diff --git a/src/image/base_sbe_fixed.S b/src/image/base_sbe_fixed.S
new file mode 100644
index 00000000..bcfc0e1e
--- /dev/null
+++ b/src/image/base_sbe_fixed.S
@@ -0,0 +1,67 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/image/base_sbe_fixed.S $                                  */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+/// \file sbefixed.S
+/// \brief code to generated fixed section in pibmem image
+///
+#include "p9_xip_image.h"
+#include "proc_sbe_fixed.H"
+
+
+	.macro	..checku, x:req, bits:req, err="Unsigned value too large"
+
+	.if	(((\bits) <= 0) || ((\bits) > 63))
+	.error	"The number of bits must be in the range 0 < bits < 64"
+	.endif
+
+	.iflt	(\x)
+	.error  "An unsigned value is required here"
+        .endif
+
+	.ifgt	((\x) - (0xffffffffffffffff >> (64 - (\bits))))
+	.error	"\err"
+	.endif
+
+	.endm
+
+
+    .macro  ..check_u16, u16
+	..checku (\u16), 16, "Unsigned immediate is larger than 16 bits"
+    .endm
+
+
+    .macro  ..set_default_space, s
+	..check_u16 (\s)
+    .set    _PGAS_DEFAULT_SPACE, (\s)
+    .endm
+
+    .section .fixed, "a", @progbits
+
+
+    // Create the .fixed section
+    .proc_sbe_fixed_system
+    .proc_sbe_fixed_proc_chip
+    .proc_sbe_fixed_perv
+    .proc_sbe_fixed_core
+    .proc_sbe_fixed_ex
+    .proc_sbe_fixed_eq
diff --git a/src/image/buildInfo.py b/src/image/buildInfo.py
new file mode 100755
index 00000000..a881cb88
--- /dev/null
+++ b/src/image/buildInfo.py
@@ -0,0 +1,48 @@
+#! /usr/bin/python
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/image/buildInfo.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+
+# This script will create header file sbe_build_info.H which will have
+# buld information required by SBE code.
+import os
+buildInfoFileName = "sbe_build_info.H"
+
+def buildInfo():
+    header = \
+"#ifndef SBE_BUILD_INFO_H  \n\
+#define SBE_BUILD_INFO_H  \n\n"
+
+    footer = "\n#endif  // SBE_BUILD_INFO_H"
+    commitId = "0x" + os.popen("git rev-parse --short=8 HEAD").read().rstrip()
+
+    f = open( buildInfoFileName, 'w')
+
+    f.write(header)
+    f.write("//Define SBE Commit ID \n")
+    f.write("#define SBE_COMMIT_ID " + commitId + "\n")
+    f.write(footer)
+    f.close()
+
+# Call buildInfo
+buildInfo()
diff --git a/sbe/image/img_defs.mk b/src/image/img_defs.mk
index 1551f566..ea12c1bf 100644
--- a/sbe/image/img_defs.mk
+++ b/src/image/img_defs.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/image/img_defs.mk $
+# $Source: src/image/img_defs.mk $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -72,7 +71,7 @@ export SBE_ROOT_DIR = $(abspath ../..)
 endif
 
 ifndef SBE_SRC_DIR
-export SBE_SRC_DIR = $(SBE_ROOT_DIR)/sbe
+export SBE_SRC_DIR = $(SBE_ROOT_DIR)/src
 endif
 
 ifndef SBE_FW_DIR
diff --git a/sbe/image/linkloader.cmd b/src/image/linkloader.cmd
index 66cad93e..5e08a692 100755
--- a/sbe/image/linkloader.cmd
+++ b/src/image/linkloader.cmd
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/image/linkloader.cmd $                                    */
+/* $Source: src/image/linkloader.cmd $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/image/linkotprom.cmd b/src/image/linkotprom.cmd
index 2eb6d391..8da70f49 100644
--- a/sbe/image/linkotprom.cmd
+++ b/src/image/linkotprom.cmd
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/image/linkotprom.cmd $                                    */
+/* $Source: src/image/linkotprom.cmd $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/image/linksbe.cmd b/src/image/linksbe.cmd
index d37f6086..67303295 100644
--- a/sbe/image/linksbe.cmd
+++ b/src/image/linksbe.cmd
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/image/linksbe.cmd $                                       */
+/* $Source: src/image/linksbe.cmd $                                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/image/linkseeprom.cmd b/src/image/linkseeprom.cmd
index 49bb69ce..64cb6f77 100644
--- a/sbe/image/linkseeprom.cmd
+++ b/src/image/linkseeprom.cmd
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/image/linkseeprom.cmd $                                   */
+/* $Source: src/image/linkseeprom.cmd $                                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/image/p9_sbe.H b/src/image/p9_sbe.H
new file mode 100644
index 00000000..0f5a402b
--- /dev/null
+++ b/src/image/p9_sbe.H
@@ -0,0 +1,52 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/image/p9_sbe.H $                                          */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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 __P9_SBE_H
+#define __P9_SBE_H
+
+/// \file p9_sbe.H
+/// \brief A header to be included into all SBE assembler files and C++
+/// hardware procedures that interact with SBE images.
+///
+/// This header #include-s all generally useful headers required for SBE code
+/// development as well as defining other needed facilities.  Note that any
+/// sub-includes must be done in an assembler-safe way.
+
+#include "sbe_common.H"
+//#include "p9_scom_addresses.H"
+//#include "p9_istep_num.H"
+
+// The #include of fapiHwpReturnCodes.H must be made here (instead of in
+// sbe_common.H) to guarantee that the P9-local copy is used.
+//#include "fapiHwpReturnCodes.H"
+
+#ifdef __ASSEMBLER__
+
+        // p9_sbe.H 'recursively' inserts itself into any hook code extracted
+        // from an assembly context that includes p9_sbe.H.
+
+	##`#include "p9_sbe.H"
+
+#endif  // __ASSEMBLER__
+
+#endif  // __P9_SBE_H
diff --git a/sbe/image/parsAndCutElf.py b/src/image/parsAndCutElf.py
index 2c514f13..d550b517 100755
--- a/sbe/image/parsAndCutElf.py
+++ b/src/image/parsAndCutElf.py
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/image/parsAndCutElf.py $
+# $Source: src/image/parsAndCutElf.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/image/proc_sbe_fixed.H b/src/image/proc_sbe_fixed.H
index 16701f74..500e9b3b 100644
--- a/sbe/image/proc_sbe_fixed.H
+++ b/src/image/proc_sbe_fixed.H
@@ -1,3 +1,26 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/image/proc_sbe_fixed.H $                                  */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
 //-----------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2014
 // *! All Rights Reserved -- Property of IBM
diff --git a/sbe/image/sbe_common.H b/src/image/sbe_common.H
index c9745afb..c9061354 100644
--- a/sbe/image/sbe_common.H
+++ b/src/image/sbe_common.H
@@ -1,3 +1,26 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/image/sbe_common.H $                                      */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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 __SBE_COMMON_H
 #define __SBE_COMMON_H
 
diff --git a/sbe/image/sbe_link.H b/src/image/sbe_link.H
index f6eac1e7..6efcc753 100644
--- a/sbe/image/sbe_link.H
+++ b/src/image/sbe_link.H
@@ -1,3 +1,26 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/image/sbe_link.H $                                        */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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 __SBE_LINK_H
 #define __SBE_LINK_H
 
diff --git a/sbe/image/topfiles.mk b/src/image/topfiles.mk
index 9da6d34d..1f04d000 100644
--- a/sbe/image/topfiles.mk
+++ b/src/image/topfiles.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/image/topfiles.mk $
+# $Source: src/image/topfiles.mk $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/sample/Makefile b/src/sample/Makefile
index f986ce8b..4d02b37e 100644
--- a/sbe/sample/Makefile
+++ b/src/sample/Makefile
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/sample/Makefile $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 #remove this once we have a real compiler
 export P2P_ENABLE = 1
 
diff --git a/sbe/sample/img_defs.mk b/src/sample/img_defs.mk
index 0a83aa9c..8b4685cc 100644
--- a/sbe/sample/img_defs.mk
+++ b/src/sample/img_defs.mk
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/sample/img_defs.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 #  Make header for GPE PK builds
 #
 # The application may define the following variables to control the
diff --git a/src/sample/link.cmd b/src/sample/link.cmd
new file mode 100644
index 00000000..1037564b
--- /dev/null
+++ b/src/sample/link.cmd
@@ -0,0 +1,91 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sample/link.cmd $                                         */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+
+// Need to do this so that elf32-powerpc is not modified!
+#undef powerpc
+
+#ifndef INITIAL_STACK_SIZE
+#define INITIAL_STACK_SIZE 256
+#endif
+
+OUTPUT_FORMAT(elf32-powerpc);
+
+MEMORY
+{
+ sram : ORIGIN = 0xFFF40000, LENGTH = 0xc0000
+}
+
+SECTIONS
+{
+    . = 0xfff40000;
+    .text          : {. = ALIGN(512); *(.vectors) *(.text)} > sram
+
+    ////////////////////////////////
+    // Read-only Data
+    ////////////////////////////////
+
+    . = ALIGN(8);
+    _RODATA_SECTION_BASE = .;
+
+    // SDA2 constant sections .sdata2 and .sbss2 must be adjacent to each
+    // other.  Our SDATA sections are small so we'll use strictly positive
+    // offsets. 
+
+    _SDA2_BASE_ = .;
+   .sdata2 . : { *(.sdata2) } > sram
+   .sbss2  . : { *(.sbss2) } > sram
+
+   // Other read-only data.  
+
+   .rodata . : { *(.rodata*) *(.got2) } > sram
+
+    _RODATA_SECTION_SIZE = . - _RODATA_SECTION_BASE;
+
+    ////////////////////////////////
+    // Read-write Data
+    ////////////////////////////////
+
+    . = ALIGN(8);
+    _DATA_SECTION_BASE = .;
+
+    // SDA sections .sdata and .sbss must be adjacent to each
+    // other.  Our SDATA sections are small so we'll use strictly positive
+    // offsets. 
+
+    _SDA_BASE_ = .;
+    .sdata  . : { *(.sdata)  } > sram
+    .sbss   . : { *(.sbss)   } > sram
+
+    // Other read-write data
+    // It's not clear why boot.S is generating empty .glink,.iplt
+
+   .rela   . : { *(.rela*) } > sram
+   .rwdata . : { *(.data) *(.bss) } > sram
+//  .iplt . : { *(.iplt) } > sram
+
+   _PK_INITIAL_STACK_LIMIT = .;
+   . = . + INITIAL_STACK_SIZE;
+   _PK_INITIAL_STACK = . - 1;
+
+}
diff --git a/sbe/sample/pk_scom.c b/src/sample/pk_scom.c
index 2716b8d5..5b200566 100644
--- a/sbe/sample/pk_scom.c
+++ b/src/sample/pk_scom.c
@@ -1,3 +1,26 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sample/pk_scom.c $                                        */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
 //-----------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2014
 // *! All Rights Reserved -- Property of IBM
diff --git a/src/sample/pk_scom.h b/src/sample/pk_scom.h
new file mode 100644
index 00000000..3d02e15e
--- /dev/null
+++ b/src/sample/pk_scom.h
@@ -0,0 +1,66 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sample/pk_scom.h $                                        */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+//-----------------------------------------------------------------------------
+// *! (C) Copyright International Business Machines Corp. 2014
+// *! All Rights Reserved -- Property of IBM
+// *! *** IBM Confidential ***
+//-----------------------------------------------------------------------------
+
+/// \file sample_main.c
+/// \brief Sample program that creates and starts a thread
+///
+/// This file demonstrates how to create a thread and run it.  It also provides
+/// an example of how to add traces to the code.
+
+#ifndef __PK_SCOM_H__
+#define __PK_SCOM_H__
+
+/// SCOM operations return non-zero error codes that may or may not indicate
+/// an actual error, depending on which SCOM is begin accessed.  This error
+/// code is returned as the value of get/putscom().  The error code value
+/// increases with teh severity of the error.
+#define CFAM_FSI_STATUS_0x00001007  0x00001007
+typedef union cfam_fsi_status_reg {
+  uint64_t value;
+  struct  {
+    uint64_t ignore_fields1   : 17  ;
+    uint64_t pib_error_code   : 3   ;
+    uint64_t igore_fields2    : 44  ;
+  }  fields;
+}  cfam_fsi_status_reg_t;
+
+#define PCB_ERROR_NONE              0
+#define PCB_ERROR_RESOURCE_OCCUPIED 1
+#define PCB_ERROR_CHIPLET_OFFLINE   2
+#define PCB_ERROR_PARTIAL_GOOD      3
+#define PCB_ERROR_ADDRESS_ERROR     4
+#define PCB_ERROR_CLOCK_ERROR       5
+#define PCB_ERROR_PACKET_ERROR      6
+#define PCB_ERROR_TIMEOUT           7
+
+uint32_t putscom( uint32_t i_chiplet, uint32_t i_address, uint64_t i_data);
+
+uint32_t getscom( uint32_t i_chiplet, uint32_t i_address, uint64_t *o_data);
+
+#endif  // __PK_SCOM_H__
diff --git a/src/sample/pk_trace_wrap.c b/src/sample/pk_trace_wrap.c
new file mode 100644
index 00000000..e9118e2d
--- /dev/null
+++ b/src/sample/pk_trace_wrap.c
@@ -0,0 +1,32 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sample/pk_trace_wrap.c $                                  */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+#include "pk_trace_wrap.h"
+#include "pk.h"
+#include "pk_trace.h"
+
+
+void pk_trace_wrap(const char* str)
+{
+    PK_TRACE("testsetest");
+}
diff --git a/src/sample/pk_trace_wrap.h b/src/sample/pk_trace_wrap.h
new file mode 100644
index 00000000..072d91c8
--- /dev/null
+++ b/src/sample/pk_trace_wrap.h
@@ -0,0 +1,30 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sample/pk_trace_wrap.h $                                  */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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 __PK_WRAP_WRAP_H__
+#define __PK_WRAP_WRAP__H__
+
+
+void pk_trace_wrap(const char*);
+
+#endif  // __PK_WRAP_WRAP_H__
diff --git a/sbe/sample/sample_main.C b/src/sample/sample_main.C
index fae10355..a2d460f4 100644
--- a/sbe/sample/sample_main.C
+++ b/src/sample/sample_main.C
@@ -1,3 +1,26 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sample/sample_main.C $                                    */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
 //-----------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2014
 // *! All Rights Reserved -- Property of IBM
diff --git a/src/sample/topfiles.mk b/src/sample/topfiles.mk
new file mode 100644
index 00000000..8918a95c
--- /dev/null
+++ b/src/sample/topfiles.mk
@@ -0,0 +1,29 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/sample/topfiles.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+TOP-C-SOURCES = pk_trace_wrap.c pk_scom.c
+TOP-CPP-SOURCES = sample_main.C
+TOP-S-SOURCES =
+
+
+TOP_OBJECTS = $(TOP-C-SOURCES:.c=.o) $(TOP-CPP-SOURCES:.C=.o) $(TOP-S-SOURCES:.S=.o)
diff --git a/src/sbefw/Makefile b/src/sbefw/Makefile
new file mode 100644
index 00000000..f25f44f5
--- /dev/null
+++ b/src/sbefw/Makefile
@@ -0,0 +1,56 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/sbefw/Makefile $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+
+include img_defs.mk
+include sbefwfiles.mk
+
+OBJS := $(addprefix $(OBJDIR)/, $(SBEFW_OBJECTS))
+
+libsbefw.a: $(OBJS)
+	$(AR) crs $(OBJDIR)/libsbefw.a $(OBJDIR)/*.o
+
+.PHONY: clean sbefw
+sbefw: $(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/assert.h
new file mode 100644
index 00000000..4a5be085
--- /dev/null
+++ b/src/sbefw/assert.h
@@ -0,0 +1,49 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/assert.h $                                          */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+/*
+ *  @file assert.h
+ *
+ *  @brief This file contains the assert macro for SBE
+ */
+#ifndef SBE_ASSERT_H
+#define SBE_ASSERT_H
+#include "sbetrace.H"
+#include "sbeutil.H"
+
+//@TODO via RTC 129166
+//inject exception to halt SBE. Also see if we can use some
+//PK kernel API.
+#ifndef NDEBUG
+#define assert(expr) \
+    if( !(expr ))  \
+    {  \
+        SBE_ERROR("assertion failed: "#expr); \
+        PK_PANIC(SBE::PANIC_ASSERT); \
+    } \
+
+#else
+#define assert(expr)
+#endif  //NDEBUG
+
+#endif // SBE_ASSERT_H
diff --git a/sbe/sbefw/pk_app_cfg.h b/src/sbefw/pk_app_cfg.h
index bbc51fcf..d2fbfceb 100644
--- a/sbe/sbefw/pk_app_cfg.h
+++ b/src/sbefw/pk_app_cfg.h
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/pk_app_cfg.h $                                      */
+/* $Source: src/sbefw/pk_app_cfg.h $                                      */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/plugins/sbeUserDataParser.C b/src/sbefw/plugins/sbeUserDataParser.C
index 64fca9f1..9ad2f48e 100644
--- a/sbe/sbefw/plugins/sbeUserDataParser.C
+++ b/src/sbefw/plugins/sbeUserDataParser.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/plugins/sbeUserDataParser.C $                       */
+/* $Source: src/sbefw/plugins/sbeUserDataParser.C $                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/pool.C b/src/sbefw/pool.C
index 314c9b72..6695135a 100644
--- a/sbe/sbefw/pool.C
+++ b/src/sbefw/pool.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/pool.C $                                            */
+/* $Source: src/sbefw/pool.C $                                            */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/pool.H b/src/sbefw/pool.H
new file mode 100644
index 00000000..3968852c
--- /dev/null
+++ b/src/sbefw/pool.H
@@ -0,0 +1,58 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/pool.H $                                            */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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 SBE_VECTOR_POOL_H
+#define SBE_VECTOR_POOL_H
+
+namespace SBEVECTORPOOL
+{
+
+// Size of a block  for a vector
+static const size_t G_BLOCKSIZE = 512;
+
+//Pool size
+static const size_t G_POOLSIZE = 4;
+
+typedef struct
+{
+    size_t refCount;
+    uint8_t data[G_BLOCKSIZE] __attribute__ ((aligned (8)));
+}vectorMemPool_t;
+
+/**
+  * @brief Returns memory pool block.
+  *
+  * @return  Memory block if available, NULL otherwise.
+  */
+vectorMemPool_t * allocMem();
+
+/**
+  * @brief Release memory pool block.
+  *
+  * @param[in] i_pool pool pointer.
+  */
+void releaseMem( vectorMemPool_t * i_pool );
+
+} // namespace SBEVECTORPOOL
+#endif //SBE_VECTOR_POOL_H
diff --git a/sbe/sbefw/sbeFFDC.C b/src/sbefw/sbeFFDC.C
index 2fd738e1..88bee00d 100644
--- a/sbe/sbefw/sbeFFDC.C
+++ b/src/sbefw/sbeFFDC.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeFFDC.C $                                         */
+/* $Source: src/sbefw/sbeFFDC.C $                                         */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbeFFDC.H b/src/sbefw/sbeFFDC.H
index a91c2537..514b9caf 100644
--- a/sbe/sbefw/sbeFFDC.H
+++ b/src/sbefw/sbeFFDC.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeFFDC.H $                                         */
+/* $Source: src/sbefw/sbeFFDC.H $                                         */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbeFFDCType.H b/src/sbefw/sbeFFDCType.H
index 056e7907..f4ef95ad 100644
--- a/sbe/sbefw/sbeFFDCType.H
+++ b/src/sbefw/sbeFFDCType.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeFFDCType.H $                                     */
+/* $Source: src/sbefw/sbeFFDCType.H $                                     */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbeFifoMsgUtils.C b/src/sbefw/sbeFifoMsgUtils.C
index 933e6289..99cf2709 100644
--- a/sbe/sbefw/sbeFifoMsgUtils.C
+++ b/src/sbefw/sbeFifoMsgUtils.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeFifoMsgUtils.C $                                 */
+/* $Source: src/sbefw/sbeFifoMsgUtils.C $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbeFifoMsgUtils.H b/src/sbefw/sbeFifoMsgUtils.H
index d9d460f3..60492964 100644
--- a/sbe/sbefw/sbeFifoMsgUtils.H
+++ b/src/sbefw/sbeFifoMsgUtils.H
@@ -1,3 +1,26 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/sbeFifoMsgUtils.H $                                 */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
 /*
  * @file: ppe/sbe/sbefw/sbeFifoMsgUtils.H
  *
diff --git a/sbe/sbefw/sbeHostMsg.H b/src/sbefw/sbeHostMsg.H
index edd040cf..3467d59c 100644
--- a/sbe/sbefw/sbeHostMsg.H
+++ b/src/sbefw/sbeHostMsg.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeHostMsg.H $                                      */
+/* $Source: src/sbefw/sbeHostMsg.H $                                      */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbeHostUtils.C b/src/sbefw/sbeHostUtils.C
index bdb0064e..3e4605d0 100644
--- a/sbe/sbefw/sbeHostUtils.C
+++ b/src/sbefw/sbeHostUtils.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeHostUtils.C $                                    */
+/* $Source: src/sbefw/sbeHostUtils.C $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbeHostUtils.H b/src/sbefw/sbeHostUtils.H
index 0605d476..efca6bf4 100644
--- a/sbe/sbefw/sbeHostUtils.H
+++ b/src/sbefw/sbeHostUtils.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeHostUtils.H $                                    */
+/* $Source: src/sbefw/sbeHostUtils.H $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbeSpMsg.H b/src/sbefw/sbeSpMsg.H
index 704b9a21..c1b972bf 100644
--- a/sbe/sbefw/sbeSpMsg.H
+++ b/src/sbefw/sbeSpMsg.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeSpMsg.H $                                        */
+/* $Source: src/sbefw/sbeSpMsg.H $                                        */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbeXipUtils.H b/src/sbefw/sbeXipUtils.H
new file mode 100644
index 00000000..b9ce992e
--- /dev/null
+++ b/src/sbefw/sbeXipUtils.H
@@ -0,0 +1,63 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/sbeXipUtils.H $                                     */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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 SBE_XIP_UTILS_H
+#define SBE_XIP_UTILS_H
+
+#include "p9_xip_image.h"
+#include "ppe42_scom.h"  // for PPE_STVD
+#include "sbe_link.H"  // for SBE_BASE_ORIGIN, SBE_SEEPROM_BASE_ORIGIN
+
+// Unconditional jump to a memory location
+#define JUMP_TO_ADDR(VAL ) \
+{ \
+asm volatile ( \
+    "mtlr  %0 \n\t" \
+    :   \
+    : "r" (VAL)); \
+asm volatile ( \
+    "blr  \n\t" \
+    :   \
+    );\
+}
+
+// PIBMEM start address
+const uint32_t g_pibMemAddr = SBE_BASE_ORIGIN;
+// SEEPROM start address
+const uint32_t g_headerAddr = SBE_SEEPROM_BASE_ORIGIN;
+// IVPR register address
+const uint32_t g_ivprLoc = 0xC0000160;
+
+// Get XIP image header
+inline P9XipHeader * getXipHdr()
+{
+    P9XipHeader *hdr = (P9XipHeader *)( g_headerAddr );
+    return hdr;
+}
+
+// Get Section start addess
+inline uint8_t * getSectionAddr( P9XipSection * i_section )
+{
+    return ( (uint8_t *)( g_headerAddr + i_section->iv_offset));
+}
+#endif // SBE_XIP_UTILS_H
diff --git a/sbe/sbefw/sbe_host_intf.H b/src/sbefw/sbe_host_intf.H
index ac08ae42..24658f16 100644
--- a/sbe/sbefw/sbe_host_intf.H
+++ b/src/sbefw/sbe_host_intf.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbe_host_intf.H $                                   */
+/* $Source: src/sbefw/sbe_host_intf.H $                                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbe_sp_intf.H b/src/sbefw/sbe_sp_intf.H
index 5e241455..0734343d 100644
--- a/sbe/sbefw/sbe_sp_intf.H
+++ b/src/sbefw/sbe_sp_intf.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbe_sp_intf.H $                                     */
+/* $Source: src/sbefw/sbe_sp_intf.H $                                     */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbecmdcntlinst.C b/src/sbefw/sbecmdcntlinst.C
index ab138f69..faed1e5b 100644
--- a/sbe/sbefw/sbecmdcntlinst.C
+++ b/src/sbefw/sbecmdcntlinst.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdcntlinst.C $                                  */
+/* $Source: src/sbefw/sbecmdcntlinst.C $                                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdcntlinst.H b/src/sbefw/sbecmdcntlinst.H
new file mode 100644
index 00000000..39e84135
--- /dev/null
+++ b/src/sbefw/sbecmdcntlinst.H
@@ -0,0 +1,45 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/sbecmdcntlinst.H $                                  */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+/*
+ * @file: ppe/sbe/sbefw/sbecmdcntlinst.H
+ *
+ * @brief This file contains the Interfaces for Control Instructions chip-ops
+ *
+ */
+
+#ifndef __SBEFW_SBECMDCNTLINST_H
+#define __SBEFW_SBECMDCNTLINST_H
+
+#include <stdint.h>
+
+/**
+  * @brief sbeCntlInst : Implements SBE Control instructions ChipOp
+  *
+  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
+  *
+  * @return    Rc from the FIFO access utility
+  */
+uint32_t sbeCntlInst (uint8_t *i_pArg);
+
+#endif /* __SBEFW_SBECMDCNTLINST_H */
diff --git a/sbe/sbefw/sbecmdcntrldmt.C b/src/sbefw/sbecmdcntrldmt.C
index 2720b943..a4cf8c97 100644
--- a/sbe/sbefw/sbecmdcntrldmt.C
+++ b/src/sbefw/sbecmdcntrldmt.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdcntrldmt.C $                                  */
+/* $Source: src/sbefw/sbecmdcntrldmt.C $                                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdcntrldmt.H b/src/sbefw/sbecmdcntrldmt.H
new file mode 100644
index 00000000..4f133947
--- /dev/null
+++ b/src/sbefw/sbecmdcntrldmt.H
@@ -0,0 +1,59 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/sbecmdcntrldmt.H $                                  */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+/*
+ * @file: ppe/sbe/sbefw/sbecmdcntrldmt.H
+ *
+ * @brief This file contains the Core State Control Messages API header
+ *
+ */
+
+#ifndef __SBEFW_SBECMDCNTRLDMT_H
+#define __SBEFW_SBECMDCNTRLDMT_H
+
+#include <stdint.h>
+
+// Define for the Sleep interval between continuous HWP calls
+// for DMT functionality in Millisecond
+static const uint8_t  SBE_DMT_SLEEP_INTERVAL = 1;
+
+// Bit-32 used to checkstop the system
+static const uint64_t  N3_FIR_CORE_CHECKSTOP_BIT = 32;
+
+/**
+  * @brief Callback for Timer Expiry for DMT
+  *
+  * @return void
+  */
+void sbeDmtPkExpiryCallback(void *arg);
+
+/**
+  * @brief Control Deadman Timer command (0xD101)
+  *
+  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
+  *
+  * @return    RC from the PSU access utility
+  */
+uint32_t sbeControlDeadmanTimer(uint8_t *i_pArg);
+
+#endif // __SBEFW_SBECMDCNTRLDMT_H
diff --git a/sbe/sbefw/sbecmdgeneric.C b/src/sbefw/sbecmdgeneric.C
index 97960699..e883993a 100644
--- a/sbe/sbefw/sbecmdgeneric.C
+++ b/src/sbefw/sbecmdgeneric.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdgeneric.C $                                   */
+/* $Source: src/sbefw/sbecmdgeneric.C $                                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdgeneric.H b/src/sbefw/sbecmdgeneric.H
new file mode 100644
index 00000000..3fa174ad
--- /dev/null
+++ b/src/sbefw/sbecmdgeneric.H
@@ -0,0 +1,46 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/sbecmdgeneric.H $                                   */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+/*
+ * @file: ppe/sbe/sbefw/sbecmdgeneric.H
+ *
+ * @brief This file contains the SBE Generic command details
+ *
+ */
+
+#ifndef __SBEFW_SBECMDGENERIC_H
+#define __SBEFW_SBECMDGENERIC_H
+
+#include <stdint.h>
+
+
+/**
+  * @brief SBE Generic capabilities  (0xA802)
+  *
+  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
+  *
+  * @return    Rc from the FIFO access utility
+  */
+uint32_t sbeGetCapabilities(uint8_t *i_pArg);
+
+#endif // __SBEFW_SBECMDGENERIC_H
diff --git a/sbe/sbefw/sbecmdiplcontrol.C b/src/sbefw/sbecmdiplcontrol.C
index 82252d7c..0819a864 100644
--- a/sbe/sbefw/sbecmdiplcontrol.C
+++ b/src/sbefw/sbecmdiplcontrol.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdiplcontrol.C $                                */
+/* $Source: src/sbefw/sbecmdiplcontrol.C $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbecmdiplcontrol.H b/src/sbefw/sbecmdiplcontrol.H
index 874d9875..e06757c5 100644
--- a/sbe/sbefw/sbecmdiplcontrol.H
+++ b/src/sbefw/sbecmdiplcontrol.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdiplcontrol.H $                                */
+/* $Source: src/sbefw/sbecmdiplcontrol.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbecmdmemaccess.C b/src/sbefw/sbecmdmemaccess.C
index d23d2933..942bb72d 100644
--- a/sbe/sbefw/sbecmdmemaccess.C
+++ b/src/sbefw/sbecmdmemaccess.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdmemaccess.C $                                 */
+/* $Source: src/sbefw/sbecmdmemaccess.C $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdmemaccess.H b/src/sbefw/sbecmdmemaccess.H
new file mode 100644
index 00000000..6a2449fc
--- /dev/null
+++ b/src/sbefw/sbecmdmemaccess.H
@@ -0,0 +1,54 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/sbecmdmemaccess.H $                                 */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+/*
+ * @file: ppe/sbe/sbefw/sbecmdmemaccess.H
+ *
+ * @brief This file contains the Interfaces for the Memory Access chip-ops
+ *
+ */
+
+#ifndef __SBEFW_SBECMDMEMACCESS_H
+#define __SBEFW_SBECMDMEMACCESS_H
+
+#include <stdint.h>
+
+/**
+  * @brief sbeGetMem : Implements SBE Get Memory ChipOp
+  *
+  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
+  *
+  * @return    Rc from the FIFO access utility
+  */
+uint32_t sbeGetMem (uint8_t *i_pArg);
+
+/**
+  * @brief sbePutMem : Implements SBE Put Memory ChipOp
+  *
+  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
+  *
+  * @return    Rc from the FIFO access utility
+  */
+uint32_t sbePutMem  (uint8_t *i_pArg);
+
+#endif /* __SBEFW_SBECMDMEMACCESS_H */
diff --git a/sbe/sbefw/sbecmdparser.C b/src/sbefw/sbecmdparser.C
index 5cc8e7e5..c22e67c7 100644
--- a/sbe/sbefw/sbecmdparser.C
+++ b/src/sbefw/sbecmdparser.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdparser.C $                                    */
+/* $Source: src/sbefw/sbecmdparser.C $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbecmdparser.H b/src/sbefw/sbecmdparser.H
index cbe63295..d51995f2 100644
--- a/sbe/sbefw/sbecmdparser.H
+++ b/src/sbefw/sbecmdparser.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdparser.H $                                    */
+/* $Source: src/sbefw/sbecmdparser.H $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbecmdprocessor.C b/src/sbefw/sbecmdprocessor.C
index 86295fdc..6a945b4a 100644
--- a/sbe/sbefw/sbecmdprocessor.C
+++ b/src/sbefw/sbecmdprocessor.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdprocessor.C $                                 */
+/* $Source: src/sbefw/sbecmdprocessor.C $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbecmdreceiver.C b/src/sbefw/sbecmdreceiver.C
index b1d210cd..50f24657 100644
--- a/sbe/sbefw/sbecmdreceiver.C
+++ b/src/sbefw/sbecmdreceiver.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdreceiver.C $                                  */
+/* $Source: src/sbefw/sbecmdreceiver.C $                                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbecmdregaccess.C b/src/sbefw/sbecmdregaccess.C
index 7feb73b4..d4023f73 100644
--- a/sbe/sbefw/sbecmdregaccess.C
+++ b/src/sbefw/sbecmdregaccess.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdregaccess.C $                                 */
+/* $Source: src/sbefw/sbecmdregaccess.C $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdregaccess.H b/src/sbefw/sbecmdregaccess.H
new file mode 100644
index 00000000..01199816
--- /dev/null
+++ b/src/sbefw/sbecmdregaccess.H
@@ -0,0 +1,56 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/sbecmdregaccess.H $                                 */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+/*
+ * @file: ppe/sbe/sbefw/sbecmdregaccess.H
+ *
+ * @brief This file contains the Interfaces for the SCOM Access chip-ops
+ *
+ */
+
+#ifndef __SBEFW_SBECMDREGACCESS_H
+#define __SBEFW_SBECMDREGACCESS_H
+
+#include <stdint.h>
+
+/**
+  * @brief sbeGetRegs : Get the reg data
+  *
+  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
+  *
+  * @return    Rc from the FIFO access utility
+  */
+uint32_t sbeGetReg(uint8_t *i_pArg);
+
+
+/**
+  * @brief sbePutRegs : Put the reg data
+  *
+  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
+  *
+  * @return    Rc from the FIFO access utility
+  */
+uint32_t sbePutReg(uint8_t *i_pArg);
+
+
+#endif /* __SBEFW_SBECMDREGACCESS_H */
diff --git a/sbe/sbefw/sbecmdringaccess.C b/src/sbefw/sbecmdringaccess.C
index 49c8579b..3fdc8f7e 100644
--- a/sbe/sbefw/sbecmdringaccess.C
+++ b/src/sbefw/sbecmdringaccess.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdringaccess.C $                                */
+/* $Source: src/sbefw/sbecmdringaccess.C $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbecmdringaccess.H b/src/sbefw/sbecmdringaccess.H
index b0e71012..d2163646 100644
--- a/sbe/sbefw/sbecmdringaccess.H
+++ b/src/sbefw/sbecmdringaccess.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdringaccess.H $                                */
+/* $Source: src/sbefw/sbecmdringaccess.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbecmdscomaccess.C b/src/sbefw/sbecmdscomaccess.C
index ac43e815..e99ce89f 100644
--- a/sbe/sbefw/sbecmdscomaccess.C
+++ b/src/sbefw/sbecmdscomaccess.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdscomaccess.C $                                */
+/* $Source: src/sbefw/sbecmdscomaccess.C $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbecmdscomaccess.H b/src/sbefw/sbecmdscomaccess.H
index 69d5e997..8a4a4a28 100644
--- a/sbe/sbefw/sbecmdscomaccess.H
+++ b/src/sbefw/sbecmdscomaccess.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdscomaccess.H $                                */
+/* $Source: src/sbefw/sbecmdscomaccess.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbecmdsram.C b/src/sbefw/sbecmdsram.C
index 703a26ce..ac11ffc6 100644
--- a/sbe/sbefw/sbecmdsram.C
+++ b/src/sbefw/sbecmdsram.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbecmdsram.C $                                      */
+/* $Source: src/sbefw/sbecmdsram.C $                                      */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/sbefw/sbecmdsram.H b/src/sbefw/sbecmdsram.H
new file mode 100644
index 00000000..1c86aa2b
--- /dev/null
+++ b/src/sbefw/sbecmdsram.H
@@ -0,0 +1,64 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/sbecmdsram.H $                                      */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+/*
+ * @file: ppe/sbe/sbefw/sbecmdsram.H
+ *
+ * @brief This file contains the Interfaces for the Sram Access chip-ops
+ *
+ */
+
+#ifndef __SBEFW_SBECMDSRAM_H
+#define __SBEFW_SBECMDSRAM_H
+
+#include <stdint.h>
+
+static const uint8_t SBE_32BIT_ALIGN_FACTOR = 4;
+static const uint8_t SBE_64BIT_ALIGN_FACTOR = 8;
+
+static const uint64_t SBE_FWCTRLFLG3_FSP_ATTACHED = 0X1000000000000000;
+
+/*
+ * @brief Granule size in Bytes for 'Get from Hwp'/'Put to Hwp'
+ */
+static const uint32_t SBE_OCC_SRAM_GRANULE = 128;
+
+/**
+  * @brief sbeGetOccSram : Implements SBE Get Occ Sram ChipOp
+  *
+  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
+  *
+  * @return    Rc from the FIFO access utility
+  */
+uint32_t sbeGetOccSram (uint8_t *i_pArg);
+
+/**
+  * @brief sbePutOccSram : Implements SBE Put Occ Sram ChipOp
+  *
+  * @param[in] i_pArg Buffer to be passed to the function (not used as of now)
+  *
+  * @return    Rc from the FIFO access utility
+  */
+uint32_t sbePutOccSram  (uint8_t *i_pArg);
+
+#endif /* __SBEFW_SBECMDSRAM_H */
diff --git a/src/sbefw/sbeerrorcodes.H b/src/sbefw/sbeerrorcodes.H
new file mode 100644
index 00000000..2e37bb2b
--- /dev/null
+++ b/src/sbefw/sbeerrorcodes.H
@@ -0,0 +1,49 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/sbeerrorcodes.H $                                   */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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                                                     */
+/*
+ * @file: ppe/sbe/sbefw/sbeerrorcodes.H
+ *
+ * @brief This file contains the SBE internal error status codes
+ *
+ */
+
+#ifndef __SBEFW_SBEERRORCODES_H
+#define __SBEFW_SBEERRORCODES_H
+
+#include <stdint.h>
+
+
+/**
+ * @brief enums SBE internal error codes
+ *
+*/
+enum sbeInternalResponseCodes
+{
+    SBE_FIFO_RESET_RECEIVED  = 0xFA00,
+    SBE_FIFO_RESET_HANDLING_FAILED = 0xFB00,
+    SBE_FUNC_NOT_SUPPORTED   = 0xFC00,
+};
+
+
+#endif // __SBEFW_SBEERRORCODES_H
+\ No newline at end of file
diff --git a/sbe/sbefw/sbeevents.H b/src/sbefw/sbeevents.H
index e6a69da2..6506a050 100644
--- a/sbe/sbefw/sbeevents.H
+++ b/src/sbefw/sbeevents.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeevents.H $                                       */
+/* $Source: src/sbefw/sbeevents.H $                                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbeexeintf.H b/src/sbefw/sbeexeintf.H
index e871632a..8a8aff66 100644
--- a/sbe/sbefw/sbeexeintf.H
+++ b/src/sbefw/sbeexeintf.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeexeintf.H $                                      */
+/* $Source: src/sbefw/sbeexeintf.H $                                      */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbefifo.H b/src/sbefw/sbefifo.H
index fef49d45..47ce5beb 100644
--- a/sbe/sbefw/sbefifo.H
+++ b/src/sbefw/sbefifo.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbefifo.H $                                         */
+/* $Source: src/sbefw/sbefifo.H $                                         */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbefwfiles.mk b/src/sbefw/sbefwfiles.mk
index 1a3a4d81..24f9318e 100644
--- a/sbe/sbefw/sbefwfiles.mk
+++ b/src/sbefw/sbefwfiles.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/sbefw/sbefwfiles.mk $
+# $Source: src/sbefw/sbefwfiles.mk $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/sbefw/sbeirq.C b/src/sbefw/sbeirq.C
index 33c63761..bf445245 100644
--- a/sbe/sbefw/sbeirq.C
+++ b/src/sbefw/sbeirq.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeirq.C $                                          */
+/* $Source: src/sbefw/sbeirq.C $                                          */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbeirq.H b/src/sbefw/sbeirq.H
index d01affbf..8102ce81 100644
--- a/sbe/sbefw/sbeirq.H
+++ b/src/sbefw/sbeirq.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeirq.H $                                          */
+/* $Source: src/sbefw/sbeirq.H $                                          */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbemain.C b/src/sbefw/sbemain.C
index d60353f5..06488c14 100644
--- a/sbe/sbefw/sbemain.C
+++ b/src/sbefw/sbemain.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbemain.C $                                         */
+/* $Source: src/sbefw/sbemain.C $                                         */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sberegaccess.C b/src/sbefw/sberegaccess.C
index 4c099428..71540e56 100644
--- a/sbe/sbefw/sberegaccess.C
+++ b/src/sbefw/sberegaccess.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sberegaccess.C $                                    */
+/* $Source: src/sbefw/sberegaccess.C $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sberegaccess.H b/src/sbefw/sberegaccess.H
index dad80939..84e2c87e 100644
--- a/sbe/sbefw/sberegaccess.H
+++ b/src/sbefw/sberegaccess.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sberegaccess.H $                                    */
+/* $Source: src/sbefw/sberegaccess.H $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbescom.C b/src/sbefw/sbescom.C
index 52224b48..9a2fc38c 100644
--- a/sbe/sbefw/sbescom.C
+++ b/src/sbefw/sbescom.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbescom.C $                                         */
+/* $Source: src/sbefw/sbescom.C $                                         */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbescom.H b/src/sbefw/sbescom.H
index 84c4ecc4..3809ba10 100644
--- a/sbe/sbefw/sbescom.H
+++ b/src/sbefw/sbescom.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbescom.H $                                         */
+/* $Source: src/sbefw/sbescom.H $                                         */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbestates.H b/src/sbefw/sbestates.H
index 525888a6..6acaba4d 100644
--- a/sbe/sbefw/sbestates.H
+++ b/src/sbefw/sbestates.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbestates.H $                                       */
+/* $Source: src/sbefw/sbestates.H $                                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbetrace.H b/src/sbefw/sbetrace.H
index e83e3afc..1d7df7e4 100644
--- a/sbe/sbefw/sbetrace.H
+++ b/src/sbefw/sbetrace.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbetrace.H $                                        */
+/* $Source: src/sbefw/sbetrace.H $                                        */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/sbeutil.H b/src/sbefw/sbeutil.H
index 2a90ee77..07fc6b7f 100644
--- a/sbe/sbefw/sbeutil.H
+++ b/src/sbefw/sbeutil.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/sbefw/sbeutil.H $                                         */
+/* $Source: src/sbefw/sbeutil.H $                                         */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/sbe/sbefw/vector b/src/sbefw/vector
index 1f14eb20..5929f85f 100644
--- a/sbe/sbefw/vector
+++ b/src/sbefw/vector
@@ -1,3 +1,26 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/sbefw/vector $                                            */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* 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 stl_vector
 #define stl_vector
diff --git a/sbe/test/citest/autocitest b/src/test/citest/autocitest
index 70c9ba51..088bb58b 100755
--- a/sbe/test/citest/autocitest
+++ b/src/test/citest/autocitest
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/citest/autocitest $
+# $Source: src/test/citest/autocitest $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/test/citest/build-script b/src/test/citest/build-script
index 8250ad08..5ad6b1bd 100755
--- a/sbe/test/citest/build-script
+++ b/src/test/citest/build-script
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/citest/build-script $
+# $Source: src/test/citest/build-script $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +31,7 @@ if [ -z $SBEROOT ]; then
     source "$WORKSPACE/env.bash"
 fi
 
-source "$SBEROOT/sbe/test/citest/setup-env"
+source "$SBEROOT/src/test/citest/setup-env"
 
 # Check copyright.
 #check-copyright > copyright.log 2>&1 &
diff --git a/sbe/test/citest/check-copyright b/src/test/citest/check-copyright
index 68e536d4..28db5512 100755
--- a/sbe/test/citest/check-copyright
+++ b/src/test/citest/check-copyright
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/citest/check-copyright $
+# $Source: src/test/citest/check-copyright $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,8 +23,8 @@
 #
 # IBM_PROLOG_END_TAG
 
-COPYRIGHT_CHECK=${SBEROOT}/sbe/test/citest/copyright-check.sh
-COMMIT_CHECK=${SBEROOT}/sbe/tools/hooks/verify-commit
+COPYRIGHT_CHECK=${SBEROOT}/src/test/citest/copyright-check.sh
+COMMIT_CHECK=${SBEROOT}/src/tools/hooks/verify-commit
 
 $COPYRIGHT_CHECK || exit -1
 $COMMIT_CHECK || exit -1
diff --git a/sbe/test/citest/copyright-check.sh b/src/test/citest/copyright-check.sh
index c5c9534d..3d7c5d54 100755
--- a/sbe/test/citest/copyright-check.sh
+++ b/src/test/citest/copyright-check.sh
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/citest/copyright-check.sh $
+# $Source: src/test/citest/copyright-check.sh $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +29,7 @@
 #
 
 export WORKSPACE_DIR=`pwd`
-export ADDCOPYRIGHT=${WORKSPACE_DIR}/sbe/tools/hooks/addCopyright
+export ADDCOPYRIGHT=${WORKSPACE_DIR}/src/tools/hooks/addCopyright
 
 ##  run git show to get a list of checked in files
 CHECKINFILES=`git show --pretty=format: --name-only -n1 | tr '\n' ' '`
diff --git a/sbe/test/citest/create-sandbox b/src/test/citest/create-sandbox
index daae3046..b6a1e7e8 100755
--- a/sbe/test/citest/create-sandbox
+++ b/src/test/citest/create-sandbox
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/citest/create-sandbox $
+# $Source: src/test/citest/create-sandbox $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/test/citest/etc/patches/chip.act.patch b/src/test/citest/etc/patches/chip.act.patch
index 0b9cf0f0..0b9cf0f0 100644
--- a/sbe/test/citest/etc/patches/chip.act.patch
+++ b/src/test/citest/etc/patches/chip.act.patch
diff --git a/sbe/test/citest/etc/patches/patchlist.txt b/src/test/citest/etc/patches/patchlist.txt
index 4fd0444a..4fd0444a 100644
--- a/sbe/test/citest/etc/patches/patchlist.txt
+++ b/src/test/citest/etc/patches/patchlist.txt
diff --git a/sbe/test/citest/etc/patches/pervasive.act.patch b/src/test/citest/etc/patches/pervasive.act.patch
index 5531bef6..5531bef6 100644
--- a/sbe/test/citest/etc/patches/pervasive.act.patch
+++ b/src/test/citest/etc/patches/pervasive.act.patch
diff --git a/sbe/test/citest/etc/patches/powermgmt.act.patch b/src/test/citest/etc/patches/powermgmt.act.patch
index efb03845..efb03845 100644
--- a/sbe/test/citest/etc/patches/powermgmt.act.patch
+++ b/src/test/citest/etc/patches/powermgmt.act.patch
diff --git a/sbe/test/citest/etc/patches/standalone.simics.patch b/src/test/citest/etc/patches/standalone.simics.patch
index bdc40fd8..bdc40fd8 100644
--- a/sbe/test/citest/etc/patches/standalone.simics.patch
+++ b/src/test/citest/etc/patches/standalone.simics.patch
diff --git a/sbe/test/citest/etc/workarounds.postsimsetup b/src/test/citest/etc/workarounds.postsimsetup
index adfdfe26..057c3b00 100755
--- a/sbe/test/citest/etc/workarounds.postsimsetup
+++ b/src/test/citest/etc/workarounds.postsimsetup
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/citest/etc/workarounds.postsimsetup $
+# $Source: src/test/citest/etc/workarounds.postsimsetup $
 #
 # OpenPOWER sbe Project
 #
@@ -39,5 +39,5 @@
 echo "+++ Patching standalone.simics"
 mkdir -p $SANDBOXBASE/obj/ppc/simu/scripts/hbfw
 cp $BACKING_BUILD/obj/ppc/simu/scripts/hbfw/standalone.simics $SANDBOXBASE/obj/ppc/simu/scripts/hbfw
-patch -p0 $SANDBOXBASE/obj/ppc/simu/scripts/hbfw/standalone.simics $SBEROOT/sbe/test/citest/etc/patches/standalone.simics.patch
+patch -p0 $SANDBOXBASE/obj/ppc/simu/scripts/hbfw/standalone.simics $SBEROOT/src/test/citest/etc/patches/standalone.simics.patch
 
diff --git a/sbe/test/citest/etc/workarounds.presimsetup b/src/test/citest/etc/workarounds.presimsetup
index 284b0293..638a1e84 100755
--- a/sbe/test/citest/etc/workarounds.presimsetup
+++ b/src/test/citest/etc/workarounds.presimsetup
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/citest/etc/workarounds.presimsetup $
+# $Source: src/test/citest/etc/workarounds.presimsetup $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/test/citest/populate-sandbox b/src/test/citest/populate-sandbox
index 4e2e2f10..d28b0f76 100755
--- a/sbe/test/citest/populate-sandbox
+++ b/src/test/citest/populate-sandbox
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/citest/populate-sandbox $
+# $Source: src/test/citest/populate-sandbox $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -57,5 +56,5 @@ execute_in_sandbox "cd $SBEFW_DIR; mk install_all" \
 
 
 # Copy test files.
-cp  -r $SBEROOT/sbe/test/* $SBETESTDIR/ || exit -1
+cp  -r $SBEROOT/src/test/* $SBETESTDIR/ || exit -1
 
diff --git a/sbe/test/citest/sbetest-start.sh b/src/test/citest/sbetest-start.sh
index c70cc5d7..f39ed84e 100755
--- a/sbe/test/citest/sbetest-start.sh
+++ b/src/test/citest/sbetest-start.sh
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/citest/sbetest-start.sh $
+# $Source: src/test/citest/sbetest-start.sh $
 #
 # OpenPOWER sbe Project
 #
@@ -26,7 +26,7 @@ if [ -z $SBE_CI_ENV_SETUP ];
 then
     unset $SANDBOXBASE
     unset $SANDBOXNAME
-    source "$SBEROOT/sbe/test/citest/setup-env"
+    source "$SBEROOT/src/test/citest/setup-env"
 fi
 
 #   Front end to autocitest - script to execute unit tests under simics.
diff --git a/sbe/test/citest/setup-env b/src/test/citest/setup-env
index a9ceea69..ee0bc18b 100755
--- a/sbe/test/citest/setup-env
+++ b/src/test/citest/setup-env
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/citest/setup-env $
+# $Source: src/test/citest/setup-env $
 #
 # OpenPOWER sbe Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-export CITESTPATH=${SBEROOT}/sbe/test/citest
+export CITESTPATH=${SBEROOT}/src/test/citest
 export PATH=${CITESTPATH}:${PATH}
 
 # If we are running under Jenkins we need to pick a random-ish sandbox name
diff --git a/src/test/ffdc.xml b/src/test/ffdc.xml
new file mode 100755
index 00000000..65364249
--- /dev/null
+++ b/src/test/ffdc.xml
@@ -0,0 +1,41 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/test/ffdc.xml $                                           -->
+<!--                                                                        -->
+<!-- OpenPOWER sbe Project                                                  -->
+<!--                                                                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!--                                                                        -->
+<!--                                                                        -->
+<!-- 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                                                     -->
+<?xml version="1.0" encoding="UTF-8"?>
+      <!--Collect FFDC -->
+    <test>
+    <subtest>
+        <testcase>
+            <simcmd>sbe-trace 0</simcmd>
+        </testcase>
+        <testcase>
+            <simcmd>p9Proc0.sbe.ppe->ppe_state</simcmd>
+        </testcase>
+        <testcase>
+            <simcmd>p9Proc0.proc_fifo->upstream_hw_fifo</simcmd>
+        </testcase>
+        <testcase>
+            <simcmd>p9Proc0.proc_fifo->downstream_hw_fifo</simcmd>
+        </testcase>
+    </subtest>
+    </test>
diff --git a/sbe/test/test.xml b/src/test/test.xml
index 00612be3..2172b8f6 100755
--- a/sbe/test/test.xml
+++ b/src/test/test.xml
@@ -1,12 +1,11 @@
 <!-- IBM_PROLOG_BEGIN_TAG                                                   -->
 <!-- This is an automatically generated prolog.                             -->
 <!--                                                                        -->
-<!-- $Source: sbe/test/test.xml $                                           -->
+<!-- $Source: src/test/test.xml $                                           -->
 <!--                                                                        -->
 <!-- OpenPOWER sbe Project                                                  -->
 <!--                                                                        -->
 <!-- Contributors Listed Below - COPYRIGHT 2015,2016                        -->
-<!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
 <!-- Licensed under the Apache License, Version 2.0 (the "License");        -->
diff --git a/sbe/test/testAbort.py b/src/test/testAbort.py
index eca8a6eb..7039c70b 100755
--- a/sbe/test/testAbort.py
+++ b/src/test/testAbort.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testAbort.py $
+# $Source: src/test/testAbort.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/testAduMem.xml b/src/test/testAduMem.xml
new file mode 100644
index 00000000..1fcbe12d
--- /dev/null
+++ b/src/test/testAduMem.xml
@@ -0,0 +1,42 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/test/testAduMem.xml $                                     -->
+<!--                                                                        -->
+<!-- OpenPOWER sbe Project                                                  -->
+<!--                                                                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!--                                                                        -->
+<!--                                                                        -->
+<!-- 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                                                     -->
+<?xml version="1.0" encoding="UTF-8"?>
+
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testAduMem_ecc.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testAduMem_itag.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testAduMem_withEccItag.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testAduMem_noEccNoItag.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+
diff --git a/sbe/test/testAduMem_ecc.py b/src/test/testAduMem_ecc.py
index 358d9ae9..f60af64e 100644
--- a/sbe/test/testAduMem_ecc.py
+++ b/src/test/testAduMem_ecc.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testAduMem_ecc.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testAduMem_itag.py b/src/test/testAduMem_itag.py
index 33160602..8c7d9a3c 100644
--- a/sbe/test/testAduMem_itag.py
+++ b/src/test/testAduMem_itag.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testAduMem_itag.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testAduMem_noEccNoItag.py b/src/test/testAduMem_noEccNoItag.py
index 6f1d3350..ccbad942 100644
--- a/sbe/test/testAduMem_noEccNoItag.py
+++ b/src/test/testAduMem_noEccNoItag.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testAduMem_noEccNoItag.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testAduMem_withEccItag.py b/src/test/testAduMem_withEccItag.py
index 5980a9a4..7db53813 100644
--- a/sbe/test/testAduMem_withEccItag.py
+++ b/src/test/testAduMem_withEccItag.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testAduMem_withEccItag.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testAduMem_withEccWithItagReadWrite.py b/src/test/testAduMem_withEccWithItagReadWrite.py
index 8e2de7a0..95578979 100644
--- a/sbe/test/testAduMem_withEccWithItagReadWrite.py
+++ b/src/test/testAduMem_withEccWithItagReadWrite.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testAduMem_withEccWithItagReadWrite.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testCntlInstruction.py b/src/test/testCntlInstruction.py
index 76216a8b..125b1b67 100644
--- a/sbe/test/testCntlInstruction.py
+++ b/src/test/testCntlInstruction.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testCntlInstruction.py $
+# $Source: src/test/testCntlInstruction.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/testCntlInstruction.xml b/src/test/testCntlInstruction.xml
new file mode 100755
index 00000000..07e22ee3
--- /dev/null
+++ b/src/test/testCntlInstruction.xml
@@ -0,0 +1,30 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/test/testCntlInstruction.xml $                            -->
+<!--                                                                        -->
+<!-- OpenPOWER sbe Project                                                  -->
+<!--                                                                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!--                                                                        -->
+<!--                                                                        -->
+<!-- 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                                                     -->
+<?xml version="1.0" encoding="UTF-8"?>
+
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testCntlInstruction.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+
diff --git a/sbe/test/testContinueMpipl.py b/src/test/testContinueMpipl.py
index 37822d89..080e479a 100755
--- a/sbe/test/testContinueMpipl.py
+++ b/src/test/testContinueMpipl.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testContinueMpipl.py $
+# $Source: src/test/testContinueMpipl.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/test/testContinueSbeBoot.py b/src/test/testContinueSbeBoot.py
index e8ba019c..5f64f0fa 100755
--- a/sbe/test/testContinueSbeBoot.py
+++ b/src/test/testContinueSbeBoot.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testContinueSbeBoot.py $
+# $Source: src/test/testContinueSbeBoot.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/test/testEnterMpipl.py b/src/test/testEnterMpipl.py
index 23686fe4..8d225831 100755
--- a/sbe/test/testEnterMpipl.py
+++ b/src/test/testEnterMpipl.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testEnterMpipl.py $
+# $Source: src/test/testEnterMpipl.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/test/testExecutorMemory.py b/src/test/testExecutorMemory.py
index 5bb4416a..125528bf 100644
--- a/sbe/test/testExecutorMemory.py
+++ b/src/test/testExecutorMemory.py
@@ -1,4 +1,27 @@
 #!/usr/bin/python
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testExecutorMemory.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 '''
 #############################################################
 #    @file    testExecutor.py
diff --git a/sbe/test/testExecutorPSU.py b/src/test/testExecutorPSU.py
index 52846ecb..5c58a954 100644
--- a/sbe/test/testExecutorPSU.py
+++ b/src/test/testExecutorPSU.py
@@ -1,4 +1,27 @@
 #!/usr/bin/python
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testExecutorPSU.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 '''
 #############################################################
 #    @file    testExecutor.py
diff --git a/sbe/test/testExecutorPutRing.py b/src/test/testExecutorPutRing.py
index 59d4639e..d6c74bb8 100644
--- a/sbe/test/testExecutorPutRing.py
+++ b/src/test/testExecutorPutRing.py
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testExecutorPutRing.py $
+# $Source: src/test/testExecutorPutRing.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/test/testExecutorPutRing.xml b/src/test/testExecutorPutRing.xml
index 9aef4cf9..56aabc0c 100755
--- a/sbe/test/testExecutorPutRing.xml
+++ b/src/test/testExecutorPutRing.xml
@@ -1,12 +1,11 @@
 <!-- IBM_PROLOG_BEGIN_TAG                                                   -->
 <!-- This is an automatically generated prolog.                             -->
 <!--                                                                        -->
-<!-- $Source: sbe/test/testExecutorPutRing.xml $                            -->
+<!-- $Source: src/test/testExecutorPutRing.xml $                            -->
 <!--                                                                        -->
 <!-- OpenPOWER sbe Project                                                  -->
 <!--                                                                        -->
 <!-- Contributors Listed Below - COPYRIGHT 2016                             -->
-<!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
 <!-- Licensed under the Apache License, Version 2.0 (the "License");        -->
diff --git a/sbe/test/testFifoReset.py b/src/test/testFifoReset.py
index 9660df2e..3b03e6c6 100644
--- a/sbe/test/testFifoReset.py
+++ b/src/test/testFifoReset.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testFifoReset.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest")
 import testUtil
diff --git a/sbe/test/testFifoReset.xml b/src/test/testFifoReset.xml
index 672d2c5a..48b12a3e 100644
--- a/sbe/test/testFifoReset.xml
+++ b/src/test/testFifoReset.xml
@@ -1,12 +1,11 @@
 <!-- IBM_PROLOG_BEGIN_TAG                                                   -->
 <!-- This is an automatically generated prolog.                             -->
 <!--                                                                        -->
-<!-- $Source: sbe/test/testFifoReset.xml $                                  -->
+<!-- $Source: src/test/testFifoReset.xml $                                  -->
 <!--                                                                        -->
 <!-- OpenPOWER sbe Project                                                  -->
 <!--                                                                        -->
 <!-- Contributors Listed Below - COPYRIGHT 2016                             -->
-<!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
 <!-- Licensed under the Apache License, Version 2.0 (the "License");        -->
diff --git a/src/test/testGeneric.xml b/src/test/testGeneric.xml
new file mode 100755
index 00000000..cc49a78b
--- /dev/null
+++ b/src/test/testGeneric.xml
@@ -0,0 +1,30 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/test/testGeneric.xml $                                    -->
+<!--                                                                        -->
+<!-- OpenPOWER sbe Project                                                  -->
+<!--                                                                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!--                                                                        -->
+<!--                                                                        -->
+<!-- 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                                                     -->
+<?xml version="1.0" encoding="UTF-8"?>
+
+      <!-- SBE Get Capabilities Test case -->
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testGetCapabilities.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
diff --git a/sbe/test/testGetCapabilities.py b/src/test/testGetCapabilities.py
index a9287558..e6831352 100755
--- a/sbe/test/testGetCapabilities.py
+++ b/src/test/testGetCapabilities.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testGetCapabilities.py $
+# $Source: src/test/testGetCapabilities.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/test/testGetMem.py b/src/test/testGetMem.py
index dac6b747..a927f250 100644
--- a/sbe/test/testGetMem.py
+++ b/src/test/testGetMem.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testGetMem.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testGetMem_expdata.py b/src/test/testGetMem_expdata.py
index 78304c5a..56b43119 100644
--- a/sbe/test/testGetMem_expdata.py
+++ b/src/test/testGetMem_expdata.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testGetMem_expdata.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testGetRing.py b/src/test/testGetRing.py
index 4137108d..d6d786b8 100644
--- a/sbe/test/testGetRing.py
+++ b/src/test/testGetRing.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testGetRing.py $
+# $Source: src/test/testGetRing.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/test/testGetRing.xml b/src/test/testGetRing.xml
index e3f240c1..a30802c2 100755
--- a/sbe/test/testGetRing.xml
+++ b/src/test/testGetRing.xml
@@ -1,12 +1,11 @@
 <!-- IBM_PROLOG_BEGIN_TAG                                                   -->
 <!-- This is an automatically generated prolog.                             -->
 <!--                                                                        -->
-<!-- $Source: sbe/test/testGetRing.xml $                                    -->
+<!-- $Source: src/test/testGetRing.xml $                                    -->
 <!--                                                                        -->
 <!-- OpenPOWER sbe Project                                                  -->
 <!--                                                                        -->
 <!-- Contributors Listed Below - COPYRIGHT 2016                             -->
-<!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
 <!-- Licensed under the Apache License, Version 2.0 (the "License");        -->
diff --git a/sbe/test/testIstep.xml b/src/test/testIstep.xml
index 0e371e79..f0e71d61 100644
--- a/sbe/test/testIstep.xml
+++ b/src/test/testIstep.xml
@@ -1,12 +1,11 @@
 <!-- IBM_PROLOG_BEGIN_TAG                                                   -->
 <!-- This is an automatically generated prolog.                             -->
 <!--                                                                        -->
-<!-- $Source: sbe/test/testIstep.xml $                                      -->
+<!-- $Source: src/test/testIstep.xml $                                      -->
 <!--                                                                        -->
 <!-- OpenPOWER sbe Project                                                  -->
 <!--                                                                        -->
 <!-- Contributors Listed Below - COPYRIGHT 2015,2016                        -->
-<!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
 <!-- Licensed under the Apache License, Version 2.0 (the "License");        -->
diff --git a/sbe/test/testIstepAuto.py b/src/test/testIstepAuto.py
index 6bff0f99..8cbccffa 100755
--- a/sbe/test/testIstepAuto.py
+++ b/src/test/testIstepAuto.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testIstepAuto.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 from sim_commands import *
 import imp
diff --git a/sbe/test/testIstepInvalid.py b/src/test/testIstepInvalid.py
index 2d158a3a..5af909d7 100755
--- a/sbe/test/testIstepInvalid.py
+++ b/src/test/testIstepInvalid.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testIstepInvalid.py $
+# $Source: src/test/testIstepInvalid.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/test/testIstepInvalidFenced.py b/src/test/testIstepInvalidFenced.py
index 1d067139..568253af 100755
--- a/sbe/test/testIstepInvalidFenced.py
+++ b/src/test/testIstepInvalidFenced.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testIstepInvalidFenced.py $
+# $Source: src/test/testIstepInvalidFenced.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/testIstepSuccess.py b/src/test/testIstepSuccess.py
new file mode 100755
index 00000000..83871896
--- /dev/null
+++ b/src/test/testIstepSuccess.py
@@ -0,0 +1,57 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testIstepSuccess.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+import sys
+sys.path.append("targets/p9_nimbus/sbeTest" )
+import testUtil
+err = False
+#from testWrite import *
+
+TESTDATA = [0,0,0,3,
+            0,0,0xA1,0x01,
+            0,0x02,0x00,0x2]
+
+EXPDATA = [0xc0,0xde,0xa1,0x01,
+           0x0,0x0,0x0,0x0,
+           0x00,0x0,0x0,0x03];
+
+# MAIN Test Run Starts Here...
+#-------------------------------------------------
+def main( ):
+    testUtil.runCycles( 10000000 )
+    testUtil.writeUsFifo( TESTDATA )
+    testUtil.writeEot( )
+    testUtil.readDsFifo( EXPDATA )
+    testUtil.readEot( )
+#-------------------------------------------------
+# Calling all test code
+#-------------------------------------------------
+main()
+
+if err:
+    print ("\nTest Suite completed with error(s)")
+    #sys.exit(1)
+else:
+    print ("\nTest Suite completed with no errors")
+    #sys.exit(0);
+
diff --git a/sbe/test/testModifyScom.py b/src/test/testModifyScom.py
index d7e504b2..703ad680 100755
--- a/sbe/test/testModifyScom.py
+++ b/src/test/testModifyScom.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testModifyScom.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testPSUUserUtil.py b/src/test/testPSUUserUtil.py
index d2126e56..df586ab7 100644
--- a/sbe/test/testPSUUserUtil.py
+++ b/src/test/testPSUUserUtil.py
@@ -1,4 +1,27 @@
 #!/usr/bin/python
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testPSUUserUtil.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 '''
 #############################################################
 #    @file    testClassUtil.py
diff --git a/sbe/test/testPSUUtil.py b/src/test/testPSUUtil.py
index 88fd6a29..84b91ff7 100644
--- a/sbe/test/testPSUUtil.py
+++ b/src/test/testPSUUtil.py
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testPSUUtil.py $
+# $Source: src/test/testPSUUtil.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/test/testPutGetInScom.py b/src/test/testPutGetInScom.py
index 9f39e8d1..03571eaa 100755
--- a/sbe/test/testPutGetInScom.py
+++ b/src/test/testPutGetInScom.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testPutGetInScom.py $
+# $Source: src/test/testPutGetInScom.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/testPutGetMem.xml b/src/test/testPutGetMem.xml
new file mode 100644
index 00000000..c386c933
--- /dev/null
+++ b/src/test/testPutGetMem.xml
@@ -0,0 +1,34 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/test/testPutGetMem.xml $                                  -->
+<!--                                                                        -->
+<!-- OpenPOWER sbe Project                                                  -->
+<!--                                                                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!--                                                                        -->
+<!--                                                                        -->
+<!-- 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                                                     -->
+<?xml version="1.0" encoding="UTF-8"?>
+
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testPutMem.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testGetMem_expdata.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+
diff --git a/sbe/test/testPutGetRegFpr.py b/src/test/testPutGetRegFpr.py
index 63cf4186..2b2cd75c 100755
--- a/sbe/test/testPutGetRegFpr.py
+++ b/src/test/testPutGetRegFpr.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testPutGetRegFpr.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testPutGetRegGpr.py b/src/test/testPutGetRegGpr.py
index ce5891e7..cd1e31b4 100755
--- a/sbe/test/testPutGetRegGpr.py
+++ b/src/test/testPutGetRegGpr.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testPutGetRegGpr.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testPutGetRegSpr.py b/src/test/testPutGetRegSpr.py
index 82f7c8d2..55c6fa09 100755
--- a/sbe/test/testPutGetRegSpr.py
+++ b/src/test/testPutGetRegSpr.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testPutGetRegSpr.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testPutGetScom.py b/src/test/testPutGetScom.py
index bf6185ce..de020fb2 100755
--- a/sbe/test/testPutGetScom.py
+++ b/src/test/testPutGetScom.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testPutGetScom.py $
+# $Source: src/test/testPutGetScom.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/test/testPutMem.py b/src/test/testPutMem.py
index 8ba710bb..eec39f5f 100644
--- a/sbe/test/testPutMem.py
+++ b/src/test/testPutMem.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testPutMem.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testPutMem_fail.py b/src/test/testPutMem_fail.py
index 8e6c4cc4..b13032a1 100644
--- a/sbe/test/testPutMem_fail.py
+++ b/src/test/testPutMem_fail.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testPutMem_fail.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/sbe/test/testPutScomUnderMask.py b/src/test/testPutScomUnderMask.py
index 8136c68a..c8c58427 100755
--- a/sbe/test/testPutScomUnderMask.py
+++ b/src/test/testPutScomUnderMask.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testPutScomUnderMask.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/src/test/testRegAccess.xml b/src/test/testRegAccess.xml
new file mode 100755
index 00000000..a44eecac
--- /dev/null
+++ b/src/test/testRegAccess.xml
@@ -0,0 +1,46 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/test/testRegAccess.xml $                                  -->
+<!--                                                                        -->
+<!-- OpenPOWER sbe Project                                                  -->
+<!--                                                                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!--                                                                        -->
+<!--                                                                        -->
+<!-- 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                                                     -->
+<?xml version="1.0" encoding="UTF-8"?>
+
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testStopInstruction.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testPutGetRegGpr.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testPutGetRegFpr.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testPutGetRegSpr.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testStartInstruction.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+
diff --git a/sbe/test/testRegistry.py b/src/test/testRegistry.py
index b6119583..ff205dbd 100644
--- a/sbe/test/testRegistry.py
+++ b/src/test/testRegistry.py
@@ -1,4 +1,27 @@
 #!/usr/bin/python
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testRegistry.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 '''
 #############################################################
 #    @file    testClass.py
diff --git a/sbe/test/testSbeDump.py b/src/test/testSbeDump.py
index e8add7cc..72d089e0 100644
--- a/sbe/test/testSbeDump.py
+++ b/src/test/testSbeDump.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testSbeDump.py $
+# $Source: src/test/testSbeDump.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/test/testScom.xml b/src/test/testScom.xml
index f7ced6fc..d3df6196 100755
--- a/sbe/test/testScom.xml
+++ b/src/test/testScom.xml
@@ -1,12 +1,11 @@
 <!-- IBM_PROLOG_BEGIN_TAG                                                   -->
 <!-- This is an automatically generated prolog.                             -->
 <!--                                                                        -->
-<!-- $Source: sbe/test/testScom.xml $                                       -->
+<!-- $Source: src/test/testScom.xml $                                       -->
 <!--                                                                        -->
 <!-- OpenPOWER sbe Project                                                  -->
 <!--                                                                        -->
 <!-- Contributors Listed Below - COPYRIGHT 2015,2016                        -->
-<!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
 <!-- Licensed under the Apache License, Version 2.0 (the "License");        -->
diff --git a/sbe/test/testSram.py b/src/test/testSram.py
index 2ffa35ee..2b62597f 100644
--- a/sbe/test/testSram.py
+++ b/src/test/testSram.py
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testSram.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
diff --git a/src/test/testSram.xml b/src/test/testSram.xml
new file mode 100755
index 00000000..902786ad
--- /dev/null
+++ b/src/test/testSram.xml
@@ -0,0 +1,31 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/test/testSram.xml $                                       -->
+<!--                                                                        -->
+<!-- OpenPOWER sbe Project                                                  -->
+<!--                                                                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!--                                                                        -->
+<!--                                                                        -->
+<!-- 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                                                     -->
+<?xml version="1.0" encoding="UTF-8"?>
+
+      <testcase>
+          <!-- TODO RTC - 150091 - Add the Occ sram test case -->
+          <!--<simcmd>run-python-file targets/p9_nimbus/sbeTest/testSram.py</simcmd>-->
+          <!--<exitonerror>yes</exitonerror>-->
+      </testcase>
+
diff --git a/src/test/testStartInstruction.py b/src/test/testStartInstruction.py
new file mode 100644
index 00000000..d45e791c
--- /dev/null
+++ b/src/test/testStartInstruction.py
@@ -0,0 +1,64 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testStartInstruction.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+import sys
+sys.path.append("targets/p9_nimbus/sbeTest" )
+import testUtil
+err = False
+#from testWrite import *
+
+LOOP_COUNT = 1
+
+
+# Start All thread in Core0 with warn flag true
+INST_START0_ALL_TESTDATA_WITH_WARN_FLG =      [0,0,0,0x03,
+                                              0,0,0xa7,0x01,
+                                              0,1,0x20,0xf0]
+
+INST_EXPDATA  =     [0xc0,0xde,0xa7,0x01,
+                     0x0,0x0,0x0,0x0,
+                     0x00,0x0,0x0,0x03]
+
+# MAIN Test Run Starts Here...
+#-------------------------------------------------
+def main( ):
+    testUtil.runCycles( 10000000 )
+
+    #stop all thread in core0
+    testUtil.writeUsFifo( INST_START0_ALL_TESTDATA_WITH_WARN_FLG )
+    testUtil.writeEot( )
+    testUtil.readDsFifo( INST_EXPDATA )
+    testUtil.readEot( )
+
+#-------------------------------------------------
+# Calling all test code
+#-------------------------------------------------
+main()
+
+if err:
+    print ("\nTest Suite completed with error(s)")
+    #sys.exit(1)
+else:
+    print ("\nTest Suite completed with no errors")
+    #sys.exit(0);
+
diff --git a/src/test/testStopInstruction.py b/src/test/testStopInstruction.py
new file mode 100644
index 00000000..a43463c7
--- /dev/null
+++ b/src/test/testStopInstruction.py
@@ -0,0 +1,64 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/test/testStopInstruction.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+import sys
+sys.path.append("targets/p9_nimbus/sbeTest" )
+import testUtil
+err = False
+#from testWrite import *
+
+LOOP_COUNT = 1
+
+
+# Stop All thread in Core0 with warn flag true
+INST_STOP0_ALL_TESTDATA_WITH_WARN_FLG =      [0,0,0,0x03,
+                                              0,0,0xa7,0x01,
+                                              0,1,0x20,0xf1]
+
+INST_EXPDATA  =     [0xc0,0xde,0xa7,0x01,
+                     0x0,0x0,0x0,0x0,
+                     0x00,0x0,0x0,0x03]
+
+# MAIN Test Run Starts Here...
+#-------------------------------------------------
+def main( ):
+    testUtil.runCycles( 10000000 )
+
+    #stop all thread in core0
+    testUtil.writeUsFifo( INST_STOP0_ALL_TESTDATA_WITH_WARN_FLG )
+    testUtil.writeEot( )
+    testUtil.readDsFifo( INST_EXPDATA )
+    testUtil.readEot( )
+
+#-------------------------------------------------
+# Calling all test code
+#-------------------------------------------------
+main()
+
+if err:
+    print ("\nTest Suite completed with error(s)")
+    #sys.exit(1)
+else:
+    print ("\nTest Suite completed with no errors")
+    #sys.exit(0);
+
diff --git a/sbe/test/testUtil.py b/src/test/testUtil.py
index b3575625..444319ab 100644
--- a/sbe/test/testUtil.py
+++ b/src/test/testUtil.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/test/testUtil.py $
+# $Source: src/test/testUtil.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/tools/debug/simics/makefile b/src/tools/debug/simics/makefile
index 68e435db..473c0088 100755
--- a/sbe/tools/debug/simics/makefile
+++ b/src/tools/debug/simics/makefile
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/debug/simics/makefile $
+# $Source: src/tools/debug/simics/makefile $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/debug/simics/sbe_standalone.simics b/src/tools/debug/simics/sbe_standalone.simics
index 8fd3bdb0..8fd3bdb0 100755
--- a/sbe/tools/debug/simics/sbe_standalone.simics
+++ b/src/tools/debug/simics/sbe_standalone.simics
diff --git a/sbe/tools/debug/simics/sbe_startup.simics b/src/tools/debug/simics/sbe_startup.simics
index 5d466a20..5d466a20 100755
--- a/sbe/tools/debug/simics/sbe_startup.simics
+++ b/src/tools/debug/simics/sbe_startup.simics
diff --git a/sbe/tools/debug/simics/simics-debug-framework.py b/src/tools/debug/simics/simics-debug-framework.py
index cefc84ab..87d3656b 100755
--- a/sbe/tools/debug/simics/simics-debug-framework.py
+++ b/src/tools/debug/simics/simics-debug-framework.py
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/debug/simics/simics-debug-framework.py $
+# $Source: src/tools/debug/simics/simics-debug-framework.py $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/hooks/addCopyright b/src/tools/hooks/addCopyright
index 13867e7e..13867e7e 100755
--- a/sbe/tools/hooks/addCopyright
+++ b/src/tools/hooks/addCopyright
diff --git a/sbe/tools/hooks/gerrit-hostname b/src/tools/hooks/gerrit-hostname
index 4676f04e..58c68d63 100755
--- a/sbe/tools/hooks/gerrit-hostname
+++ b/src/tools/hooks/gerrit-hostname
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/hooks/gerrit-hostname $
+# $Source: src/tools/hooks/gerrit-hostname $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/hooks/post-commit b/src/tools/hooks/post-commit
index d2476f21..21751582 100755
--- a/sbe/tools/hooks/post-commit
+++ b/src/tools/hooks/post-commit
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/hooks/post-commit $
+# $Source: src/tools/hooks/post-commit $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/hooks/pre-commit b/src/tools/hooks/pre-commit
index 3cccf64f..9e05432f 100755
--- a/sbe/tools/hooks/pre-commit
+++ b/src/tools/hooks/pre-commit
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/hooks/pre-commit $
+# $Source: src/tools/hooks/pre-commit $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/hooks/pre-commit-actions b/src/tools/hooks/pre-commit-actions
index b1c1ecfd..821e78de 100755
--- a/sbe/tools/hooks/pre-commit-actions
+++ b/src/tools/hooks/pre-commit-actions
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/hooks/pre-commit-actions $
+# $Source: src/tools/hooks/pre-commit-actions $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/hooks/pre-commit-prologs b/src/tools/hooks/pre-commit-prologs
index 8d8245f1..eb53e316 100755
--- a/sbe/tools/hooks/pre-commit-prologs
+++ b/src/tools/hooks/pre-commit-prologs
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/hooks/pre-commit-prologs $
+# $Source: src/tools/hooks/pre-commit-prologs $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/hooks/setupgithooks.sh b/src/tools/hooks/setupgithooks.sh
index 10d6a44f..ae38b253 100755
--- a/sbe/tools/hooks/setupgithooks.sh
+++ b/src/tools/hooks/setupgithooks.sh
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/hooks/setupgithooks.sh $
+# $Source: src/tools/hooks/setupgithooks.sh $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/hooks/verify-commit b/src/tools/hooks/verify-commit
index 8f54439f..68beebf5 100755
--- a/sbe/tools/hooks/verify-commit
+++ b/src/tools/hooks/verify-commit
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/hooks/verify-commit $
+# $Source: src/tools/hooks/verify-commit $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/image/Makefile b/src/tools/image/Makefile
index f93068a2..fab89e66 100644
--- a/sbe/tools/image/Makefile
+++ b/src/tools/image/Makefile
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/image/Makefile $
+# $Source: src/tools/image/Makefile $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/image/sbe_default_tool.c b/src/tools/image/sbe_default_tool.c
index 9d8daee8..ae2bbf53 100644
--- a/sbe/tools/image/sbe_default_tool.c
+++ b/src/tools/image/sbe_default_tool.c
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/tools/image/sbe_default_tool.c $                          */
+/* $Source: src/tools/image/sbe_default_tool.c $                          */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/tools/ppetracepp/Makefile b/src/tools/ppetracepp/Makefile
index 77b8ae8f..eec6da6a 100644
--- a/sbe/tools/ppetracepp/Makefile
+++ b/src/tools/ppetracepp/Makefile
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/ppetracepp/Makefile $
+# $Source: src/tools/ppetracepp/Makefile $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/ppetracepp/cmvc/makefile b/src/tools/ppetracepp/cmvc/makefile
index 19c74f22..cf2ad437 100644
--- a/sbe/tools/ppetracepp/cmvc/makefile
+++ b/src/tools/ppetracepp/cmvc/makefile
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/ppetracepp/cmvc/makefile $
+# $Source: src/tools/ppetracepp/cmvc/makefile $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/ppetracepp/jhash.h b/src/tools/ppetracepp/jhash.h
index 087dfb68..0dcc3bf3 100755
--- a/sbe/tools/ppetracepp/jhash.h
+++ b/src/tools/ppetracepp/jhash.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/tools/ppetracepp/jhash.h $                                */
+/* $Source: src/tools/ppetracepp/jhash.h $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/tools/ppetracepp/ppe2fsp.c b/src/tools/ppetracepp/ppe2fsp.c
index 469ceced..d681b147 100755
--- a/sbe/tools/ppetracepp/ppe2fsp.c
+++ b/src/tools/ppetracepp/ppe2fsp.c
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/tools/ppetracepp/ppe2fsp.c $                              */
+/* $Source: src/tools/ppetracepp/ppe2fsp.c $                              */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/tools/ppetracepp/ppe2fsp.h b/src/tools/ppetracepp/ppe2fsp.h
index 6f559572..2abb146c 100644
--- a/sbe/tools/ppetracepp/ppe2fsp.h
+++ b/src/tools/ppetracepp/ppe2fsp.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/tools/ppetracepp/ppe2fsp.h $                              */
+/* $Source: src/tools/ppetracepp/ppe2fsp.h $                              */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/tools/ppetracepp/ppe2fsp_cmd.c b/src/tools/ppetracepp/ppe2fsp_cmd.c
index 575eaa5f..c36d735c 100644
--- a/sbe/tools/ppetracepp/ppe2fsp_cmd.c
+++ b/src/tools/ppetracepp/ppe2fsp_cmd.c
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/tools/ppetracepp/ppe2fsp_cmd.c $                          */
+/* $Source: src/tools/ppetracepp/ppe2fsp_cmd.c $                          */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/tools/ppetracepp/ppetracepp.C b/src/tools/ppetracepp/ppetracepp.C
index d0bf5c09..2829e4dd 100755
--- a/sbe/tools/ppetracepp/ppetracepp.C
+++ b/src/tools/ppetracepp/ppetracepp.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/tools/ppetracepp/ppetracepp.C $                           */
+/* $Source: src/tools/ppetracepp/ppetracepp.C $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/tools/ppetracepp/trac_interface.h b/src/tools/ppetracepp/trac_interface.h
index 05f447ea..2ff9dff0 100755
--- a/sbe/tools/ppetracepp/trac_interface.h
+++ b/src/tools/ppetracepp/trac_interface.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/tools/ppetracepp/trac_interface.h $                       */
+/* $Source: src/tools/ppetracepp/trac_interface.h $                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
diff --git a/sbe/tools/ppetracepp/tracehash.pl b/src/tools/ppetracepp/tracehash.pl
index 8617559f..8855adee 100755
--- a/sbe/tools/ppetracepp/tracehash.pl
+++ b/src/tools/ppetracepp/tracehash.pl
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/ppetracepp/tracehash.pl $
+# $Source: src/tools/ppetracepp/tracehash.pl $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/scripts/parseErrorInfo.pl b/src/tools/scripts/parseErrorInfo.pl
index e7c220a7..839a836c 100755
--- a/sbe/tools/scripts/parseErrorInfo.pl
+++ b/src/tools/scripts/parseErrorInfo.pl
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/scripts/parseErrorInfo.pl $
+# $Source: src/tools/scripts/parseErrorInfo.pl $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/scripts/ppeCreateAttrGetSetMacros.pl b/src/tools/scripts/ppeCreateAttrGetSetMacros.pl
index 651354d1..72ae2aa8 100755
--- a/sbe/tools/scripts/ppeCreateAttrGetSetMacros.pl
+++ b/src/tools/scripts/ppeCreateAttrGetSetMacros.pl
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/scripts/ppeCreateAttrGetSetMacros.pl $
+# $Source: src/tools/scripts/ppeCreateAttrGetSetMacros.pl $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/scripts/ppeCreateIfAttrService.pl b/src/tools/scripts/ppeCreateIfAttrService.pl
index 898aaacd..1202505a 100755
--- a/sbe/tools/scripts/ppeCreateIfAttrService.pl
+++ b/src/tools/scripts/ppeCreateIfAttrService.pl
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/scripts/ppeCreateIfAttrService.pl $
+# $Source: src/tools/scripts/ppeCreateIfAttrService.pl $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/scripts/ppeParseAttrGetSetMacros.pl b/src/tools/scripts/ppeParseAttrGetSetMacros.pl
index 8466f3c9..013cad96 100644
--- a/sbe/tools/scripts/ppeParseAttrGetSetMacros.pl
+++ b/src/tools/scripts/ppeParseAttrGetSetMacros.pl
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/scripts/ppeParseAttrGetSetMacros.pl $
+# $Source: src/tools/scripts/ppeParseAttrGetSetMacros.pl $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/scripts/ppeParseAttributeInfo.pl b/src/tools/scripts/ppeParseAttributeInfo.pl
index 7f381f2b..1b881a4d 100755
--- a/sbe/tools/scripts/ppeParseAttributeInfo.pl
+++ b/src/tools/scripts/ppeParseAttributeInfo.pl
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/scripts/ppeParseAttributeInfo.pl $
+# $Source: src/tools/scripts/ppeParseAttributeInfo.pl $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/scripts/ppeParseProcSbeFixed.pl b/src/tools/scripts/ppeParseProcSbeFixed.pl
index ed1cd2ee..4279ca3b 100755
--- a/sbe/tools/scripts/ppeParseProcSbeFixed.pl
+++ b/src/tools/scripts/ppeParseProcSbeFixed.pl
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/scripts/ppeParseProcSbeFixed.pl $
+# $Source: src/tools/scripts/ppeParseProcSbeFixed.pl $
 #
 # OpenPOWER sbe Project
 #
diff --git a/sbe/tools/scripts/ppeSetFixed.pl b/src/tools/scripts/ppeSetFixed.pl
index 1e779e70..ab92ec42 100755
--- a/sbe/tools/scripts/ppeSetFixed.pl
+++ b/src/tools/scripts/ppeSetFixed.pl
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/tools/scripts/ppeSetFixed.pl $
+# $Source: src/tools/scripts/ppeSetFixed.pl $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/tools/scripts/src/fapi2PlatAttributeService.H b/src/tools/scripts/src/fapi2PlatAttributeService.H
index 0d53a134..7c992d65 100644
--- a/sbe/tools/scripts/src/fapi2PlatAttributeService.H
+++ b/src/tools/scripts/src/fapi2PlatAttributeService.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: sbe/tools/scripts/src/fapi2PlatAttributeService.H $           */
+/* $Source: src/tools/scripts/src/fapi2PlatAttributeService.H $           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
author	Shakeeb <shakeebbk@in.ibm.com>	2016-08-27 10:50:49 -0500
committer	Sachin Gupta <sgupta2m@in.ibm.com>	2016-08-30 06:01:06 -0400
commit	f2d94b5f809410300fe10dc9d0786790018463a0 (patch)
tree	467f90297b0eb7c5c6672653d778ed4734c0d5a3
parent	49b557dcae32250e8e06c4de895c0b7ba0e8009e (diff)
download	talos-sbe-f2d94b5f809410300fe10dc9d0786790018463a0.tar.gz talos-sbe-f2d94b5f809410300fe10dc9d0786790018463a0.zip