Improvements

1. Moved QueryMatcherPart and QueryOperatorPart into separate files.
2. Deleted QueryBuilder diagram.
Cleanup and reformatted.