Fixed optimising start time measurement and moved query vertices into their own package.