Implemented PSR-4 compliance. Added additional tests