More class layout reorganization.