Reorganize folders.

- code cleanup.
- reorganize folders.