Changed directory structure to psr-4
Merge remote-tracking branch 'origin/master'