modify directory, name
Merge pull request #25 from rass1004/master

modify directory, name