Deployment Service refactoring
Merging 2 deployment service classes into 1