- Refactored code.
 - Updated build based on refactor.