PSR-4 refactor
Updated docs