[DS] change folder structure.
[DS] change folder structure.