arrange tests into folder