Temporary move toolkit & networkquery to project for fast changing