Done some refactoring. Started to implement the cloud service manamgent client.