Remove requirement to use classmap and instead use PSR-0