added new file structure for creating querys and querybuilder