Moved fetching code into own project