Move CHD into its own package.