Class organization. - v. 1.28.

Class organization. - v. 1.28.