Cleaning up and removing the multi-tenancy information in directories,th...

...is will ultimately be its own design strategy doc