Merge pull request #48 from lite3/refactoring

Adjust the directory structure