refactor package.

(sorry for committed log file.)