reviewed Conso&Prod, changed package name