There is no 'right' way to do it. The only rule is do whatever makes it easiest for you to maintain. Your directory structure looks find from what little information you've given.
If you find that the directory structure you're using is causing you pain or making things hard to keep organized, you can always shuffle the files around.