Added initial kobject biding and code cleanup

Change-Id: I8f6ca072462db464920c92ffb1d18bcaa72da4e1