Move AWS stuff to cluster sub-project