renamed a few files and classes
Merge pull request #2 from yukaritan/test0.1

renamed a few files and classes