Rearrange test and bench files