Blueprint: refactoring-for-fuelclient

Change-Id: I3da27c6c0ae097451c496d2e3d20fd32361d61e3