The right way is the way it works for you.
Thanks for replying. It would be more helpful if you share your experiences of your folder structure. That would make me see whether I'm going wrong or right.
I personally would prefer the first structure that you shared. I do believe you will get more inputs from our experts in forum.