refactor bindings for psr-0