add more structure to tests dir