Move many functions into new files.
2 files changed