Switch to PSR-4
Merge branch 'develop'

* develop:
  Switch to PSR-4