restructure TODO and test dir