Updated Composer to match psr-0 compliance