Refactor package and new canal caracol extractor