Move mchoicefield to a common package
Correctly handle the months and dayweeks for scrub