restructure test package