First step in revamping component architecture in preperation for fixing the CBR implementation. Files only now include the declaration for the component they need - not all of them.