Move fvOptions out of their subdirectory