Fix package names and references to Factor classes that were moved back

to algorithm.factored

Test errors were all of the non-deterministic variety, although some seemed far off.