>> Refactor into psr-0, stage 1
>> Refactor into psr-0, stage 2