Move system queries into their own folder