Empirical

Refactored Empirical distribution.