Changed classmap to PSR-0