renamed and restructured test directory