All Factor types moved to Factor.java