Refactoring MOCHC and related classes
Included: HUXCrossoverTest
MOCHC tested, reorganizing packages