Moved statistics related stuff from distribution to stat
Some more renaming