Cleanup src dir
Revert "Cleanup src dir"

This reverts commit ad3eee74c01d1f1a81317aff4947c51431f875c7.
Cleanup src dir
Set new src dir
Merge pull request #2 from tetsuwo/hotfix-cleanup-dir

Hotfix cleanup dir