Multisite Configuration Issue

I'm working on setting up my second Multisite installation using subdomains and domain mapping. The first one (using 3.4.? I think) went OK and I'm following the same instructions for this one using 3.5.1. I manually created my public_html/wp-content/blogs.dir before editing wp-config and htaccess but this time after finishing my setup and creating sites 2 and 3, I find the uploads are being put in public_html/wp-content/uploads/sites/2/2013 and -----/3/2013 etc. I scrubbed the installation and installed a second time with the same results. Upon minor testing sites 2 and 3 seem to be functioning properly but is this directory structure OK? Has something changed recently or is something wrong with my setup?

Any suggestions would be appreciated.