Moved CQ2 to its own package.