Move query template classes to more appropriate folders