Changed packaging to bundle