Updated ch package makefiles