Cleaned up cluster package layout

Good point. Fixed