psr-0 refacoring