Move factorization-related code to the new module
Make the comments the same
More reorganization