Move tests into same directory structure used by src