restructuring test directories
restructuring test directories