moved things to src/ and some preliminary work on setting queries