Refactoring of deploy

Change-Id: I251f5924c0562339055739c408d6dc568160f857