Move code to original packages to avoid breaking backward compatibility