crawler package refactor