From the outset the code looks ok. I would leave the Change and Query methods inside the class. If the class does get abit too much then partial the class into sensible files. Also, as a side note, look up SOLID it will help you to break down and structure your code if appropriate.
Geek
- 439
- 2
- 6