move test to new folder structure