This commit is a pure refactoring, no semantic changes. Submitting as separate PR at @kosmikus request. Tihs moves `ConflictSet` and `Var` into their own modules. (cherry picked from commit 1a1f1f9b)