Change organization of Test folder