Change haserl, uniformize package makefile