I can't remember why I moved AMOAFModel & DVOAFModel. Probably got misguided by another issue.
Going to revert them.