Split off the common package to a separate project.
Also renamed the packages.