Move classes on good package, deprecate classes on bad package