Update lib to match PSR-0 & 1