Add Cluster into top level package