put code of commonSubstructure into a class CommonSubstructureAnnotator
moved test cases of CommonSubstructure to CommonSubstructureAnnotator
moved code and test cases of setAndOr() method to AndOrTagSetter module
Modified Learner and LearnerTest accordingly