Result printing moved completely into estimator && some cleanup
New consistent naming scheme I
New consistent naming scheme II
CLI parameters adjusted to new naming scheme