adjus code
modify file names
Merge pull request #10 from nutty898/master

modify classes names