From fdc370f6569f3c36a13e2623ac2f04377d7e86a5 Mon Sep 17 00:00:00 2001 From: Raphael Roberts Date: Wed, 15 May 2019 23:07:48 -0500 Subject: [PATCH] Fixed style of scraping components and moved them to submodule 'scraping' --- restscrape/cache.py | 17 -------- restscrape/scraper.py | 34 --------------- restscrape/{ => scraping}/__init__.py | 38 +++++++++-------- restscrape/{ => scraping}/browser.py | 30 ++++++++----- restscrape/{ => scraping}/proxy.py | 25 +++++++---- restscrape/scraping/scraper.py | 40 ++++++++++++++++++ .../{ => scraping}/uBlock/1p-filters.html | 0 .../{ => scraping}/uBlock/3p-filters.html | 0 restscrape/{ => scraping}/uBlock/LICENSE.txt | 0 .../uBlock/_locales/ar/messages.json | 0 .../uBlock/_locales/az/messages.json | 0 .../uBlock/_locales/bg/messages.json | 0 .../uBlock/_locales/bn/messages.json | 0 .../uBlock/_locales/ca/messages.json | 0 .../uBlock/_locales/cs/messages.json | 0 .../uBlock/_locales/cv/messages.json | 0 .../uBlock/_locales/da/messages.json | 0 .../uBlock/_locales/de/messages.json | 0 .../uBlock/_locales/el/messages.json | 0 .../uBlock/_locales/en/messages.json | 0 .../uBlock/_locales/eo/messages.json | 0 .../uBlock/_locales/es/messages.json | 0 .../uBlock/_locales/et/messages.json | 0 .../uBlock/_locales/eu/messages.json | 0 .../uBlock/_locales/fa/messages.json | 0 .../uBlock/_locales/fi/messages.json | 0 .../uBlock/_locales/fil/messages.json | 0 .../uBlock/_locales/fr/messages.json | 0 .../uBlock/_locales/fy/messages.json | 0 .../uBlock/_locales/gl/messages.json | 0 .../uBlock/_locales/he/messages.json | 0 .../uBlock/_locales/hi/messages.json | 0 .../uBlock/_locales/hr/messages.json | 0 .../uBlock/_locales/hu/messages.json | 0 .../uBlock/_locales/id/messages.json | 0 .../uBlock/_locales/it/messages.json | 0 .../uBlock/_locales/ja/messages.json | 0 .../uBlock/_locales/ka/messages.json | 0 .../uBlock/_locales/kk/messages.json | 0 .../uBlock/_locales/kn/messages.json | 0 .../uBlock/_locales/ko/messages.json | 0 .../uBlock/_locales/lt/messages.json | 0 .../uBlock/_locales/lv/messages.json | 0 .../uBlock/_locales/ml/messages.json | 0 .../uBlock/_locales/mr/messages.json | 0 .../uBlock/_locales/ms/messages.json | 0 .../uBlock/_locales/nb/messages.json | 0 .../uBlock/_locales/nl/messages.json | 0 .../uBlock/_locales/no/messages.json | 0 .../uBlock/_locales/pl/messages.json | 0 .../uBlock/_locales/pt_BR/messages.json | 0 .../uBlock/_locales/pt_PT/messages.json | 0 .../uBlock/_locales/ro/messages.json | 0 .../uBlock/_locales/ru/messages.json | 0 .../uBlock/_locales/sk/messages.json | 0 .../uBlock/_locales/sl/messages.json | 0 .../uBlock/_locales/sq/messages.json | 0 .../uBlock/_locales/sr/messages.json | 0 .../uBlock/_locales/sv/messages.json | 0 .../uBlock/_locales/ta/messages.json | 0 .../uBlock/_locales/te/messages.json | 0 .../uBlock/_locales/th/messages.json | 0 .../uBlock/_locales/tr/messages.json | 0 .../uBlock/_locales/uk/messages.json | 0 .../uBlock/_locales/vi/messages.json | 0 .../uBlock/_locales/zh_CN/messages.json | 0 .../uBlock/_locales/zh_TW/messages.json | 0 restscrape/{ => scraping}/uBlock/about.html | 0 .../uBlock/advanced-settings.html | 0 .../{ => scraping}/uBlock/asset-viewer.html | 0 .../{ => scraping}/uBlock/assets/assets.json | 0 .../easylist.txt | 0 .../easyprivacy.txt | 0 .../files/README.md | 0 .../files/justdomains | 0 .../thirdparties/pgl.yoyo.org/as/README.md | 0 .../thirdparties/pgl.yoyo.org/as/serverlist | 0 .../list/effective_tld_names.dat | 0 .../hostslist/README.md | 0 .../hostslist/hosts.txt | 0 .../uBlock/assets/ublock/badware.txt | 0 .../uBlock/assets/ublock/experimental.txt | 0 .../uBlock/assets/ublock/filters.txt | 0 .../uBlock/assets/ublock/privacy.txt | 0 .../uBlock/assets/ublock/resource-abuse.txt | 0 .../uBlock/assets/ublock/resources.txt | 0 .../uBlock/assets/ublock/unbreak.txt | 0 .../{ => scraping}/uBlock/background.html | 0 .../{ => scraping}/uBlock/cloud-ui.html | 0 .../{ => scraping}/uBlock/css/1p-filters.css | 0 .../{ => scraping}/uBlock/css/3p-filters.css | 0 .../uBlock/css/advanced-settings.css | 0 .../{ => scraping}/uBlock/css/benchmarks.css | 0 .../{ => scraping}/uBlock/css/cloud-ui.css | 0 .../{ => scraping}/uBlock/css/codemirror.css | 0 .../{ => scraping}/uBlock/css/common.css | 0 .../uBlock/css/dashboard-common.css | 0 .../{ => scraping}/uBlock/css/dashboard.css | 0 .../uBlock/css/document-blocked.css | 0 .../{ => scraping}/uBlock/css/dyna-rules.css | 0 .../{ => scraping}/uBlock/css/fa-icons.css | 0 .../{ => scraping}/uBlock/css/fonts/OFL.txt | 0 .../uBlock/css/fonts/fontawesome-webfont.ttf | Bin .../uBlock/css/logger-ui-inspector.css | 0 .../{ => scraping}/uBlock/css/logger-ui.css | 0 .../{ => scraping}/uBlock/css/popup.css | 0 .../{ => scraping}/uBlock/css/settings.css | 0 .../{ => scraping}/uBlock/css/shortcuts.css | 0 .../{ => scraping}/uBlock/css/whitelist.css | 0 .../{ => scraping}/uBlock/dashboard.html | 0 .../uBlock/document-blocked.html | 0 .../{ => scraping}/uBlock/dyna-rules.html | 0 restscrape/{ => scraping}/uBlock/epicker.html | 0 .../{ => scraping}/uBlock/img/cloud.png | Bin .../uBlock/img/fontawesome/LICENSE.txt | 0 .../img/fontawesome/fontawesome-defs.svg | 0 .../{ => scraping}/uBlock/img/help16.png | Bin .../{ => scraping}/uBlock/img/icon_128.png | Bin .../{ => scraping}/uBlock/img/icon_16-off.png | Bin .../{ => scraping}/uBlock/img/icon_16.png | Bin .../{ => scraping}/uBlock/img/icon_32-off.png | Bin .../{ => scraping}/uBlock/img/icon_32.png | Bin .../{ => scraping}/uBlock/img/icon_64.png | Bin .../{ => scraping}/uBlock/img/ublock-defs.svg | 0 .../{ => scraping}/uBlock/img/ublock.svg | 0 .../uBlock/is-webrtc-supported.html | 0 .../{ => scraping}/uBlock/js/1p-filters.js | 0 .../{ => scraping}/uBlock/js/3p-filters.js | 0 restscrape/{ => scraping}/uBlock/js/about.js | 0 .../uBlock/js/advanced-settings.js | 0 .../{ => scraping}/uBlock/js/asset-viewer.js | 0 restscrape/{ => scraping}/uBlock/js/assets.js | 0 .../{ => scraping}/uBlock/js/background.js | 0 .../{ => scraping}/uBlock/js/cachestorage.js | 0 .../{ => scraping}/uBlock/js/cloud-ui.js | 0 .../uBlock/js/codemirror/search.js | 0 .../js/codemirror/ubo-static-filtering.js | 0 .../{ => scraping}/uBlock/js/commands.js | 0 .../{ => scraping}/uBlock/js/contentscript.js | 0 .../{ => scraping}/uBlock/js/contextmenu.js | 0 .../uBlock/js/cosmetic-filtering.js | 0 .../uBlock/js/dashboard-common.js | 0 .../{ => scraping}/uBlock/js/dashboard.js | 0 .../uBlock/js/document-blocked.js | 0 .../{ => scraping}/uBlock/js/dyna-rules.js | 0 .../uBlock/js/dynamic-net-filtering.js | 0 .../{ => scraping}/uBlock/js/fa-icons.js | 0 .../uBlock/js/filtering-context.js | 0 .../{ => scraping}/uBlock/js/hnswitches.js | 0 restscrape/{ => scraping}/uBlock/js/hntrie.js | 0 .../uBlock/js/html-filtering.js | 0 restscrape/{ => scraping}/uBlock/js/i18n.js | 0 .../uBlock/js/is-webrtc-supported.js | 0 .../uBlock/js/logger-ui-inspector.js | 0 .../{ => scraping}/uBlock/js/logger-ui.js | 0 restscrape/{ => scraping}/uBlock/js/logger.js | 0 restscrape/{ => scraping}/uBlock/js/lz4.js | 0 .../{ => scraping}/uBlock/js/messaging.js | 0 .../{ => scraping}/uBlock/js/pagestore.js | 0 restscrape/{ => scraping}/uBlock/js/popup.js | 0 .../uBlock/js/redirect-engine.js | 0 .../uBlock/js/reverselookup-worker.js | 0 .../{ => scraping}/uBlock/js/reverselookup.js | 0 .../uBlock/js/scriptlet-filtering.js | 0 .../uBlock/js/scriptlets/cosmetic-logger.js | 0 .../uBlock/js/scriptlets/cosmetic-off.js | 0 .../uBlock/js/scriptlets/cosmetic-on.js | 0 .../uBlock/js/scriptlets/dom-inspector.js | 0 .../uBlock/js/scriptlets/dom-survey.js | 0 .../uBlock/js/scriptlets/element-picker.js | 0 .../js/scriptlets/inlinescript-logger.js | 0 .../js/scriptlets/load-large-media-all.js | 0 .../load-large-media-interactive.js | 0 .../uBlock/js/scriptlets/noscript-spoof.js | 0 .../scriptlets/should-inject-contentscript.js | 0 .../uBlock/js/scriptlets/subscriber.js | 0 .../{ => scraping}/uBlock/js/settings.js | 0 .../{ => scraping}/uBlock/js/shortcuts.js | 0 restscrape/{ => scraping}/uBlock/js/start.js | 0 .../uBlock/js/static-ext-filtering.js | 0 .../uBlock/js/static-net-filtering.js | 0 .../{ => scraping}/uBlock/js/storage.js | 0 restscrape/{ => scraping}/uBlock/js/tab.js | 0 .../{ => scraping}/uBlock/js/text-encode.js | 0 .../{ => scraping}/uBlock/js/traffic.js | 0 restscrape/{ => scraping}/uBlock/js/ublock.js | 0 restscrape/{ => scraping}/uBlock/js/udom.js | 0 .../{ => scraping}/uBlock/js/uritools.js | 0 .../uBlock/js/url-net-filtering.js | 0 restscrape/{ => scraping}/uBlock/js/utils.js | 0 .../uBlock/js/vapi-background.js | 0 .../{ => scraping}/uBlock/js/vapi-client.js | 0 .../{ => scraping}/uBlock/js/vapi-common.js | 0 .../uBlock/js/vapi-webrequest.js | 0 restscrape/{ => scraping}/uBlock/js/vapi.js | 0 .../{ => scraping}/uBlock/js/wasm/README.md | 0 .../{ => scraping}/uBlock/js/wasm/hntrie.wasm | Bin .../{ => scraping}/uBlock/js/wasm/hntrie.wat | 0 .../{ => scraping}/uBlock/js/whitelist.js | 0 .../uBlock/lib/codemirror/LICENSE | 0 .../uBlock/lib/codemirror/README.md | 0 .../lib/codemirror/addon/display/panel.js | 0 .../lib/codemirror/addon/merge/merge.css | 0 .../lib/codemirror/addon/merge/merge.js | 0 .../addon/scroll/annotatescrollbar.js | 0 .../addon/search/matchesonscrollbar.css | 0 .../addon/search/matchesonscrollbar.js | 0 .../codemirror/addon/search/searchcursor.js | 0 .../codemirror/addon/selection/active-line.js | 0 .../{ => scraping}/uBlock/lib/diff/README.md | 0 .../uBlock/lib/diff/swatinem_diff.js | 0 .../{ => scraping}/uBlock/lib/lz4/README.md | 0 .../uBlock/lib/lz4/lz4-block-codec-any.js | 0 .../uBlock/lib/lz4/lz4-block-codec-js.js | 0 .../uBlock/lib/lz4/lz4-block-codec-wasm.js | 0 .../uBlock/lib/lz4/lz4-block-codec.wasm | Bin .../uBlock/lib/lz4/lz4-block-codec.wat | 0 .../uBlock/lib/publicsuffixlist.js | 0 .../{ => scraping}/uBlock/lib/punycode.js | 0 .../{ => scraping}/uBlock/logger-ui.html | 0 .../uBlock/managed_storage.json | 0 .../{ => scraping}/uBlock/manifest.json | 0 restscrape/{ => scraping}/uBlock/popup.html | 0 .../{ => scraping}/uBlock/settings.html | 0 .../{ => scraping}/uBlock/shortcuts.html | 0 .../049ba9cad461c1d73512654fa0505f24.js | 0 .../08bccca4f0b22bca18001da690ef0f6b.png | Bin .../22e03f0a589e9c48b3916f91090da76a.gif | Bin .../2b73c2782126b83faf6ba7d4b30919b5.js | 0 .../4bf7b393d3b1b313682eed660b3f79f6.js | 0 .../52cd82bf4163cf85a2e578f33f3a1c5b.js | 0 .../59abf2914ae612c22ca7faecfa5d19e9.js | 0 .../59fb24a2d12455d15bea20980e8a6801.js | 0 .../649775b1644161f11f034be886082fac.mp3 | Bin .../70a7e8510b6031f0d7d6dbf4a6e70c3e.png | Bin .../7e270994feadd29c8f6cfe846ab7769c.txt | 0 .../7f7127b0b406fcd719b081372b7ce451.mp4 | Bin .../8f846d6d2abbdbb39219191e407f6cce.js | 0 .../9146d832a0025daf20ec16a48b909c81.js | 0 .../web_accessible_resources/README.txt | 0 .../acc6e24fce1dcf79ba6a698dc09b0d99.js | 0 .../add5ec8fb7834916ff54b56578dc07c4.js | 0 .../af3c919ee9a3d97f5dedaf2f8bec146a.js | 0 .../b2cc2af4a6c9cac1992c377747d98036.js | 0 .../b4fa32e8497f63fd2ca54c1fdae6d273.js | 0 .../b71d4af3b115e6d5b5b02c18f901e313.js | 0 .../bed5a2e0e77ce019b181b365896fd84f.js | 0 .../bf451d42525251f69895201650a9c1ea.js | 0 .../c2c7eb5240aa19439b7ebbf38d6789e5.js | 0 .../c2e1fb0f4c1450d9be9884c583747d83.js | 0 .../c3f690ad3b4d5a1b308d1461a9978749.js | 0 .../c77d1c55bb336440de0677e841870dd2.png | Bin .../cb5ec55f9d28a46c647c9aa7c48fd158.js | 0 .../d363525161c56887ceebe5e72ed4ef31.js | 0 .../f1df24e1f123b1137cec098dab038b34.js | 0 .../f643260136b645d95fdc78fc46e9d00a.js | 0 .../f6f25816c1c5ce3d465f4cd083539931.js | 0 .../f97120ae9a642fea9bf2dc61b0dac5c3.js | 0 .../web_accessible_resources/imported.txt | 0 .../web_accessible_resources/to-import.txt | 0 .../{ => scraping}/uBlock/whitelist.html | 0 261 files changed, 97 insertions(+), 87 deletions(-) delete mode 100644 restscrape/cache.py delete mode 100644 restscrape/scraper.py rename restscrape/{ => scraping}/__init__.py (53%) rename restscrape/{ => scraping}/browser.py (66%) rename restscrape/{ => scraping}/proxy.py (57%) create mode 100644 restscrape/scraping/scraper.py rename restscrape/{ => scraping}/uBlock/1p-filters.html (100%) rename restscrape/{ => scraping}/uBlock/3p-filters.html (100%) rename restscrape/{ => scraping}/uBlock/LICENSE.txt (100%) rename restscrape/{ => scraping}/uBlock/_locales/ar/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/az/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/bg/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/bn/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/ca/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/cs/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/cv/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/da/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/de/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/el/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/en/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/eo/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/es/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/et/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/eu/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/fa/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/fi/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/fil/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/fr/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/fy/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/gl/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/he/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/hi/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/hr/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/hu/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/id/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/it/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/ja/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/ka/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/kk/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/kn/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/ko/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/lt/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/lv/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/ml/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/mr/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/ms/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/nb/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/nl/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/no/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/pl/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/pt_BR/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/pt_PT/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/ro/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/ru/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/sk/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/sl/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/sq/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/sr/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/sv/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/ta/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/te/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/th/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/tr/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/uk/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/vi/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/zh_CN/messages.json (100%) rename restscrape/{ => scraping}/uBlock/_locales/zh_TW/messages.json (100%) rename restscrape/{ => scraping}/uBlock/about.html (100%) rename restscrape/{ => scraping}/uBlock/advanced-settings.html (100%) rename restscrape/{ => scraping}/uBlock/asset-viewer.html (100%) rename restscrape/{ => scraping}/uBlock/assets/assets.json (100%) rename restscrape/{ => scraping}/uBlock/assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt (100%) rename restscrape/{ => scraping}/uBlock/assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt (100%) rename restscrape/{ => scraping}/uBlock/assets/thirdparties/mirror1.malwaredomains.com/files/README.md (100%) rename restscrape/{ => scraping}/uBlock/assets/thirdparties/mirror1.malwaredomains.com/files/justdomains (100%) rename restscrape/{ => scraping}/uBlock/assets/thirdparties/pgl.yoyo.org/as/README.md (100%) rename restscrape/{ => scraping}/uBlock/assets/thirdparties/pgl.yoyo.org/as/serverlist (100%) rename restscrape/{ => scraping}/uBlock/assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat (100%) rename restscrape/{ => scraping}/uBlock/assets/thirdparties/www.malwaredomainlist.com/hostslist/README.md (100%) rename restscrape/{ => scraping}/uBlock/assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt (100%) rename restscrape/{ => scraping}/uBlock/assets/ublock/badware.txt (100%) rename restscrape/{ => scraping}/uBlock/assets/ublock/experimental.txt (100%) rename restscrape/{ => scraping}/uBlock/assets/ublock/filters.txt (100%) rename restscrape/{ => scraping}/uBlock/assets/ublock/privacy.txt (100%) rename restscrape/{ => scraping}/uBlock/assets/ublock/resource-abuse.txt (100%) rename restscrape/{ => scraping}/uBlock/assets/ublock/resources.txt (100%) rename restscrape/{ => scraping}/uBlock/assets/ublock/unbreak.txt (100%) rename restscrape/{ => scraping}/uBlock/background.html (100%) rename restscrape/{ => scraping}/uBlock/cloud-ui.html (100%) rename restscrape/{ => scraping}/uBlock/css/1p-filters.css (100%) rename restscrape/{ => scraping}/uBlock/css/3p-filters.css (100%) rename restscrape/{ => scraping}/uBlock/css/advanced-settings.css (100%) rename restscrape/{ => scraping}/uBlock/css/benchmarks.css (100%) rename restscrape/{ => scraping}/uBlock/css/cloud-ui.css (100%) rename restscrape/{ => scraping}/uBlock/css/codemirror.css (100%) rename restscrape/{ => scraping}/uBlock/css/common.css (100%) rename restscrape/{ => scraping}/uBlock/css/dashboard-common.css (100%) rename restscrape/{ => scraping}/uBlock/css/dashboard.css (100%) rename restscrape/{ => scraping}/uBlock/css/document-blocked.css (100%) rename restscrape/{ => scraping}/uBlock/css/dyna-rules.css (100%) rename restscrape/{ => scraping}/uBlock/css/fa-icons.css (100%) rename restscrape/{ => scraping}/uBlock/css/fonts/OFL.txt (100%) rename restscrape/{ => scraping}/uBlock/css/fonts/fontawesome-webfont.ttf (100%) rename restscrape/{ => scraping}/uBlock/css/logger-ui-inspector.css (100%) rename restscrape/{ => scraping}/uBlock/css/logger-ui.css (100%) rename restscrape/{ => scraping}/uBlock/css/popup.css (100%) rename restscrape/{ => scraping}/uBlock/css/settings.css (100%) rename restscrape/{ => scraping}/uBlock/css/shortcuts.css (100%) rename restscrape/{ => scraping}/uBlock/css/whitelist.css (100%) rename restscrape/{ => scraping}/uBlock/dashboard.html (100%) rename restscrape/{ => scraping}/uBlock/document-blocked.html (100%) rename restscrape/{ => scraping}/uBlock/dyna-rules.html (100%) rename restscrape/{ => scraping}/uBlock/epicker.html (100%) rename restscrape/{ => scraping}/uBlock/img/cloud.png (100%) rename restscrape/{ => scraping}/uBlock/img/fontawesome/LICENSE.txt (100%) rename restscrape/{ => scraping}/uBlock/img/fontawesome/fontawesome-defs.svg (100%) rename restscrape/{ => scraping}/uBlock/img/help16.png (100%) rename restscrape/{ => scraping}/uBlock/img/icon_128.png (100%) rename restscrape/{ => scraping}/uBlock/img/icon_16-off.png (100%) rename restscrape/{ => scraping}/uBlock/img/icon_16.png (100%) rename restscrape/{ => scraping}/uBlock/img/icon_32-off.png (100%) rename restscrape/{ => scraping}/uBlock/img/icon_32.png (100%) rename restscrape/{ => scraping}/uBlock/img/icon_64.png (100%) rename restscrape/{ => scraping}/uBlock/img/ublock-defs.svg (100%) rename restscrape/{ => scraping}/uBlock/img/ublock.svg (100%) rename restscrape/{ => scraping}/uBlock/is-webrtc-supported.html (100%) rename restscrape/{ => scraping}/uBlock/js/1p-filters.js (100%) rename restscrape/{ => scraping}/uBlock/js/3p-filters.js (100%) rename restscrape/{ => scraping}/uBlock/js/about.js (100%) rename restscrape/{ => scraping}/uBlock/js/advanced-settings.js (100%) rename restscrape/{ => scraping}/uBlock/js/asset-viewer.js (100%) rename restscrape/{ => scraping}/uBlock/js/assets.js (100%) rename restscrape/{ => scraping}/uBlock/js/background.js (100%) rename restscrape/{ => scraping}/uBlock/js/cachestorage.js (100%) rename restscrape/{ => scraping}/uBlock/js/cloud-ui.js (100%) rename restscrape/{ => scraping}/uBlock/js/codemirror/search.js (100%) rename restscrape/{ => scraping}/uBlock/js/codemirror/ubo-static-filtering.js (100%) rename restscrape/{ => scraping}/uBlock/js/commands.js (100%) rename restscrape/{ => scraping}/uBlock/js/contentscript.js (100%) rename restscrape/{ => scraping}/uBlock/js/contextmenu.js (100%) rename restscrape/{ => scraping}/uBlock/js/cosmetic-filtering.js (100%) rename restscrape/{ => scraping}/uBlock/js/dashboard-common.js (100%) rename restscrape/{ => scraping}/uBlock/js/dashboard.js (100%) rename restscrape/{ => scraping}/uBlock/js/document-blocked.js (100%) rename restscrape/{ => scraping}/uBlock/js/dyna-rules.js (100%) rename restscrape/{ => scraping}/uBlock/js/dynamic-net-filtering.js (100%) rename restscrape/{ => scraping}/uBlock/js/fa-icons.js (100%) rename restscrape/{ => scraping}/uBlock/js/filtering-context.js (100%) rename restscrape/{ => scraping}/uBlock/js/hnswitches.js (100%) rename restscrape/{ => scraping}/uBlock/js/hntrie.js (100%) rename restscrape/{ => scraping}/uBlock/js/html-filtering.js (100%) rename restscrape/{ => scraping}/uBlock/js/i18n.js (100%) rename restscrape/{ => scraping}/uBlock/js/is-webrtc-supported.js (100%) rename restscrape/{ => scraping}/uBlock/js/logger-ui-inspector.js (100%) rename restscrape/{ => scraping}/uBlock/js/logger-ui.js (100%) rename restscrape/{ => scraping}/uBlock/js/logger.js (100%) rename restscrape/{ => scraping}/uBlock/js/lz4.js (100%) rename restscrape/{ => scraping}/uBlock/js/messaging.js (100%) rename restscrape/{ => scraping}/uBlock/js/pagestore.js (100%) rename restscrape/{ => scraping}/uBlock/js/popup.js (100%) rename restscrape/{ => scraping}/uBlock/js/redirect-engine.js (100%) rename restscrape/{ => scraping}/uBlock/js/reverselookup-worker.js (100%) rename restscrape/{ => scraping}/uBlock/js/reverselookup.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlet-filtering.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/cosmetic-logger.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/cosmetic-off.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/cosmetic-on.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/dom-inspector.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/dom-survey.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/element-picker.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/inlinescript-logger.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/load-large-media-all.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/load-large-media-interactive.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/noscript-spoof.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/should-inject-contentscript.js (100%) rename restscrape/{ => scraping}/uBlock/js/scriptlets/subscriber.js (100%) rename restscrape/{ => scraping}/uBlock/js/settings.js (100%) rename restscrape/{ => scraping}/uBlock/js/shortcuts.js (100%) rename restscrape/{ => scraping}/uBlock/js/start.js (100%) rename restscrape/{ => scraping}/uBlock/js/static-ext-filtering.js (100%) rename restscrape/{ => scraping}/uBlock/js/static-net-filtering.js (100%) rename restscrape/{ => scraping}/uBlock/js/storage.js (100%) rename restscrape/{ => scraping}/uBlock/js/tab.js (100%) rename restscrape/{ => scraping}/uBlock/js/text-encode.js (100%) rename restscrape/{ => scraping}/uBlock/js/traffic.js (100%) rename restscrape/{ => scraping}/uBlock/js/ublock.js (100%) rename restscrape/{ => scraping}/uBlock/js/udom.js (100%) rename restscrape/{ => scraping}/uBlock/js/uritools.js (100%) rename restscrape/{ => scraping}/uBlock/js/url-net-filtering.js (100%) rename restscrape/{ => scraping}/uBlock/js/utils.js (100%) rename restscrape/{ => scraping}/uBlock/js/vapi-background.js (100%) rename restscrape/{ => scraping}/uBlock/js/vapi-client.js (100%) rename restscrape/{ => scraping}/uBlock/js/vapi-common.js (100%) rename restscrape/{ => scraping}/uBlock/js/vapi-webrequest.js (100%) rename restscrape/{ => scraping}/uBlock/js/vapi.js (100%) rename restscrape/{ => scraping}/uBlock/js/wasm/README.md (100%) rename restscrape/{ => scraping}/uBlock/js/wasm/hntrie.wasm (100%) rename restscrape/{ => scraping}/uBlock/js/wasm/hntrie.wat (100%) rename restscrape/{ => scraping}/uBlock/js/whitelist.js (100%) rename restscrape/{ => scraping}/uBlock/lib/codemirror/LICENSE (100%) rename restscrape/{ => scraping}/uBlock/lib/codemirror/README.md (100%) rename restscrape/{ => scraping}/uBlock/lib/codemirror/addon/display/panel.js (100%) rename restscrape/{ => scraping}/uBlock/lib/codemirror/addon/merge/merge.css (100%) rename restscrape/{ => scraping}/uBlock/lib/codemirror/addon/merge/merge.js (100%) rename restscrape/{ => scraping}/uBlock/lib/codemirror/addon/scroll/annotatescrollbar.js (100%) rename restscrape/{ => scraping}/uBlock/lib/codemirror/addon/search/matchesonscrollbar.css (100%) rename restscrape/{ => scraping}/uBlock/lib/codemirror/addon/search/matchesonscrollbar.js (100%) rename restscrape/{ => scraping}/uBlock/lib/codemirror/addon/search/searchcursor.js (100%) rename restscrape/{ => scraping}/uBlock/lib/codemirror/addon/selection/active-line.js (100%) rename restscrape/{ => scraping}/uBlock/lib/diff/README.md (100%) rename restscrape/{ => scraping}/uBlock/lib/diff/swatinem_diff.js (100%) rename restscrape/{ => scraping}/uBlock/lib/lz4/README.md (100%) rename restscrape/{ => scraping}/uBlock/lib/lz4/lz4-block-codec-any.js (100%) rename restscrape/{ => scraping}/uBlock/lib/lz4/lz4-block-codec-js.js (100%) rename restscrape/{ => scraping}/uBlock/lib/lz4/lz4-block-codec-wasm.js (100%) rename restscrape/{ => scraping}/uBlock/lib/lz4/lz4-block-codec.wasm (100%) rename restscrape/{ => scraping}/uBlock/lib/lz4/lz4-block-codec.wat (100%) rename restscrape/{ => scraping}/uBlock/lib/publicsuffixlist.js (100%) rename restscrape/{ => scraping}/uBlock/lib/punycode.js (100%) rename restscrape/{ => scraping}/uBlock/logger-ui.html (100%) rename restscrape/{ => scraping}/uBlock/managed_storage.json (100%) rename restscrape/{ => scraping}/uBlock/manifest.json (100%) rename restscrape/{ => scraping}/uBlock/popup.html (100%) rename restscrape/{ => scraping}/uBlock/settings.html (100%) rename restscrape/{ => scraping}/uBlock/shortcuts.html (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/049ba9cad461c1d73512654fa0505f24.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/08bccca4f0b22bca18001da690ef0f6b.png (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/22e03f0a589e9c48b3916f91090da76a.gif (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/2b73c2782126b83faf6ba7d4b30919b5.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/4bf7b393d3b1b313682eed660b3f79f6.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/52cd82bf4163cf85a2e578f33f3a1c5b.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/59abf2914ae612c22ca7faecfa5d19e9.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/59fb24a2d12455d15bea20980e8a6801.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/649775b1644161f11f034be886082fac.mp3 (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/70a7e8510b6031f0d7d6dbf4a6e70c3e.png (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/7e270994feadd29c8f6cfe846ab7769c.txt (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/7f7127b0b406fcd719b081372b7ce451.mp4 (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/8f846d6d2abbdbb39219191e407f6cce.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/9146d832a0025daf20ec16a48b909c81.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/README.txt (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/acc6e24fce1dcf79ba6a698dc09b0d99.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/add5ec8fb7834916ff54b56578dc07c4.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/af3c919ee9a3d97f5dedaf2f8bec146a.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/b2cc2af4a6c9cac1992c377747d98036.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/b4fa32e8497f63fd2ca54c1fdae6d273.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/b71d4af3b115e6d5b5b02c18f901e313.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/bed5a2e0e77ce019b181b365896fd84f.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/bf451d42525251f69895201650a9c1ea.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/c2c7eb5240aa19439b7ebbf38d6789e5.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/c2e1fb0f4c1450d9be9884c583747d83.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/c3f690ad3b4d5a1b308d1461a9978749.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/c77d1c55bb336440de0677e841870dd2.png (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/cb5ec55f9d28a46c647c9aa7c48fd158.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/d363525161c56887ceebe5e72ed4ef31.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/f1df24e1f123b1137cec098dab038b34.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/f643260136b645d95fdc78fc46e9d00a.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/f6f25816c1c5ce3d465f4cd083539931.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/f97120ae9a642fea9bf2dc61b0dac5c3.js (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/imported.txt (100%) rename restscrape/{ => scraping}/uBlock/web_accessible_resources/to-import.txt (100%) rename restscrape/{ => scraping}/uBlock/whitelist.html (100%) diff --git a/restscrape/cache.py b/restscrape/cache.py deleted file mode 100644 index 68d293b..0000000 --- a/restscrape/cache.py +++ /dev/null @@ -1,17 +0,0 @@ -from datetime import timedelta,datetime -import sqlite3 - -class cache: - def __init__(self,cache_path="page_cache.db",interval=datetime.timedelta(days=1)): - self.con = sqlite3.connect(cache_path) - self.cur = self.con.cursor() - self.cur.execute('''\ - create table if not exists `pages`( - `url` text primary key, - `page_source` text, - `datetime` datetime, - ); - ''' - ) - - diff --git a/restscrape/scraper.py b/restscrape/scraper.py deleted file mode 100644 index c75b98b..0000000 --- a/restscrape/scraper.py +++ /dev/null @@ -1,34 +0,0 @@ -import lxml.etree -class scraper: - - def __init__(self,page_source): - if not isinstance(page_source,lxml.etree._Element): - page_source = lxml.etree.HTML(page_source) - self.page_source = page_source - - def xpath(self,expr): - return self.page_source.xpath(expr) - - def extract_table(self,table,header_xpath,rows_xpath): - if not isinstance(table,lxml.etree._Element): - table = self.xpath(table)[0] - header = table.xpath(header_xpath)[0] - headers = list(element.text.lower() for element in header.findall('th')) - for row in table.xpath(rows_xpath)[0].findall('tr'): - yield dict(zip(headers,(data.text for data in row.findall('td')))) - - def label_convert(self,labels,raw_tags = False): - ret = {} - for label,xpath in labels.items(): - res = self.xpath(xpath) - if raw_tags: - ret[label] = list(lxml.etree.tostring(element, pretty_print=True) for element in res) - else: - ret[label] = list(element.text for element in res) - - return ret - -def proxy_scraper(page_source): - page = scraper(page_source) - yield from page.extract_table(table="//table[@id='proxylisttable']",header_xpath="./thead/tr",rows_xpath="./tbody") - diff --git a/restscrape/__init__.py b/restscrape/scraping/__init__.py similarity index 53% rename from restscrape/__init__.py rename to restscrape/scraping/__init__.py index a937f89..246f219 100644 --- a/restscrape/__init__.py +++ b/restscrape/scraping/__init__.py @@ -1,26 +1,26 @@ -if __name__ == "__main__": - import sys - sys.path.insert(0,'..') -from restscrape.browser import browser as browser_class -from restscrape.scraper import scraper as scraper_class -from restscrape.proxy import create_proxy_iter import time + +from restscrape.scraping.proxy import create_proxy_iter +from restscrape.scraping.scraper import scraper as scraper_class +from restscrape.scraping.browser import browser as browser_class + US_PROXY_ITER = create_proxy_iter() + def scrape( - url, - labels, - proxy_iter = None, - wait_for = 0, - max_tries=4, - raw_tags = True - ): + url, + labels, + proxy_iter=None, + wait_for=0, + max_tries=4, + raw_tags=True +): browser = browser_class(headless=False) if proxy_iter is not None: for trial in range(max_tries): proxy_ip = next(proxy_iter) try: - browser.restart_browser(start_page = url,proxy=proxy_ip) + browser.restart_browser(start_page=url, proxy=proxy_ip) if wait_for: time.sleep(wait_for) source = browser.get_source() @@ -28,13 +28,13 @@ def scrape( except Exception as e: print(e) print(proxy_ip) - proxy_iter.blacklist(proxy) + proxy_iter.blacklist(proxy_ip) else: for trial in range(max_tries): try: if trial == 0: - browser.restart_browser(start_page = url) + browser.restart_browser(start_page=url) else: browser.open(url) source = browser.get_source() @@ -43,7 +43,9 @@ def scrape( print(e) scraper = scraper_class(source) - return scraper.label_convert(labels,raw_tags=raw_tags),browser + return scraper.label_convert(labels, raw_tags=raw_tags), browser + if __name__ == "__main__": - ret,browser = scrape('http://rlbrhost.ddns.net/',{'links':'//a'},wait_for = 10,raw_tags=False) \ No newline at end of file + ret, browser = scrape('http://rlbrhost.ddns.net/', + {'links': '//a'}, wait_for=10, raw_tags=False) diff --git a/restscrape/browser.py b/restscrape/scraping/browser.py similarity index 66% rename from restscrape/browser.py rename to restscrape/scraping/browser.py index 8699e62..958fd4e 100644 --- a/restscrape/browser.py +++ b/restscrape/scraping/browser.py @@ -1,38 +1,46 @@ import asyncio import os -import pyppeteer import time + +import pyppeteer + + def run(coroutine): loop = asyncio.get_event_loop() return loop.run_until_complete(coroutine) + class browser: '''wrapper around pyppeteer browser''' - def __init__(self,**launch_opts): + + def __init__(self, **launch_opts): self.browser = None self.launch_opts = launch_opts self.page = None - def restart_browser(self,proxy=None,use_adblock=True,start_page='about:blank'): + def restart_browser(self, proxy=None, use_adblock=True, + start_page='about:blank'): if self.browser is not None: self.close() opts = {} opts.update(self.launch_opts) if use_adblock: if __name__ == "__main__": - ext = os.path.join(os.getcwd(),'uBlock') + ext = os.path.join(os.getcwd(), 'uBlock') else: - ext = os.path.abspath(os.path.join(os.path.dirname(__file__),'uBlock')) + ext = os.path.abspath(os.path.join( + os.path.dirname(__file__), 'uBlock')) # print(ext) - opts.setdefault('args',[]).extend(['--disable-extensions-except='+ext, '--load-extension='+ext]) + opts.setdefault('args', []).extend( + ['--disable-extensions-except='+ext, '--load-extension='+ext]) if proxy is not None: - opts.setdefault('args',[]).extend(['--proxy-server='+proxy]) - opts.setdefault('args',[]).append(start_page) + opts.setdefault('args', []).extend(['--proxy-server='+proxy]) + opts.setdefault('args', []).append(start_page) self.browser = run(pyppeteer.launch(**opts)) self.page = run(self.browser.pages())[0] run(self.page.waitForNavigation()) - def open(self,url,wait_for = 0): + def open(self, url, wait_for=0): if self.page is None: page = run(self.browser.pages())[0] run(page.goto(url)) @@ -46,8 +54,10 @@ class browser: if self.page is None: self.page = run(self.browser.pages())[0] return run(self.page.content()) + + if __name__ == "__main__": b = browser(headless=False) b.restart_browser(start_page='https://www.google.com') source = b.get_source() - b.close() \ No newline at end of file + b.close() diff --git a/restscrape/proxy.py b/restscrape/scraping/proxy.py similarity index 57% rename from restscrape/proxy.py rename to restscrape/scraping/proxy.py index 0da65dc..822fcb4 100644 --- a/restscrape/proxy.py +++ b/restscrape/scraping/proxy.py @@ -1,17 +1,23 @@ -from restscrape.scraper import proxy_scraper -import pyppeteer import requests + +from restscrape.scraping.scraper import proxy_scraper + US_PROXY_URL = 'https://www.us-proxy.org/' + + class proxy_iter: - '''Like itertools.cycle but uses a set underneath the hood and adds a method to remove an item from iteration (if proxy doesn't work etc)''' - def __init__(self,proxy_list): + '''Like itertools.cycle but +uses a set underneath the hood and adds a method to remove an item from +iteration (if proxy doesn't work etc)''' + + def __init__(self, proxy_list): self.proxy_set = set(proxy_list) self.bad = set() self.iterator = iter(self) def __iter__(self): for proxy in self.proxy_set: - if not proxy in self.bad: + if proxy not in self.bad: yield proxy self.proxy_set -= self.bad if len(self.proxy_set) > 0: @@ -20,14 +26,17 @@ class proxy_iter: def __next__(self): return next(self.iterator) - def blacklist(self,proxy): + def blacklist(self, proxy): self.bad.add(proxy) def __len__(self): return len(self.proxy_set - self.bad) -def create_proxy_iter(url = US_PROXY_URL): + +def create_proxy_iter(url=US_PROXY_URL): '''Create a proxy_iter from proxy_webpage''' resp = requests.get(url) resp.raise_for_status() - return proxy_iter('{ip address}:{port}'.format(**row) for row in proxy_scraper(resp.text)) \ No newline at end of file + return proxy_iter( + '{ip address}:{port}'.format(**row) + for row in proxy_scraper(resp.text)) diff --git a/restscrape/scraping/scraper.py b/restscrape/scraping/scraper.py new file mode 100644 index 0000000..c3d8e29 --- /dev/null +++ b/restscrape/scraping/scraper.py @@ -0,0 +1,40 @@ +import lxml.etree + + +class scraper: + + def __init__(self, page_source): + if not isinstance(page_source, lxml.etree._Element): + page_source = lxml.etree.HTML(page_source) + self.page_source = page_source + + def xpath(self, expr): + return self.page_source.xpath(expr) + + def extract_table(self, table, header_xpath, rows_xpath): + if not isinstance(table, lxml.etree._Element): + table = self.xpath(table)[0] + header = table.xpath(header_xpath)[0] + headers = list(element.text.lower() + for element in header.findall('th')) + for row in table.xpath(rows_xpath)[0].findall('tr'): + yield dict(zip(headers, (data.text for data in row.findall('td')))) + + def label_convert(self, labels, raw_tags=False): + ret = {} + for label, xpath in labels.items(): + res = self.xpath(xpath) + if raw_tags: + ret[label] = list(lxml.etree.tostring( + element, pretty_print=True) for element in res) + else: + ret[label] = list(element.text for element in res) + + return ret + + +def proxy_scraper(page_source): + page = scraper(page_source) + yield from page.extract_table( + table="//table[@id='proxylisttable']", + header_xpath="./thead/tr", rows_xpath="./tbody") diff --git a/restscrape/uBlock/1p-filters.html b/restscrape/scraping/uBlock/1p-filters.html similarity index 100% rename from restscrape/uBlock/1p-filters.html rename to restscrape/scraping/uBlock/1p-filters.html diff --git a/restscrape/uBlock/3p-filters.html b/restscrape/scraping/uBlock/3p-filters.html similarity index 100% rename from restscrape/uBlock/3p-filters.html rename to restscrape/scraping/uBlock/3p-filters.html diff --git a/restscrape/uBlock/LICENSE.txt b/restscrape/scraping/uBlock/LICENSE.txt similarity index 100% rename from restscrape/uBlock/LICENSE.txt rename to restscrape/scraping/uBlock/LICENSE.txt diff --git a/restscrape/uBlock/_locales/ar/messages.json b/restscrape/scraping/uBlock/_locales/ar/messages.json similarity index 100% rename from restscrape/uBlock/_locales/ar/messages.json rename to restscrape/scraping/uBlock/_locales/ar/messages.json diff --git a/restscrape/uBlock/_locales/az/messages.json b/restscrape/scraping/uBlock/_locales/az/messages.json similarity index 100% rename from restscrape/uBlock/_locales/az/messages.json rename to restscrape/scraping/uBlock/_locales/az/messages.json diff --git a/restscrape/uBlock/_locales/bg/messages.json b/restscrape/scraping/uBlock/_locales/bg/messages.json similarity index 100% rename from restscrape/uBlock/_locales/bg/messages.json rename to restscrape/scraping/uBlock/_locales/bg/messages.json diff --git a/restscrape/uBlock/_locales/bn/messages.json b/restscrape/scraping/uBlock/_locales/bn/messages.json similarity index 100% rename from restscrape/uBlock/_locales/bn/messages.json rename to restscrape/scraping/uBlock/_locales/bn/messages.json diff --git a/restscrape/uBlock/_locales/ca/messages.json b/restscrape/scraping/uBlock/_locales/ca/messages.json similarity index 100% rename from restscrape/uBlock/_locales/ca/messages.json rename to restscrape/scraping/uBlock/_locales/ca/messages.json diff --git a/restscrape/uBlock/_locales/cs/messages.json b/restscrape/scraping/uBlock/_locales/cs/messages.json similarity index 100% rename from restscrape/uBlock/_locales/cs/messages.json rename to restscrape/scraping/uBlock/_locales/cs/messages.json diff --git a/restscrape/uBlock/_locales/cv/messages.json b/restscrape/scraping/uBlock/_locales/cv/messages.json similarity index 100% rename from restscrape/uBlock/_locales/cv/messages.json rename to restscrape/scraping/uBlock/_locales/cv/messages.json diff --git a/restscrape/uBlock/_locales/da/messages.json b/restscrape/scraping/uBlock/_locales/da/messages.json similarity index 100% rename from restscrape/uBlock/_locales/da/messages.json rename to restscrape/scraping/uBlock/_locales/da/messages.json diff --git a/restscrape/uBlock/_locales/de/messages.json b/restscrape/scraping/uBlock/_locales/de/messages.json similarity index 100% rename from restscrape/uBlock/_locales/de/messages.json rename to restscrape/scraping/uBlock/_locales/de/messages.json diff --git a/restscrape/uBlock/_locales/el/messages.json b/restscrape/scraping/uBlock/_locales/el/messages.json similarity index 100% rename from restscrape/uBlock/_locales/el/messages.json rename to restscrape/scraping/uBlock/_locales/el/messages.json diff --git a/restscrape/uBlock/_locales/en/messages.json b/restscrape/scraping/uBlock/_locales/en/messages.json similarity index 100% rename from restscrape/uBlock/_locales/en/messages.json rename to restscrape/scraping/uBlock/_locales/en/messages.json diff --git a/restscrape/uBlock/_locales/eo/messages.json b/restscrape/scraping/uBlock/_locales/eo/messages.json similarity index 100% rename from restscrape/uBlock/_locales/eo/messages.json rename to restscrape/scraping/uBlock/_locales/eo/messages.json diff --git a/restscrape/uBlock/_locales/es/messages.json b/restscrape/scraping/uBlock/_locales/es/messages.json similarity index 100% rename from restscrape/uBlock/_locales/es/messages.json rename to restscrape/scraping/uBlock/_locales/es/messages.json diff --git a/restscrape/uBlock/_locales/et/messages.json b/restscrape/scraping/uBlock/_locales/et/messages.json similarity index 100% rename from restscrape/uBlock/_locales/et/messages.json rename to restscrape/scraping/uBlock/_locales/et/messages.json diff --git a/restscrape/uBlock/_locales/eu/messages.json b/restscrape/scraping/uBlock/_locales/eu/messages.json similarity index 100% rename from restscrape/uBlock/_locales/eu/messages.json rename to restscrape/scraping/uBlock/_locales/eu/messages.json diff --git a/restscrape/uBlock/_locales/fa/messages.json b/restscrape/scraping/uBlock/_locales/fa/messages.json similarity index 100% rename from restscrape/uBlock/_locales/fa/messages.json rename to restscrape/scraping/uBlock/_locales/fa/messages.json diff --git a/restscrape/uBlock/_locales/fi/messages.json b/restscrape/scraping/uBlock/_locales/fi/messages.json similarity index 100% rename from restscrape/uBlock/_locales/fi/messages.json rename to restscrape/scraping/uBlock/_locales/fi/messages.json diff --git a/restscrape/uBlock/_locales/fil/messages.json b/restscrape/scraping/uBlock/_locales/fil/messages.json similarity index 100% rename from restscrape/uBlock/_locales/fil/messages.json rename to restscrape/scraping/uBlock/_locales/fil/messages.json diff --git a/restscrape/uBlock/_locales/fr/messages.json b/restscrape/scraping/uBlock/_locales/fr/messages.json similarity index 100% rename from restscrape/uBlock/_locales/fr/messages.json rename to restscrape/scraping/uBlock/_locales/fr/messages.json diff --git a/restscrape/uBlock/_locales/fy/messages.json b/restscrape/scraping/uBlock/_locales/fy/messages.json similarity index 100% rename from restscrape/uBlock/_locales/fy/messages.json rename to restscrape/scraping/uBlock/_locales/fy/messages.json diff --git a/restscrape/uBlock/_locales/gl/messages.json b/restscrape/scraping/uBlock/_locales/gl/messages.json similarity index 100% rename from restscrape/uBlock/_locales/gl/messages.json rename to restscrape/scraping/uBlock/_locales/gl/messages.json diff --git a/restscrape/uBlock/_locales/he/messages.json b/restscrape/scraping/uBlock/_locales/he/messages.json similarity index 100% rename from restscrape/uBlock/_locales/he/messages.json rename to restscrape/scraping/uBlock/_locales/he/messages.json diff --git a/restscrape/uBlock/_locales/hi/messages.json b/restscrape/scraping/uBlock/_locales/hi/messages.json similarity index 100% rename from restscrape/uBlock/_locales/hi/messages.json rename to restscrape/scraping/uBlock/_locales/hi/messages.json diff --git a/restscrape/uBlock/_locales/hr/messages.json b/restscrape/scraping/uBlock/_locales/hr/messages.json similarity index 100% rename from restscrape/uBlock/_locales/hr/messages.json rename to restscrape/scraping/uBlock/_locales/hr/messages.json diff --git a/restscrape/uBlock/_locales/hu/messages.json b/restscrape/scraping/uBlock/_locales/hu/messages.json similarity index 100% rename from restscrape/uBlock/_locales/hu/messages.json rename to restscrape/scraping/uBlock/_locales/hu/messages.json diff --git a/restscrape/uBlock/_locales/id/messages.json b/restscrape/scraping/uBlock/_locales/id/messages.json similarity index 100% rename from restscrape/uBlock/_locales/id/messages.json rename to restscrape/scraping/uBlock/_locales/id/messages.json diff --git a/restscrape/uBlock/_locales/it/messages.json b/restscrape/scraping/uBlock/_locales/it/messages.json similarity index 100% rename from restscrape/uBlock/_locales/it/messages.json rename to restscrape/scraping/uBlock/_locales/it/messages.json diff --git a/restscrape/uBlock/_locales/ja/messages.json b/restscrape/scraping/uBlock/_locales/ja/messages.json similarity index 100% rename from restscrape/uBlock/_locales/ja/messages.json rename to restscrape/scraping/uBlock/_locales/ja/messages.json diff --git a/restscrape/uBlock/_locales/ka/messages.json b/restscrape/scraping/uBlock/_locales/ka/messages.json similarity index 100% rename from restscrape/uBlock/_locales/ka/messages.json rename to restscrape/scraping/uBlock/_locales/ka/messages.json diff --git a/restscrape/uBlock/_locales/kk/messages.json b/restscrape/scraping/uBlock/_locales/kk/messages.json similarity index 100% rename from restscrape/uBlock/_locales/kk/messages.json rename to restscrape/scraping/uBlock/_locales/kk/messages.json diff --git a/restscrape/uBlock/_locales/kn/messages.json b/restscrape/scraping/uBlock/_locales/kn/messages.json similarity index 100% rename from restscrape/uBlock/_locales/kn/messages.json rename to restscrape/scraping/uBlock/_locales/kn/messages.json diff --git a/restscrape/uBlock/_locales/ko/messages.json b/restscrape/scraping/uBlock/_locales/ko/messages.json similarity index 100% rename from restscrape/uBlock/_locales/ko/messages.json rename to restscrape/scraping/uBlock/_locales/ko/messages.json diff --git a/restscrape/uBlock/_locales/lt/messages.json b/restscrape/scraping/uBlock/_locales/lt/messages.json similarity index 100% rename from restscrape/uBlock/_locales/lt/messages.json rename to restscrape/scraping/uBlock/_locales/lt/messages.json diff --git a/restscrape/uBlock/_locales/lv/messages.json b/restscrape/scraping/uBlock/_locales/lv/messages.json similarity index 100% rename from restscrape/uBlock/_locales/lv/messages.json rename to restscrape/scraping/uBlock/_locales/lv/messages.json diff --git a/restscrape/uBlock/_locales/ml/messages.json b/restscrape/scraping/uBlock/_locales/ml/messages.json similarity index 100% rename from restscrape/uBlock/_locales/ml/messages.json rename to restscrape/scraping/uBlock/_locales/ml/messages.json diff --git a/restscrape/uBlock/_locales/mr/messages.json b/restscrape/scraping/uBlock/_locales/mr/messages.json similarity index 100% rename from restscrape/uBlock/_locales/mr/messages.json rename to restscrape/scraping/uBlock/_locales/mr/messages.json diff --git a/restscrape/uBlock/_locales/ms/messages.json b/restscrape/scraping/uBlock/_locales/ms/messages.json similarity index 100% rename from restscrape/uBlock/_locales/ms/messages.json rename to restscrape/scraping/uBlock/_locales/ms/messages.json diff --git a/restscrape/uBlock/_locales/nb/messages.json b/restscrape/scraping/uBlock/_locales/nb/messages.json similarity index 100% rename from restscrape/uBlock/_locales/nb/messages.json rename to restscrape/scraping/uBlock/_locales/nb/messages.json diff --git a/restscrape/uBlock/_locales/nl/messages.json b/restscrape/scraping/uBlock/_locales/nl/messages.json similarity index 100% rename from restscrape/uBlock/_locales/nl/messages.json rename to restscrape/scraping/uBlock/_locales/nl/messages.json diff --git a/restscrape/uBlock/_locales/no/messages.json b/restscrape/scraping/uBlock/_locales/no/messages.json similarity index 100% rename from restscrape/uBlock/_locales/no/messages.json rename to restscrape/scraping/uBlock/_locales/no/messages.json diff --git a/restscrape/uBlock/_locales/pl/messages.json b/restscrape/scraping/uBlock/_locales/pl/messages.json similarity index 100% rename from restscrape/uBlock/_locales/pl/messages.json rename to restscrape/scraping/uBlock/_locales/pl/messages.json diff --git a/restscrape/uBlock/_locales/pt_BR/messages.json b/restscrape/scraping/uBlock/_locales/pt_BR/messages.json similarity index 100% rename from restscrape/uBlock/_locales/pt_BR/messages.json rename to restscrape/scraping/uBlock/_locales/pt_BR/messages.json diff --git a/restscrape/uBlock/_locales/pt_PT/messages.json b/restscrape/scraping/uBlock/_locales/pt_PT/messages.json similarity index 100% rename from restscrape/uBlock/_locales/pt_PT/messages.json rename to restscrape/scraping/uBlock/_locales/pt_PT/messages.json diff --git a/restscrape/uBlock/_locales/ro/messages.json b/restscrape/scraping/uBlock/_locales/ro/messages.json similarity index 100% rename from restscrape/uBlock/_locales/ro/messages.json rename to restscrape/scraping/uBlock/_locales/ro/messages.json diff --git a/restscrape/uBlock/_locales/ru/messages.json b/restscrape/scraping/uBlock/_locales/ru/messages.json similarity index 100% rename from restscrape/uBlock/_locales/ru/messages.json rename to restscrape/scraping/uBlock/_locales/ru/messages.json diff --git a/restscrape/uBlock/_locales/sk/messages.json b/restscrape/scraping/uBlock/_locales/sk/messages.json similarity index 100% rename from restscrape/uBlock/_locales/sk/messages.json rename to restscrape/scraping/uBlock/_locales/sk/messages.json diff --git a/restscrape/uBlock/_locales/sl/messages.json b/restscrape/scraping/uBlock/_locales/sl/messages.json similarity index 100% rename from restscrape/uBlock/_locales/sl/messages.json rename to restscrape/scraping/uBlock/_locales/sl/messages.json diff --git a/restscrape/uBlock/_locales/sq/messages.json b/restscrape/scraping/uBlock/_locales/sq/messages.json similarity index 100% rename from restscrape/uBlock/_locales/sq/messages.json rename to restscrape/scraping/uBlock/_locales/sq/messages.json diff --git a/restscrape/uBlock/_locales/sr/messages.json b/restscrape/scraping/uBlock/_locales/sr/messages.json similarity index 100% rename from restscrape/uBlock/_locales/sr/messages.json rename to restscrape/scraping/uBlock/_locales/sr/messages.json diff --git a/restscrape/uBlock/_locales/sv/messages.json b/restscrape/scraping/uBlock/_locales/sv/messages.json similarity index 100% rename from restscrape/uBlock/_locales/sv/messages.json rename to restscrape/scraping/uBlock/_locales/sv/messages.json diff --git a/restscrape/uBlock/_locales/ta/messages.json b/restscrape/scraping/uBlock/_locales/ta/messages.json similarity index 100% rename from restscrape/uBlock/_locales/ta/messages.json rename to restscrape/scraping/uBlock/_locales/ta/messages.json diff --git a/restscrape/uBlock/_locales/te/messages.json b/restscrape/scraping/uBlock/_locales/te/messages.json similarity index 100% rename from restscrape/uBlock/_locales/te/messages.json rename to restscrape/scraping/uBlock/_locales/te/messages.json diff --git a/restscrape/uBlock/_locales/th/messages.json b/restscrape/scraping/uBlock/_locales/th/messages.json similarity index 100% rename from restscrape/uBlock/_locales/th/messages.json rename to restscrape/scraping/uBlock/_locales/th/messages.json diff --git a/restscrape/uBlock/_locales/tr/messages.json b/restscrape/scraping/uBlock/_locales/tr/messages.json similarity index 100% rename from restscrape/uBlock/_locales/tr/messages.json rename to restscrape/scraping/uBlock/_locales/tr/messages.json diff --git a/restscrape/uBlock/_locales/uk/messages.json b/restscrape/scraping/uBlock/_locales/uk/messages.json similarity index 100% rename from restscrape/uBlock/_locales/uk/messages.json rename to restscrape/scraping/uBlock/_locales/uk/messages.json diff --git a/restscrape/uBlock/_locales/vi/messages.json b/restscrape/scraping/uBlock/_locales/vi/messages.json similarity index 100% rename from restscrape/uBlock/_locales/vi/messages.json rename to restscrape/scraping/uBlock/_locales/vi/messages.json diff --git a/restscrape/uBlock/_locales/zh_CN/messages.json b/restscrape/scraping/uBlock/_locales/zh_CN/messages.json similarity index 100% rename from restscrape/uBlock/_locales/zh_CN/messages.json rename to restscrape/scraping/uBlock/_locales/zh_CN/messages.json diff --git a/restscrape/uBlock/_locales/zh_TW/messages.json b/restscrape/scraping/uBlock/_locales/zh_TW/messages.json similarity index 100% rename from restscrape/uBlock/_locales/zh_TW/messages.json rename to restscrape/scraping/uBlock/_locales/zh_TW/messages.json diff --git a/restscrape/uBlock/about.html b/restscrape/scraping/uBlock/about.html similarity index 100% rename from restscrape/uBlock/about.html rename to restscrape/scraping/uBlock/about.html diff --git a/restscrape/uBlock/advanced-settings.html b/restscrape/scraping/uBlock/advanced-settings.html similarity index 100% rename from restscrape/uBlock/advanced-settings.html rename to restscrape/scraping/uBlock/advanced-settings.html diff --git a/restscrape/uBlock/asset-viewer.html b/restscrape/scraping/uBlock/asset-viewer.html similarity index 100% rename from restscrape/uBlock/asset-viewer.html rename to restscrape/scraping/uBlock/asset-viewer.html diff --git a/restscrape/uBlock/assets/assets.json b/restscrape/scraping/uBlock/assets/assets.json similarity index 100% rename from restscrape/uBlock/assets/assets.json rename to restscrape/scraping/uBlock/assets/assets.json diff --git a/restscrape/uBlock/assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt b/restscrape/scraping/uBlock/assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt similarity index 100% rename from restscrape/uBlock/assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt rename to restscrape/scraping/uBlock/assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt diff --git a/restscrape/uBlock/assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt b/restscrape/scraping/uBlock/assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt similarity index 100% rename from restscrape/uBlock/assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt rename to restscrape/scraping/uBlock/assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt diff --git a/restscrape/uBlock/assets/thirdparties/mirror1.malwaredomains.com/files/README.md b/restscrape/scraping/uBlock/assets/thirdparties/mirror1.malwaredomains.com/files/README.md similarity index 100% rename from restscrape/uBlock/assets/thirdparties/mirror1.malwaredomains.com/files/README.md rename to restscrape/scraping/uBlock/assets/thirdparties/mirror1.malwaredomains.com/files/README.md diff --git a/restscrape/uBlock/assets/thirdparties/mirror1.malwaredomains.com/files/justdomains b/restscrape/scraping/uBlock/assets/thirdparties/mirror1.malwaredomains.com/files/justdomains similarity index 100% rename from restscrape/uBlock/assets/thirdparties/mirror1.malwaredomains.com/files/justdomains rename to restscrape/scraping/uBlock/assets/thirdparties/mirror1.malwaredomains.com/files/justdomains diff --git a/restscrape/uBlock/assets/thirdparties/pgl.yoyo.org/as/README.md b/restscrape/scraping/uBlock/assets/thirdparties/pgl.yoyo.org/as/README.md similarity index 100% rename from restscrape/uBlock/assets/thirdparties/pgl.yoyo.org/as/README.md rename to restscrape/scraping/uBlock/assets/thirdparties/pgl.yoyo.org/as/README.md diff --git a/restscrape/uBlock/assets/thirdparties/pgl.yoyo.org/as/serverlist b/restscrape/scraping/uBlock/assets/thirdparties/pgl.yoyo.org/as/serverlist similarity index 100% rename from restscrape/uBlock/assets/thirdparties/pgl.yoyo.org/as/serverlist rename to restscrape/scraping/uBlock/assets/thirdparties/pgl.yoyo.org/as/serverlist diff --git a/restscrape/uBlock/assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat b/restscrape/scraping/uBlock/assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat similarity index 100% rename from restscrape/uBlock/assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat rename to restscrape/scraping/uBlock/assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat diff --git a/restscrape/uBlock/assets/thirdparties/www.malwaredomainlist.com/hostslist/README.md b/restscrape/scraping/uBlock/assets/thirdparties/www.malwaredomainlist.com/hostslist/README.md similarity index 100% rename from restscrape/uBlock/assets/thirdparties/www.malwaredomainlist.com/hostslist/README.md rename to restscrape/scraping/uBlock/assets/thirdparties/www.malwaredomainlist.com/hostslist/README.md diff --git a/restscrape/uBlock/assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt b/restscrape/scraping/uBlock/assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt similarity index 100% rename from restscrape/uBlock/assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt rename to restscrape/scraping/uBlock/assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt diff --git a/restscrape/uBlock/assets/ublock/badware.txt b/restscrape/scraping/uBlock/assets/ublock/badware.txt similarity index 100% rename from restscrape/uBlock/assets/ublock/badware.txt rename to restscrape/scraping/uBlock/assets/ublock/badware.txt diff --git a/restscrape/uBlock/assets/ublock/experimental.txt b/restscrape/scraping/uBlock/assets/ublock/experimental.txt similarity index 100% rename from restscrape/uBlock/assets/ublock/experimental.txt rename to restscrape/scraping/uBlock/assets/ublock/experimental.txt diff --git a/restscrape/uBlock/assets/ublock/filters.txt b/restscrape/scraping/uBlock/assets/ublock/filters.txt similarity index 100% rename from restscrape/uBlock/assets/ublock/filters.txt rename to restscrape/scraping/uBlock/assets/ublock/filters.txt diff --git a/restscrape/uBlock/assets/ublock/privacy.txt b/restscrape/scraping/uBlock/assets/ublock/privacy.txt similarity index 100% rename from restscrape/uBlock/assets/ublock/privacy.txt rename to restscrape/scraping/uBlock/assets/ublock/privacy.txt diff --git a/restscrape/uBlock/assets/ublock/resource-abuse.txt b/restscrape/scraping/uBlock/assets/ublock/resource-abuse.txt similarity index 100% rename from restscrape/uBlock/assets/ublock/resource-abuse.txt rename to restscrape/scraping/uBlock/assets/ublock/resource-abuse.txt diff --git a/restscrape/uBlock/assets/ublock/resources.txt b/restscrape/scraping/uBlock/assets/ublock/resources.txt similarity index 100% rename from restscrape/uBlock/assets/ublock/resources.txt rename to restscrape/scraping/uBlock/assets/ublock/resources.txt diff --git a/restscrape/uBlock/assets/ublock/unbreak.txt b/restscrape/scraping/uBlock/assets/ublock/unbreak.txt similarity index 100% rename from restscrape/uBlock/assets/ublock/unbreak.txt rename to restscrape/scraping/uBlock/assets/ublock/unbreak.txt diff --git a/restscrape/uBlock/background.html b/restscrape/scraping/uBlock/background.html similarity index 100% rename from restscrape/uBlock/background.html rename to restscrape/scraping/uBlock/background.html diff --git a/restscrape/uBlock/cloud-ui.html b/restscrape/scraping/uBlock/cloud-ui.html similarity index 100% rename from restscrape/uBlock/cloud-ui.html rename to restscrape/scraping/uBlock/cloud-ui.html diff --git a/restscrape/uBlock/css/1p-filters.css b/restscrape/scraping/uBlock/css/1p-filters.css similarity index 100% rename from restscrape/uBlock/css/1p-filters.css rename to restscrape/scraping/uBlock/css/1p-filters.css diff --git a/restscrape/uBlock/css/3p-filters.css b/restscrape/scraping/uBlock/css/3p-filters.css similarity index 100% rename from restscrape/uBlock/css/3p-filters.css rename to restscrape/scraping/uBlock/css/3p-filters.css diff --git a/restscrape/uBlock/css/advanced-settings.css b/restscrape/scraping/uBlock/css/advanced-settings.css similarity index 100% rename from restscrape/uBlock/css/advanced-settings.css rename to restscrape/scraping/uBlock/css/advanced-settings.css diff --git a/restscrape/uBlock/css/benchmarks.css b/restscrape/scraping/uBlock/css/benchmarks.css similarity index 100% rename from restscrape/uBlock/css/benchmarks.css rename to restscrape/scraping/uBlock/css/benchmarks.css diff --git a/restscrape/uBlock/css/cloud-ui.css b/restscrape/scraping/uBlock/css/cloud-ui.css similarity index 100% rename from restscrape/uBlock/css/cloud-ui.css rename to restscrape/scraping/uBlock/css/cloud-ui.css diff --git a/restscrape/uBlock/css/codemirror.css b/restscrape/scraping/uBlock/css/codemirror.css similarity index 100% rename from restscrape/uBlock/css/codemirror.css rename to restscrape/scraping/uBlock/css/codemirror.css diff --git a/restscrape/uBlock/css/common.css b/restscrape/scraping/uBlock/css/common.css similarity index 100% rename from restscrape/uBlock/css/common.css rename to restscrape/scraping/uBlock/css/common.css diff --git a/restscrape/uBlock/css/dashboard-common.css b/restscrape/scraping/uBlock/css/dashboard-common.css similarity index 100% rename from restscrape/uBlock/css/dashboard-common.css rename to restscrape/scraping/uBlock/css/dashboard-common.css diff --git a/restscrape/uBlock/css/dashboard.css b/restscrape/scraping/uBlock/css/dashboard.css similarity index 100% rename from restscrape/uBlock/css/dashboard.css rename to restscrape/scraping/uBlock/css/dashboard.css diff --git a/restscrape/uBlock/css/document-blocked.css b/restscrape/scraping/uBlock/css/document-blocked.css similarity index 100% rename from restscrape/uBlock/css/document-blocked.css rename to restscrape/scraping/uBlock/css/document-blocked.css diff --git a/restscrape/uBlock/css/dyna-rules.css b/restscrape/scraping/uBlock/css/dyna-rules.css similarity index 100% rename from restscrape/uBlock/css/dyna-rules.css rename to restscrape/scraping/uBlock/css/dyna-rules.css diff --git a/restscrape/uBlock/css/fa-icons.css b/restscrape/scraping/uBlock/css/fa-icons.css similarity index 100% rename from restscrape/uBlock/css/fa-icons.css rename to restscrape/scraping/uBlock/css/fa-icons.css diff --git a/restscrape/uBlock/css/fonts/OFL.txt b/restscrape/scraping/uBlock/css/fonts/OFL.txt similarity index 100% rename from restscrape/uBlock/css/fonts/OFL.txt rename to restscrape/scraping/uBlock/css/fonts/OFL.txt diff --git a/restscrape/uBlock/css/fonts/fontawesome-webfont.ttf b/restscrape/scraping/uBlock/css/fonts/fontawesome-webfont.ttf similarity index 100% rename from restscrape/uBlock/css/fonts/fontawesome-webfont.ttf rename to restscrape/scraping/uBlock/css/fonts/fontawesome-webfont.ttf diff --git a/restscrape/uBlock/css/logger-ui-inspector.css b/restscrape/scraping/uBlock/css/logger-ui-inspector.css similarity index 100% rename from restscrape/uBlock/css/logger-ui-inspector.css rename to restscrape/scraping/uBlock/css/logger-ui-inspector.css diff --git a/restscrape/uBlock/css/logger-ui.css b/restscrape/scraping/uBlock/css/logger-ui.css similarity index 100% rename from restscrape/uBlock/css/logger-ui.css rename to restscrape/scraping/uBlock/css/logger-ui.css diff --git a/restscrape/uBlock/css/popup.css b/restscrape/scraping/uBlock/css/popup.css similarity index 100% rename from restscrape/uBlock/css/popup.css rename to restscrape/scraping/uBlock/css/popup.css diff --git a/restscrape/uBlock/css/settings.css b/restscrape/scraping/uBlock/css/settings.css similarity index 100% rename from restscrape/uBlock/css/settings.css rename to restscrape/scraping/uBlock/css/settings.css diff --git a/restscrape/uBlock/css/shortcuts.css b/restscrape/scraping/uBlock/css/shortcuts.css similarity index 100% rename from restscrape/uBlock/css/shortcuts.css rename to restscrape/scraping/uBlock/css/shortcuts.css diff --git a/restscrape/uBlock/css/whitelist.css b/restscrape/scraping/uBlock/css/whitelist.css similarity index 100% rename from restscrape/uBlock/css/whitelist.css rename to restscrape/scraping/uBlock/css/whitelist.css diff --git a/restscrape/uBlock/dashboard.html b/restscrape/scraping/uBlock/dashboard.html similarity index 100% rename from restscrape/uBlock/dashboard.html rename to restscrape/scraping/uBlock/dashboard.html diff --git a/restscrape/uBlock/document-blocked.html b/restscrape/scraping/uBlock/document-blocked.html similarity index 100% rename from restscrape/uBlock/document-blocked.html rename to restscrape/scraping/uBlock/document-blocked.html diff --git a/restscrape/uBlock/dyna-rules.html b/restscrape/scraping/uBlock/dyna-rules.html similarity index 100% rename from restscrape/uBlock/dyna-rules.html rename to restscrape/scraping/uBlock/dyna-rules.html diff --git a/restscrape/uBlock/epicker.html b/restscrape/scraping/uBlock/epicker.html similarity index 100% rename from restscrape/uBlock/epicker.html rename to restscrape/scraping/uBlock/epicker.html diff --git a/restscrape/uBlock/img/cloud.png b/restscrape/scraping/uBlock/img/cloud.png similarity index 100% rename from restscrape/uBlock/img/cloud.png rename to restscrape/scraping/uBlock/img/cloud.png diff --git a/restscrape/uBlock/img/fontawesome/LICENSE.txt b/restscrape/scraping/uBlock/img/fontawesome/LICENSE.txt similarity index 100% rename from restscrape/uBlock/img/fontawesome/LICENSE.txt rename to restscrape/scraping/uBlock/img/fontawesome/LICENSE.txt diff --git a/restscrape/uBlock/img/fontawesome/fontawesome-defs.svg b/restscrape/scraping/uBlock/img/fontawesome/fontawesome-defs.svg similarity index 100% rename from restscrape/uBlock/img/fontawesome/fontawesome-defs.svg rename to restscrape/scraping/uBlock/img/fontawesome/fontawesome-defs.svg diff --git a/restscrape/uBlock/img/help16.png b/restscrape/scraping/uBlock/img/help16.png similarity index 100% rename from restscrape/uBlock/img/help16.png rename to restscrape/scraping/uBlock/img/help16.png diff --git a/restscrape/uBlock/img/icon_128.png b/restscrape/scraping/uBlock/img/icon_128.png similarity index 100% rename from restscrape/uBlock/img/icon_128.png rename to restscrape/scraping/uBlock/img/icon_128.png diff --git a/restscrape/uBlock/img/icon_16-off.png b/restscrape/scraping/uBlock/img/icon_16-off.png similarity index 100% rename from restscrape/uBlock/img/icon_16-off.png rename to restscrape/scraping/uBlock/img/icon_16-off.png diff --git a/restscrape/uBlock/img/icon_16.png b/restscrape/scraping/uBlock/img/icon_16.png similarity index 100% rename from restscrape/uBlock/img/icon_16.png rename to restscrape/scraping/uBlock/img/icon_16.png diff --git a/restscrape/uBlock/img/icon_32-off.png b/restscrape/scraping/uBlock/img/icon_32-off.png similarity index 100% rename from restscrape/uBlock/img/icon_32-off.png rename to restscrape/scraping/uBlock/img/icon_32-off.png diff --git a/restscrape/uBlock/img/icon_32.png b/restscrape/scraping/uBlock/img/icon_32.png similarity index 100% rename from restscrape/uBlock/img/icon_32.png rename to restscrape/scraping/uBlock/img/icon_32.png diff --git a/restscrape/uBlock/img/icon_64.png b/restscrape/scraping/uBlock/img/icon_64.png similarity index 100% rename from restscrape/uBlock/img/icon_64.png rename to restscrape/scraping/uBlock/img/icon_64.png diff --git a/restscrape/uBlock/img/ublock-defs.svg b/restscrape/scraping/uBlock/img/ublock-defs.svg similarity index 100% rename from restscrape/uBlock/img/ublock-defs.svg rename to restscrape/scraping/uBlock/img/ublock-defs.svg diff --git a/restscrape/uBlock/img/ublock.svg b/restscrape/scraping/uBlock/img/ublock.svg similarity index 100% rename from restscrape/uBlock/img/ublock.svg rename to restscrape/scraping/uBlock/img/ublock.svg diff --git a/restscrape/uBlock/is-webrtc-supported.html b/restscrape/scraping/uBlock/is-webrtc-supported.html similarity index 100% rename from restscrape/uBlock/is-webrtc-supported.html rename to restscrape/scraping/uBlock/is-webrtc-supported.html diff --git a/restscrape/uBlock/js/1p-filters.js b/restscrape/scraping/uBlock/js/1p-filters.js similarity index 100% rename from restscrape/uBlock/js/1p-filters.js rename to restscrape/scraping/uBlock/js/1p-filters.js diff --git a/restscrape/uBlock/js/3p-filters.js b/restscrape/scraping/uBlock/js/3p-filters.js similarity index 100% rename from restscrape/uBlock/js/3p-filters.js rename to restscrape/scraping/uBlock/js/3p-filters.js diff --git a/restscrape/uBlock/js/about.js b/restscrape/scraping/uBlock/js/about.js similarity index 100% rename from restscrape/uBlock/js/about.js rename to restscrape/scraping/uBlock/js/about.js diff --git a/restscrape/uBlock/js/advanced-settings.js b/restscrape/scraping/uBlock/js/advanced-settings.js similarity index 100% rename from restscrape/uBlock/js/advanced-settings.js rename to restscrape/scraping/uBlock/js/advanced-settings.js diff --git a/restscrape/uBlock/js/asset-viewer.js b/restscrape/scraping/uBlock/js/asset-viewer.js similarity index 100% rename from restscrape/uBlock/js/asset-viewer.js rename to restscrape/scraping/uBlock/js/asset-viewer.js diff --git a/restscrape/uBlock/js/assets.js b/restscrape/scraping/uBlock/js/assets.js similarity index 100% rename from restscrape/uBlock/js/assets.js rename to restscrape/scraping/uBlock/js/assets.js diff --git a/restscrape/uBlock/js/background.js b/restscrape/scraping/uBlock/js/background.js similarity index 100% rename from restscrape/uBlock/js/background.js rename to restscrape/scraping/uBlock/js/background.js diff --git a/restscrape/uBlock/js/cachestorage.js b/restscrape/scraping/uBlock/js/cachestorage.js similarity index 100% rename from restscrape/uBlock/js/cachestorage.js rename to restscrape/scraping/uBlock/js/cachestorage.js diff --git a/restscrape/uBlock/js/cloud-ui.js b/restscrape/scraping/uBlock/js/cloud-ui.js similarity index 100% rename from restscrape/uBlock/js/cloud-ui.js rename to restscrape/scraping/uBlock/js/cloud-ui.js diff --git a/restscrape/uBlock/js/codemirror/search.js b/restscrape/scraping/uBlock/js/codemirror/search.js similarity index 100% rename from restscrape/uBlock/js/codemirror/search.js rename to restscrape/scraping/uBlock/js/codemirror/search.js diff --git a/restscrape/uBlock/js/codemirror/ubo-static-filtering.js b/restscrape/scraping/uBlock/js/codemirror/ubo-static-filtering.js similarity index 100% rename from restscrape/uBlock/js/codemirror/ubo-static-filtering.js rename to restscrape/scraping/uBlock/js/codemirror/ubo-static-filtering.js diff --git a/restscrape/uBlock/js/commands.js b/restscrape/scraping/uBlock/js/commands.js similarity index 100% rename from restscrape/uBlock/js/commands.js rename to restscrape/scraping/uBlock/js/commands.js diff --git a/restscrape/uBlock/js/contentscript.js b/restscrape/scraping/uBlock/js/contentscript.js similarity index 100% rename from restscrape/uBlock/js/contentscript.js rename to restscrape/scraping/uBlock/js/contentscript.js diff --git a/restscrape/uBlock/js/contextmenu.js b/restscrape/scraping/uBlock/js/contextmenu.js similarity index 100% rename from restscrape/uBlock/js/contextmenu.js rename to restscrape/scraping/uBlock/js/contextmenu.js diff --git a/restscrape/uBlock/js/cosmetic-filtering.js b/restscrape/scraping/uBlock/js/cosmetic-filtering.js similarity index 100% rename from restscrape/uBlock/js/cosmetic-filtering.js rename to restscrape/scraping/uBlock/js/cosmetic-filtering.js diff --git a/restscrape/uBlock/js/dashboard-common.js b/restscrape/scraping/uBlock/js/dashboard-common.js similarity index 100% rename from restscrape/uBlock/js/dashboard-common.js rename to restscrape/scraping/uBlock/js/dashboard-common.js diff --git a/restscrape/uBlock/js/dashboard.js b/restscrape/scraping/uBlock/js/dashboard.js similarity index 100% rename from restscrape/uBlock/js/dashboard.js rename to restscrape/scraping/uBlock/js/dashboard.js diff --git a/restscrape/uBlock/js/document-blocked.js b/restscrape/scraping/uBlock/js/document-blocked.js similarity index 100% rename from restscrape/uBlock/js/document-blocked.js rename to restscrape/scraping/uBlock/js/document-blocked.js diff --git a/restscrape/uBlock/js/dyna-rules.js b/restscrape/scraping/uBlock/js/dyna-rules.js similarity index 100% rename from restscrape/uBlock/js/dyna-rules.js rename to restscrape/scraping/uBlock/js/dyna-rules.js diff --git a/restscrape/uBlock/js/dynamic-net-filtering.js b/restscrape/scraping/uBlock/js/dynamic-net-filtering.js similarity index 100% rename from restscrape/uBlock/js/dynamic-net-filtering.js rename to restscrape/scraping/uBlock/js/dynamic-net-filtering.js diff --git a/restscrape/uBlock/js/fa-icons.js b/restscrape/scraping/uBlock/js/fa-icons.js similarity index 100% rename from restscrape/uBlock/js/fa-icons.js rename to restscrape/scraping/uBlock/js/fa-icons.js diff --git a/restscrape/uBlock/js/filtering-context.js b/restscrape/scraping/uBlock/js/filtering-context.js similarity index 100% rename from restscrape/uBlock/js/filtering-context.js rename to restscrape/scraping/uBlock/js/filtering-context.js diff --git a/restscrape/uBlock/js/hnswitches.js b/restscrape/scraping/uBlock/js/hnswitches.js similarity index 100% rename from restscrape/uBlock/js/hnswitches.js rename to restscrape/scraping/uBlock/js/hnswitches.js diff --git a/restscrape/uBlock/js/hntrie.js b/restscrape/scraping/uBlock/js/hntrie.js similarity index 100% rename from restscrape/uBlock/js/hntrie.js rename to restscrape/scraping/uBlock/js/hntrie.js diff --git a/restscrape/uBlock/js/html-filtering.js b/restscrape/scraping/uBlock/js/html-filtering.js similarity index 100% rename from restscrape/uBlock/js/html-filtering.js rename to restscrape/scraping/uBlock/js/html-filtering.js diff --git a/restscrape/uBlock/js/i18n.js b/restscrape/scraping/uBlock/js/i18n.js similarity index 100% rename from restscrape/uBlock/js/i18n.js rename to restscrape/scraping/uBlock/js/i18n.js diff --git a/restscrape/uBlock/js/is-webrtc-supported.js b/restscrape/scraping/uBlock/js/is-webrtc-supported.js similarity index 100% rename from restscrape/uBlock/js/is-webrtc-supported.js rename to restscrape/scraping/uBlock/js/is-webrtc-supported.js diff --git a/restscrape/uBlock/js/logger-ui-inspector.js b/restscrape/scraping/uBlock/js/logger-ui-inspector.js similarity index 100% rename from restscrape/uBlock/js/logger-ui-inspector.js rename to restscrape/scraping/uBlock/js/logger-ui-inspector.js diff --git a/restscrape/uBlock/js/logger-ui.js b/restscrape/scraping/uBlock/js/logger-ui.js similarity index 100% rename from restscrape/uBlock/js/logger-ui.js rename to restscrape/scraping/uBlock/js/logger-ui.js diff --git a/restscrape/uBlock/js/logger.js b/restscrape/scraping/uBlock/js/logger.js similarity index 100% rename from restscrape/uBlock/js/logger.js rename to restscrape/scraping/uBlock/js/logger.js diff --git a/restscrape/uBlock/js/lz4.js b/restscrape/scraping/uBlock/js/lz4.js similarity index 100% rename from restscrape/uBlock/js/lz4.js rename to restscrape/scraping/uBlock/js/lz4.js diff --git a/restscrape/uBlock/js/messaging.js b/restscrape/scraping/uBlock/js/messaging.js similarity index 100% rename from restscrape/uBlock/js/messaging.js rename to restscrape/scraping/uBlock/js/messaging.js diff --git a/restscrape/uBlock/js/pagestore.js b/restscrape/scraping/uBlock/js/pagestore.js similarity index 100% rename from restscrape/uBlock/js/pagestore.js rename to restscrape/scraping/uBlock/js/pagestore.js diff --git a/restscrape/uBlock/js/popup.js b/restscrape/scraping/uBlock/js/popup.js similarity index 100% rename from restscrape/uBlock/js/popup.js rename to restscrape/scraping/uBlock/js/popup.js diff --git a/restscrape/uBlock/js/redirect-engine.js b/restscrape/scraping/uBlock/js/redirect-engine.js similarity index 100% rename from restscrape/uBlock/js/redirect-engine.js rename to restscrape/scraping/uBlock/js/redirect-engine.js diff --git a/restscrape/uBlock/js/reverselookup-worker.js b/restscrape/scraping/uBlock/js/reverselookup-worker.js similarity index 100% rename from restscrape/uBlock/js/reverselookup-worker.js rename to restscrape/scraping/uBlock/js/reverselookup-worker.js diff --git a/restscrape/uBlock/js/reverselookup.js b/restscrape/scraping/uBlock/js/reverselookup.js similarity index 100% rename from restscrape/uBlock/js/reverselookup.js rename to restscrape/scraping/uBlock/js/reverselookup.js diff --git a/restscrape/uBlock/js/scriptlet-filtering.js b/restscrape/scraping/uBlock/js/scriptlet-filtering.js similarity index 100% rename from restscrape/uBlock/js/scriptlet-filtering.js rename to restscrape/scraping/uBlock/js/scriptlet-filtering.js diff --git a/restscrape/uBlock/js/scriptlets/cosmetic-logger.js b/restscrape/scraping/uBlock/js/scriptlets/cosmetic-logger.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/cosmetic-logger.js rename to restscrape/scraping/uBlock/js/scriptlets/cosmetic-logger.js diff --git a/restscrape/uBlock/js/scriptlets/cosmetic-off.js b/restscrape/scraping/uBlock/js/scriptlets/cosmetic-off.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/cosmetic-off.js rename to restscrape/scraping/uBlock/js/scriptlets/cosmetic-off.js diff --git a/restscrape/uBlock/js/scriptlets/cosmetic-on.js b/restscrape/scraping/uBlock/js/scriptlets/cosmetic-on.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/cosmetic-on.js rename to restscrape/scraping/uBlock/js/scriptlets/cosmetic-on.js diff --git a/restscrape/uBlock/js/scriptlets/dom-inspector.js b/restscrape/scraping/uBlock/js/scriptlets/dom-inspector.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/dom-inspector.js rename to restscrape/scraping/uBlock/js/scriptlets/dom-inspector.js diff --git a/restscrape/uBlock/js/scriptlets/dom-survey.js b/restscrape/scraping/uBlock/js/scriptlets/dom-survey.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/dom-survey.js rename to restscrape/scraping/uBlock/js/scriptlets/dom-survey.js diff --git a/restscrape/uBlock/js/scriptlets/element-picker.js b/restscrape/scraping/uBlock/js/scriptlets/element-picker.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/element-picker.js rename to restscrape/scraping/uBlock/js/scriptlets/element-picker.js diff --git a/restscrape/uBlock/js/scriptlets/inlinescript-logger.js b/restscrape/scraping/uBlock/js/scriptlets/inlinescript-logger.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/inlinescript-logger.js rename to restscrape/scraping/uBlock/js/scriptlets/inlinescript-logger.js diff --git a/restscrape/uBlock/js/scriptlets/load-large-media-all.js b/restscrape/scraping/uBlock/js/scriptlets/load-large-media-all.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/load-large-media-all.js rename to restscrape/scraping/uBlock/js/scriptlets/load-large-media-all.js diff --git a/restscrape/uBlock/js/scriptlets/load-large-media-interactive.js b/restscrape/scraping/uBlock/js/scriptlets/load-large-media-interactive.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/load-large-media-interactive.js rename to restscrape/scraping/uBlock/js/scriptlets/load-large-media-interactive.js diff --git a/restscrape/uBlock/js/scriptlets/noscript-spoof.js b/restscrape/scraping/uBlock/js/scriptlets/noscript-spoof.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/noscript-spoof.js rename to restscrape/scraping/uBlock/js/scriptlets/noscript-spoof.js diff --git a/restscrape/uBlock/js/scriptlets/should-inject-contentscript.js b/restscrape/scraping/uBlock/js/scriptlets/should-inject-contentscript.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/should-inject-contentscript.js rename to restscrape/scraping/uBlock/js/scriptlets/should-inject-contentscript.js diff --git a/restscrape/uBlock/js/scriptlets/subscriber.js b/restscrape/scraping/uBlock/js/scriptlets/subscriber.js similarity index 100% rename from restscrape/uBlock/js/scriptlets/subscriber.js rename to restscrape/scraping/uBlock/js/scriptlets/subscriber.js diff --git a/restscrape/uBlock/js/settings.js b/restscrape/scraping/uBlock/js/settings.js similarity index 100% rename from restscrape/uBlock/js/settings.js rename to restscrape/scraping/uBlock/js/settings.js diff --git a/restscrape/uBlock/js/shortcuts.js b/restscrape/scraping/uBlock/js/shortcuts.js similarity index 100% rename from restscrape/uBlock/js/shortcuts.js rename to restscrape/scraping/uBlock/js/shortcuts.js diff --git a/restscrape/uBlock/js/start.js b/restscrape/scraping/uBlock/js/start.js similarity index 100% rename from restscrape/uBlock/js/start.js rename to restscrape/scraping/uBlock/js/start.js diff --git a/restscrape/uBlock/js/static-ext-filtering.js b/restscrape/scraping/uBlock/js/static-ext-filtering.js similarity index 100% rename from restscrape/uBlock/js/static-ext-filtering.js rename to restscrape/scraping/uBlock/js/static-ext-filtering.js diff --git a/restscrape/uBlock/js/static-net-filtering.js b/restscrape/scraping/uBlock/js/static-net-filtering.js similarity index 100% rename from restscrape/uBlock/js/static-net-filtering.js rename to restscrape/scraping/uBlock/js/static-net-filtering.js diff --git a/restscrape/uBlock/js/storage.js b/restscrape/scraping/uBlock/js/storage.js similarity index 100% rename from restscrape/uBlock/js/storage.js rename to restscrape/scraping/uBlock/js/storage.js diff --git a/restscrape/uBlock/js/tab.js b/restscrape/scraping/uBlock/js/tab.js similarity index 100% rename from restscrape/uBlock/js/tab.js rename to restscrape/scraping/uBlock/js/tab.js diff --git a/restscrape/uBlock/js/text-encode.js b/restscrape/scraping/uBlock/js/text-encode.js similarity index 100% rename from restscrape/uBlock/js/text-encode.js rename to restscrape/scraping/uBlock/js/text-encode.js diff --git a/restscrape/uBlock/js/traffic.js b/restscrape/scraping/uBlock/js/traffic.js similarity index 100% rename from restscrape/uBlock/js/traffic.js rename to restscrape/scraping/uBlock/js/traffic.js diff --git a/restscrape/uBlock/js/ublock.js b/restscrape/scraping/uBlock/js/ublock.js similarity index 100% rename from restscrape/uBlock/js/ublock.js rename to restscrape/scraping/uBlock/js/ublock.js diff --git a/restscrape/uBlock/js/udom.js b/restscrape/scraping/uBlock/js/udom.js similarity index 100% rename from restscrape/uBlock/js/udom.js rename to restscrape/scraping/uBlock/js/udom.js diff --git a/restscrape/uBlock/js/uritools.js b/restscrape/scraping/uBlock/js/uritools.js similarity index 100% rename from restscrape/uBlock/js/uritools.js rename to restscrape/scraping/uBlock/js/uritools.js diff --git a/restscrape/uBlock/js/url-net-filtering.js b/restscrape/scraping/uBlock/js/url-net-filtering.js similarity index 100% rename from restscrape/uBlock/js/url-net-filtering.js rename to restscrape/scraping/uBlock/js/url-net-filtering.js diff --git a/restscrape/uBlock/js/utils.js b/restscrape/scraping/uBlock/js/utils.js similarity index 100% rename from restscrape/uBlock/js/utils.js rename to restscrape/scraping/uBlock/js/utils.js diff --git a/restscrape/uBlock/js/vapi-background.js b/restscrape/scraping/uBlock/js/vapi-background.js similarity index 100% rename from restscrape/uBlock/js/vapi-background.js rename to restscrape/scraping/uBlock/js/vapi-background.js diff --git a/restscrape/uBlock/js/vapi-client.js b/restscrape/scraping/uBlock/js/vapi-client.js similarity index 100% rename from restscrape/uBlock/js/vapi-client.js rename to restscrape/scraping/uBlock/js/vapi-client.js diff --git a/restscrape/uBlock/js/vapi-common.js b/restscrape/scraping/uBlock/js/vapi-common.js similarity index 100% rename from restscrape/uBlock/js/vapi-common.js rename to restscrape/scraping/uBlock/js/vapi-common.js diff --git a/restscrape/uBlock/js/vapi-webrequest.js b/restscrape/scraping/uBlock/js/vapi-webrequest.js similarity index 100% rename from restscrape/uBlock/js/vapi-webrequest.js rename to restscrape/scraping/uBlock/js/vapi-webrequest.js diff --git a/restscrape/uBlock/js/vapi.js b/restscrape/scraping/uBlock/js/vapi.js similarity index 100% rename from restscrape/uBlock/js/vapi.js rename to restscrape/scraping/uBlock/js/vapi.js diff --git a/restscrape/uBlock/js/wasm/README.md b/restscrape/scraping/uBlock/js/wasm/README.md similarity index 100% rename from restscrape/uBlock/js/wasm/README.md rename to restscrape/scraping/uBlock/js/wasm/README.md diff --git a/restscrape/uBlock/js/wasm/hntrie.wasm b/restscrape/scraping/uBlock/js/wasm/hntrie.wasm similarity index 100% rename from restscrape/uBlock/js/wasm/hntrie.wasm rename to restscrape/scraping/uBlock/js/wasm/hntrie.wasm diff --git a/restscrape/uBlock/js/wasm/hntrie.wat b/restscrape/scraping/uBlock/js/wasm/hntrie.wat similarity index 100% rename from restscrape/uBlock/js/wasm/hntrie.wat rename to restscrape/scraping/uBlock/js/wasm/hntrie.wat diff --git a/restscrape/uBlock/js/whitelist.js b/restscrape/scraping/uBlock/js/whitelist.js similarity index 100% rename from restscrape/uBlock/js/whitelist.js rename to restscrape/scraping/uBlock/js/whitelist.js diff --git a/restscrape/uBlock/lib/codemirror/LICENSE b/restscrape/scraping/uBlock/lib/codemirror/LICENSE similarity index 100% rename from restscrape/uBlock/lib/codemirror/LICENSE rename to restscrape/scraping/uBlock/lib/codemirror/LICENSE diff --git a/restscrape/uBlock/lib/codemirror/README.md b/restscrape/scraping/uBlock/lib/codemirror/README.md similarity index 100% rename from restscrape/uBlock/lib/codemirror/README.md rename to restscrape/scraping/uBlock/lib/codemirror/README.md diff --git a/restscrape/uBlock/lib/codemirror/addon/display/panel.js b/restscrape/scraping/uBlock/lib/codemirror/addon/display/panel.js similarity index 100% rename from restscrape/uBlock/lib/codemirror/addon/display/panel.js rename to restscrape/scraping/uBlock/lib/codemirror/addon/display/panel.js diff --git a/restscrape/uBlock/lib/codemirror/addon/merge/merge.css b/restscrape/scraping/uBlock/lib/codemirror/addon/merge/merge.css similarity index 100% rename from restscrape/uBlock/lib/codemirror/addon/merge/merge.css rename to restscrape/scraping/uBlock/lib/codemirror/addon/merge/merge.css diff --git a/restscrape/uBlock/lib/codemirror/addon/merge/merge.js b/restscrape/scraping/uBlock/lib/codemirror/addon/merge/merge.js similarity index 100% rename from restscrape/uBlock/lib/codemirror/addon/merge/merge.js rename to restscrape/scraping/uBlock/lib/codemirror/addon/merge/merge.js diff --git a/restscrape/uBlock/lib/codemirror/addon/scroll/annotatescrollbar.js b/restscrape/scraping/uBlock/lib/codemirror/addon/scroll/annotatescrollbar.js similarity index 100% rename from restscrape/uBlock/lib/codemirror/addon/scroll/annotatescrollbar.js rename to restscrape/scraping/uBlock/lib/codemirror/addon/scroll/annotatescrollbar.js diff --git a/restscrape/uBlock/lib/codemirror/addon/search/matchesonscrollbar.css b/restscrape/scraping/uBlock/lib/codemirror/addon/search/matchesonscrollbar.css similarity index 100% rename from restscrape/uBlock/lib/codemirror/addon/search/matchesonscrollbar.css rename to restscrape/scraping/uBlock/lib/codemirror/addon/search/matchesonscrollbar.css diff --git a/restscrape/uBlock/lib/codemirror/addon/search/matchesonscrollbar.js b/restscrape/scraping/uBlock/lib/codemirror/addon/search/matchesonscrollbar.js similarity index 100% rename from restscrape/uBlock/lib/codemirror/addon/search/matchesonscrollbar.js rename to restscrape/scraping/uBlock/lib/codemirror/addon/search/matchesonscrollbar.js diff --git a/restscrape/uBlock/lib/codemirror/addon/search/searchcursor.js b/restscrape/scraping/uBlock/lib/codemirror/addon/search/searchcursor.js similarity index 100% rename from restscrape/uBlock/lib/codemirror/addon/search/searchcursor.js rename to restscrape/scraping/uBlock/lib/codemirror/addon/search/searchcursor.js diff --git a/restscrape/uBlock/lib/codemirror/addon/selection/active-line.js b/restscrape/scraping/uBlock/lib/codemirror/addon/selection/active-line.js similarity index 100% rename from restscrape/uBlock/lib/codemirror/addon/selection/active-line.js rename to restscrape/scraping/uBlock/lib/codemirror/addon/selection/active-line.js diff --git a/restscrape/uBlock/lib/diff/README.md b/restscrape/scraping/uBlock/lib/diff/README.md similarity index 100% rename from restscrape/uBlock/lib/diff/README.md rename to restscrape/scraping/uBlock/lib/diff/README.md diff --git a/restscrape/uBlock/lib/diff/swatinem_diff.js b/restscrape/scraping/uBlock/lib/diff/swatinem_diff.js similarity index 100% rename from restscrape/uBlock/lib/diff/swatinem_diff.js rename to restscrape/scraping/uBlock/lib/diff/swatinem_diff.js diff --git a/restscrape/uBlock/lib/lz4/README.md b/restscrape/scraping/uBlock/lib/lz4/README.md similarity index 100% rename from restscrape/uBlock/lib/lz4/README.md rename to restscrape/scraping/uBlock/lib/lz4/README.md diff --git a/restscrape/uBlock/lib/lz4/lz4-block-codec-any.js b/restscrape/scraping/uBlock/lib/lz4/lz4-block-codec-any.js similarity index 100% rename from restscrape/uBlock/lib/lz4/lz4-block-codec-any.js rename to restscrape/scraping/uBlock/lib/lz4/lz4-block-codec-any.js diff --git a/restscrape/uBlock/lib/lz4/lz4-block-codec-js.js b/restscrape/scraping/uBlock/lib/lz4/lz4-block-codec-js.js similarity index 100% rename from restscrape/uBlock/lib/lz4/lz4-block-codec-js.js rename to restscrape/scraping/uBlock/lib/lz4/lz4-block-codec-js.js diff --git a/restscrape/uBlock/lib/lz4/lz4-block-codec-wasm.js b/restscrape/scraping/uBlock/lib/lz4/lz4-block-codec-wasm.js similarity index 100% rename from restscrape/uBlock/lib/lz4/lz4-block-codec-wasm.js rename to restscrape/scraping/uBlock/lib/lz4/lz4-block-codec-wasm.js diff --git a/restscrape/uBlock/lib/lz4/lz4-block-codec.wasm b/restscrape/scraping/uBlock/lib/lz4/lz4-block-codec.wasm similarity index 100% rename from restscrape/uBlock/lib/lz4/lz4-block-codec.wasm rename to restscrape/scraping/uBlock/lib/lz4/lz4-block-codec.wasm diff --git a/restscrape/uBlock/lib/lz4/lz4-block-codec.wat b/restscrape/scraping/uBlock/lib/lz4/lz4-block-codec.wat similarity index 100% rename from restscrape/uBlock/lib/lz4/lz4-block-codec.wat rename to restscrape/scraping/uBlock/lib/lz4/lz4-block-codec.wat diff --git a/restscrape/uBlock/lib/publicsuffixlist.js b/restscrape/scraping/uBlock/lib/publicsuffixlist.js similarity index 100% rename from restscrape/uBlock/lib/publicsuffixlist.js rename to restscrape/scraping/uBlock/lib/publicsuffixlist.js diff --git a/restscrape/uBlock/lib/punycode.js b/restscrape/scraping/uBlock/lib/punycode.js similarity index 100% rename from restscrape/uBlock/lib/punycode.js rename to restscrape/scraping/uBlock/lib/punycode.js diff --git a/restscrape/uBlock/logger-ui.html b/restscrape/scraping/uBlock/logger-ui.html similarity index 100% rename from restscrape/uBlock/logger-ui.html rename to restscrape/scraping/uBlock/logger-ui.html diff --git a/restscrape/uBlock/managed_storage.json b/restscrape/scraping/uBlock/managed_storage.json similarity index 100% rename from restscrape/uBlock/managed_storage.json rename to restscrape/scraping/uBlock/managed_storage.json diff --git a/restscrape/uBlock/manifest.json b/restscrape/scraping/uBlock/manifest.json similarity index 100% rename from restscrape/uBlock/manifest.json rename to restscrape/scraping/uBlock/manifest.json diff --git a/restscrape/uBlock/popup.html b/restscrape/scraping/uBlock/popup.html similarity index 100% rename from restscrape/uBlock/popup.html rename to restscrape/scraping/uBlock/popup.html diff --git a/restscrape/uBlock/settings.html b/restscrape/scraping/uBlock/settings.html similarity index 100% rename from restscrape/uBlock/settings.html rename to restscrape/scraping/uBlock/settings.html diff --git a/restscrape/uBlock/shortcuts.html b/restscrape/scraping/uBlock/shortcuts.html similarity index 100% rename from restscrape/uBlock/shortcuts.html rename to restscrape/scraping/uBlock/shortcuts.html diff --git a/restscrape/uBlock/web_accessible_resources/049ba9cad461c1d73512654fa0505f24.js b/restscrape/scraping/uBlock/web_accessible_resources/049ba9cad461c1d73512654fa0505f24.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/049ba9cad461c1d73512654fa0505f24.js rename to restscrape/scraping/uBlock/web_accessible_resources/049ba9cad461c1d73512654fa0505f24.js diff --git a/restscrape/uBlock/web_accessible_resources/08bccca4f0b22bca18001da690ef0f6b.png b/restscrape/scraping/uBlock/web_accessible_resources/08bccca4f0b22bca18001da690ef0f6b.png similarity index 100% rename from restscrape/uBlock/web_accessible_resources/08bccca4f0b22bca18001da690ef0f6b.png rename to restscrape/scraping/uBlock/web_accessible_resources/08bccca4f0b22bca18001da690ef0f6b.png diff --git a/restscrape/uBlock/web_accessible_resources/22e03f0a589e9c48b3916f91090da76a.gif b/restscrape/scraping/uBlock/web_accessible_resources/22e03f0a589e9c48b3916f91090da76a.gif similarity index 100% rename from restscrape/uBlock/web_accessible_resources/22e03f0a589e9c48b3916f91090da76a.gif rename to restscrape/scraping/uBlock/web_accessible_resources/22e03f0a589e9c48b3916f91090da76a.gif diff --git a/restscrape/uBlock/web_accessible_resources/2b73c2782126b83faf6ba7d4b30919b5.js b/restscrape/scraping/uBlock/web_accessible_resources/2b73c2782126b83faf6ba7d4b30919b5.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/2b73c2782126b83faf6ba7d4b30919b5.js rename to restscrape/scraping/uBlock/web_accessible_resources/2b73c2782126b83faf6ba7d4b30919b5.js diff --git a/restscrape/uBlock/web_accessible_resources/4bf7b393d3b1b313682eed660b3f79f6.js b/restscrape/scraping/uBlock/web_accessible_resources/4bf7b393d3b1b313682eed660b3f79f6.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/4bf7b393d3b1b313682eed660b3f79f6.js rename to restscrape/scraping/uBlock/web_accessible_resources/4bf7b393d3b1b313682eed660b3f79f6.js diff --git a/restscrape/uBlock/web_accessible_resources/52cd82bf4163cf85a2e578f33f3a1c5b.js b/restscrape/scraping/uBlock/web_accessible_resources/52cd82bf4163cf85a2e578f33f3a1c5b.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/52cd82bf4163cf85a2e578f33f3a1c5b.js rename to restscrape/scraping/uBlock/web_accessible_resources/52cd82bf4163cf85a2e578f33f3a1c5b.js diff --git a/restscrape/uBlock/web_accessible_resources/59abf2914ae612c22ca7faecfa5d19e9.js b/restscrape/scraping/uBlock/web_accessible_resources/59abf2914ae612c22ca7faecfa5d19e9.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/59abf2914ae612c22ca7faecfa5d19e9.js rename to restscrape/scraping/uBlock/web_accessible_resources/59abf2914ae612c22ca7faecfa5d19e9.js diff --git a/restscrape/uBlock/web_accessible_resources/59fb24a2d12455d15bea20980e8a6801.js b/restscrape/scraping/uBlock/web_accessible_resources/59fb24a2d12455d15bea20980e8a6801.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/59fb24a2d12455d15bea20980e8a6801.js rename to restscrape/scraping/uBlock/web_accessible_resources/59fb24a2d12455d15bea20980e8a6801.js diff --git a/restscrape/uBlock/web_accessible_resources/649775b1644161f11f034be886082fac.mp3 b/restscrape/scraping/uBlock/web_accessible_resources/649775b1644161f11f034be886082fac.mp3 similarity index 100% rename from restscrape/uBlock/web_accessible_resources/649775b1644161f11f034be886082fac.mp3 rename to restscrape/scraping/uBlock/web_accessible_resources/649775b1644161f11f034be886082fac.mp3 diff --git a/restscrape/uBlock/web_accessible_resources/70a7e8510b6031f0d7d6dbf4a6e70c3e.png b/restscrape/scraping/uBlock/web_accessible_resources/70a7e8510b6031f0d7d6dbf4a6e70c3e.png similarity index 100% rename from restscrape/uBlock/web_accessible_resources/70a7e8510b6031f0d7d6dbf4a6e70c3e.png rename to restscrape/scraping/uBlock/web_accessible_resources/70a7e8510b6031f0d7d6dbf4a6e70c3e.png diff --git a/restscrape/uBlock/web_accessible_resources/7e270994feadd29c8f6cfe846ab7769c.txt b/restscrape/scraping/uBlock/web_accessible_resources/7e270994feadd29c8f6cfe846ab7769c.txt similarity index 100% rename from restscrape/uBlock/web_accessible_resources/7e270994feadd29c8f6cfe846ab7769c.txt rename to restscrape/scraping/uBlock/web_accessible_resources/7e270994feadd29c8f6cfe846ab7769c.txt diff --git a/restscrape/uBlock/web_accessible_resources/7f7127b0b406fcd719b081372b7ce451.mp4 b/restscrape/scraping/uBlock/web_accessible_resources/7f7127b0b406fcd719b081372b7ce451.mp4 similarity index 100% rename from restscrape/uBlock/web_accessible_resources/7f7127b0b406fcd719b081372b7ce451.mp4 rename to restscrape/scraping/uBlock/web_accessible_resources/7f7127b0b406fcd719b081372b7ce451.mp4 diff --git a/restscrape/uBlock/web_accessible_resources/8f846d6d2abbdbb39219191e407f6cce.js b/restscrape/scraping/uBlock/web_accessible_resources/8f846d6d2abbdbb39219191e407f6cce.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/8f846d6d2abbdbb39219191e407f6cce.js rename to restscrape/scraping/uBlock/web_accessible_resources/8f846d6d2abbdbb39219191e407f6cce.js diff --git a/restscrape/uBlock/web_accessible_resources/9146d832a0025daf20ec16a48b909c81.js b/restscrape/scraping/uBlock/web_accessible_resources/9146d832a0025daf20ec16a48b909c81.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/9146d832a0025daf20ec16a48b909c81.js rename to restscrape/scraping/uBlock/web_accessible_resources/9146d832a0025daf20ec16a48b909c81.js diff --git a/restscrape/uBlock/web_accessible_resources/README.txt b/restscrape/scraping/uBlock/web_accessible_resources/README.txt similarity index 100% rename from restscrape/uBlock/web_accessible_resources/README.txt rename to restscrape/scraping/uBlock/web_accessible_resources/README.txt diff --git a/restscrape/uBlock/web_accessible_resources/acc6e24fce1dcf79ba6a698dc09b0d99.js b/restscrape/scraping/uBlock/web_accessible_resources/acc6e24fce1dcf79ba6a698dc09b0d99.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/acc6e24fce1dcf79ba6a698dc09b0d99.js rename to restscrape/scraping/uBlock/web_accessible_resources/acc6e24fce1dcf79ba6a698dc09b0d99.js diff --git a/restscrape/uBlock/web_accessible_resources/add5ec8fb7834916ff54b56578dc07c4.js b/restscrape/scraping/uBlock/web_accessible_resources/add5ec8fb7834916ff54b56578dc07c4.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/add5ec8fb7834916ff54b56578dc07c4.js rename to restscrape/scraping/uBlock/web_accessible_resources/add5ec8fb7834916ff54b56578dc07c4.js diff --git a/restscrape/uBlock/web_accessible_resources/af3c919ee9a3d97f5dedaf2f8bec146a.js b/restscrape/scraping/uBlock/web_accessible_resources/af3c919ee9a3d97f5dedaf2f8bec146a.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/af3c919ee9a3d97f5dedaf2f8bec146a.js rename to restscrape/scraping/uBlock/web_accessible_resources/af3c919ee9a3d97f5dedaf2f8bec146a.js diff --git a/restscrape/uBlock/web_accessible_resources/b2cc2af4a6c9cac1992c377747d98036.js b/restscrape/scraping/uBlock/web_accessible_resources/b2cc2af4a6c9cac1992c377747d98036.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/b2cc2af4a6c9cac1992c377747d98036.js rename to restscrape/scraping/uBlock/web_accessible_resources/b2cc2af4a6c9cac1992c377747d98036.js diff --git a/restscrape/uBlock/web_accessible_resources/b4fa32e8497f63fd2ca54c1fdae6d273.js b/restscrape/scraping/uBlock/web_accessible_resources/b4fa32e8497f63fd2ca54c1fdae6d273.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/b4fa32e8497f63fd2ca54c1fdae6d273.js rename to restscrape/scraping/uBlock/web_accessible_resources/b4fa32e8497f63fd2ca54c1fdae6d273.js diff --git a/restscrape/uBlock/web_accessible_resources/b71d4af3b115e6d5b5b02c18f901e313.js b/restscrape/scraping/uBlock/web_accessible_resources/b71d4af3b115e6d5b5b02c18f901e313.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/b71d4af3b115e6d5b5b02c18f901e313.js rename to restscrape/scraping/uBlock/web_accessible_resources/b71d4af3b115e6d5b5b02c18f901e313.js diff --git a/restscrape/uBlock/web_accessible_resources/bed5a2e0e77ce019b181b365896fd84f.js b/restscrape/scraping/uBlock/web_accessible_resources/bed5a2e0e77ce019b181b365896fd84f.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/bed5a2e0e77ce019b181b365896fd84f.js rename to restscrape/scraping/uBlock/web_accessible_resources/bed5a2e0e77ce019b181b365896fd84f.js diff --git a/restscrape/uBlock/web_accessible_resources/bf451d42525251f69895201650a9c1ea.js b/restscrape/scraping/uBlock/web_accessible_resources/bf451d42525251f69895201650a9c1ea.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/bf451d42525251f69895201650a9c1ea.js rename to restscrape/scraping/uBlock/web_accessible_resources/bf451d42525251f69895201650a9c1ea.js diff --git a/restscrape/uBlock/web_accessible_resources/c2c7eb5240aa19439b7ebbf38d6789e5.js b/restscrape/scraping/uBlock/web_accessible_resources/c2c7eb5240aa19439b7ebbf38d6789e5.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/c2c7eb5240aa19439b7ebbf38d6789e5.js rename to restscrape/scraping/uBlock/web_accessible_resources/c2c7eb5240aa19439b7ebbf38d6789e5.js diff --git a/restscrape/uBlock/web_accessible_resources/c2e1fb0f4c1450d9be9884c583747d83.js b/restscrape/scraping/uBlock/web_accessible_resources/c2e1fb0f4c1450d9be9884c583747d83.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/c2e1fb0f4c1450d9be9884c583747d83.js rename to restscrape/scraping/uBlock/web_accessible_resources/c2e1fb0f4c1450d9be9884c583747d83.js diff --git a/restscrape/uBlock/web_accessible_resources/c3f690ad3b4d5a1b308d1461a9978749.js b/restscrape/scraping/uBlock/web_accessible_resources/c3f690ad3b4d5a1b308d1461a9978749.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/c3f690ad3b4d5a1b308d1461a9978749.js rename to restscrape/scraping/uBlock/web_accessible_resources/c3f690ad3b4d5a1b308d1461a9978749.js diff --git a/restscrape/uBlock/web_accessible_resources/c77d1c55bb336440de0677e841870dd2.png b/restscrape/scraping/uBlock/web_accessible_resources/c77d1c55bb336440de0677e841870dd2.png similarity index 100% rename from restscrape/uBlock/web_accessible_resources/c77d1c55bb336440de0677e841870dd2.png rename to restscrape/scraping/uBlock/web_accessible_resources/c77d1c55bb336440de0677e841870dd2.png diff --git a/restscrape/uBlock/web_accessible_resources/cb5ec55f9d28a46c647c9aa7c48fd158.js b/restscrape/scraping/uBlock/web_accessible_resources/cb5ec55f9d28a46c647c9aa7c48fd158.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/cb5ec55f9d28a46c647c9aa7c48fd158.js rename to restscrape/scraping/uBlock/web_accessible_resources/cb5ec55f9d28a46c647c9aa7c48fd158.js diff --git a/restscrape/uBlock/web_accessible_resources/d363525161c56887ceebe5e72ed4ef31.js b/restscrape/scraping/uBlock/web_accessible_resources/d363525161c56887ceebe5e72ed4ef31.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/d363525161c56887ceebe5e72ed4ef31.js rename to restscrape/scraping/uBlock/web_accessible_resources/d363525161c56887ceebe5e72ed4ef31.js diff --git a/restscrape/uBlock/web_accessible_resources/f1df24e1f123b1137cec098dab038b34.js b/restscrape/scraping/uBlock/web_accessible_resources/f1df24e1f123b1137cec098dab038b34.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/f1df24e1f123b1137cec098dab038b34.js rename to restscrape/scraping/uBlock/web_accessible_resources/f1df24e1f123b1137cec098dab038b34.js diff --git a/restscrape/uBlock/web_accessible_resources/f643260136b645d95fdc78fc46e9d00a.js b/restscrape/scraping/uBlock/web_accessible_resources/f643260136b645d95fdc78fc46e9d00a.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/f643260136b645d95fdc78fc46e9d00a.js rename to restscrape/scraping/uBlock/web_accessible_resources/f643260136b645d95fdc78fc46e9d00a.js diff --git a/restscrape/uBlock/web_accessible_resources/f6f25816c1c5ce3d465f4cd083539931.js b/restscrape/scraping/uBlock/web_accessible_resources/f6f25816c1c5ce3d465f4cd083539931.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/f6f25816c1c5ce3d465f4cd083539931.js rename to restscrape/scraping/uBlock/web_accessible_resources/f6f25816c1c5ce3d465f4cd083539931.js diff --git a/restscrape/uBlock/web_accessible_resources/f97120ae9a642fea9bf2dc61b0dac5c3.js b/restscrape/scraping/uBlock/web_accessible_resources/f97120ae9a642fea9bf2dc61b0dac5c3.js similarity index 100% rename from restscrape/uBlock/web_accessible_resources/f97120ae9a642fea9bf2dc61b0dac5c3.js rename to restscrape/scraping/uBlock/web_accessible_resources/f97120ae9a642fea9bf2dc61b0dac5c3.js diff --git a/restscrape/uBlock/web_accessible_resources/imported.txt b/restscrape/scraping/uBlock/web_accessible_resources/imported.txt similarity index 100% rename from restscrape/uBlock/web_accessible_resources/imported.txt rename to restscrape/scraping/uBlock/web_accessible_resources/imported.txt diff --git a/restscrape/uBlock/web_accessible_resources/to-import.txt b/restscrape/scraping/uBlock/web_accessible_resources/to-import.txt similarity index 100% rename from restscrape/uBlock/web_accessible_resources/to-import.txt rename to restscrape/scraping/uBlock/web_accessible_resources/to-import.txt diff --git a/restscrape/uBlock/whitelist.html b/restscrape/scraping/uBlock/whitelist.html similarity index 100% rename from restscrape/uBlock/whitelist.html rename to restscrape/scraping/uBlock/whitelist.html