Updates

- Fix Composer.json
- Update Dependency Files
- Documentation update
- Move tests to correctly PSR-2 named directory