[Update] #21505 Create subfolders under src and test