Maybe you could split Farm changes into a separate mod?
Whew, that'd be a loooot of code detangling. I'm not saying it's impossible, but it's not likely in the near future as a lot of the mod's features rely heavily on components from the various areas it touches (like the Farm).
