Switched to PSR-4
Added branch-alias