rearranging classes for more flexibility

rearranging classes to resolve unnecessary specificity