Cleaned up cluster package layout
Processed review comments
Minor layout improvements
Merge pull request #3751 from pveentjer/cleanup/3.x/cluster-package-layout

Cleaned up cluster package layout