Integration of entropy calculator related classes