Refactoring WebQuery and REST query
Adding an extra file in there
Adding UML diagrams for version 1