Structured MacroSimulator package into subpackages
Added preliminary multi-class extension
Added testcases
Merge remote-tracking branch 'origin/master'