New phpecc refactor

Reverted the CS changes, this branch is for the refactor..