Move to a better package system