ClickProbCalc updates

Moved class files to be consistent with package, added to
ClickProbCalculator