Started moving BarrelCDF.java over to using the new component classes.