Bring in from MultirExperiments
Remove old classes
Fix old imports
Preparing for combined Maven snapshot