Change shfs, uniformize package makefile