Restructure for cluster namespace