re-design dir structure.