Let's move these new classes to internal packages.