Added support for datacenters in subfolders