commit for middle version of refactor

Change-Id: I6fc7f2ef23254e590ad4c66f4d2cdabbaa094c19
Signed-off-by: li levi <levi.li@sap.com>