restructuring test directory