CLOUDIFY-1827 Fix package naming convention. Fixes problems with InteliJ autoimport