Cleaned up cluster package layout