ANY23-119 : Initial move of code to extractor-base and extractor-html