Review and Refactor of PSR HTTP ('13 and '14) incubation