Move Controller / Model into Query Resource