Create your new "data" share with your sub folder structure according to trash guides then using rsync to copy or move your data from your current shares to the new "data" share in their respected folders.
I followed that guide a while back too. Here is my current folder structure.
Hopefully it won't seem too complicated but I can explain why I have mines set up like that if you like.