CLOUDIFY-1335 organize imports