Moving packages to generic one.