you're right. I will re-arrange the files accordingly.
thanks.