restructure test directory