Sync up with refactoring of entropy package
Sync up with refactoring of entropy package

rzel/kanzi,sharkkid/kanzi,rukistar/kanzi,rukistar/kanzi,rukistar/kanzi,Sputuks3/kanzi,rzel/kanzi,sharkkid/kanzi,rzel/kanzi,Sputuks3/kanzi,Sputuks3/kanzi,sharkkid/kanzi