Added refactored code-base.