Add entropy measuring

also change the naming system