Refactoring to add DeploymentServer and PlatformServer Entity classes