Cleaning up and removing the multi-tenancy information in directories,this will ultimately be its own design strategy doc