Update composer.json
Remove redundant class files
Fixup namespacing issues
Whitespace
Update README