Update for psr-0 and add composer