Cleanup
Support psr-4