More work on changing to class TBSL from SPARQLTemplatedBasedLearner2. Renamed packages to be more logical.