Changed structure to PSR-4