Moved some code around
Moved scraper code fragments to appropriate place