Small cleanup in code.
Added Parser deps to Server.
First implementation of parsing queries.