Move tests into directory structure proper, add phpcs to the list of watch tasks