Moved queries to folder