Renamed a lot and some little improvements (PSR-0, ZF2 compatibility)