Rename DataModel namespace to Query (closes #1)