Fix mistaken change to top level packages