refactoring
refactored the estimator node
fixed dependency to BFL