AC-FOVE: Distribution refactoring

- Using composition instead of inheritance to model Distribution