Package changes, minor refactor.