Added interface for simple queries, moved queries to their own files
To be tested
writing tests for simple queries