Reorganization of crawl-framework