go PSR4
cleaning up
removing some more
add auotum dev-master as per comment
Merge pull request #142 from cordoval/removing-old-stuff

more improvements