Attribute refactor - move cluster name and memory into 'cluster' subkey; move buckets back to top-level