Reorganise scraping