Refactor and packaging.