Split the file holding the queries into 3 files and moved them to new subfolder - need to fix the code related to those queries