rename class and test method name
rename and move file
Merge pull request #23 from ceeram/psr4-fix

Psr4 fix