rename refactor-ccap-* files to show the diffs more clearly
add a couple base-content alternatives for discussion