phpcs fixes for src

Change everything over to psr2