Updates & Re-factors Service & Client layer for Login Issue;

Signed-off-by: ashwinh <ashwinh@cybage.com>