#1 I scripted the whole thing from a working clean membership folder.   So I only need to run this single SQL script and it does everything for me so that's one solution.

#2 I was doing this primarily for backup reasons.  I mean there is a DATA folder after all.   It would make sense that all of a customer's data would be under the same tree doesn't it?