Changed packaging to match needed structure