I'm not sure what impact having a sub-folder will have our visual testing. I know cartopy can handle it, but not 100% that the standard mpl image testing functionality can. We can cross that bridge when we get to it though.