Cleaned up cluster package layout

I don't think it adds any value. You could paste this to many other methods in various classes.