Move utility package 'term' to pkg/term