better naming in the support dir
adding dependency mixin; splitting out query config model