Updates to match PSR-0 composer