Converted to PSR-4
Added php-cs-fixer and ran fix on module
Fix merge conflict