CLOUDIFY-1768 fixed imports due to refactroing
Revert "CLOUDIFY-1768 fixed imports due to refactroing"

This reverts commit 2f7a2f2ac74808c0b1a06c642cf5483d51810b52.