Adding categories for the Pi viewer, refactored scrapers