Move tests into grouped folders