cleanup, and started refactoring

Started to update CloudDistribution