Refactor of Parent process in progress

Change-Id: I47212f67ebb2d8a5c0f293817aa3628ab31ffc9f