Initial revamping of Crawler4j