Refactor experimentClass to category
Remove a couple of old main methods
Merge branch 'refactor/experiment-category'