renamed Estimator class and performed some file cleanup