Restructure test directory