More Site directory changes.  Very tricky business here.
Now supporting subsites in subdirectories in subdomains. O_o