Rearrange subfolders in spec directory