Reorganizing/updating deps to latest for shrinkwrap.
Moved out unused components. Moved out mixins to cbw.