Splitting Query and URL into own files