move all test dirs to subdirectory

it was getting a bit confusing with the previous mishmash