Close 'class_restructuring' branch.

--HG--
branch : class_restructuring
extra : close : 1