Fix #74: Move key functions to separate package.
12 files changed