Moved query specs into sub dir