Refactore some classes. Release 1.8.1.68.