move to PSR4 and others
return straight
Merge pull request #162 from cordoval/162-move-to-psr4-and-clean-up

move to psr4 and clean up