code restructure

Merged Vasudevan, Rama K requested to merge unity_dev_local into master

Created by: ssomnath

Merge request reports