Moved more queries to their own files