Merge pull request #6 from dochang/next

Improvements
Change directory structure and configuration file.