remove old classes fix some names
add producers