Class proper split up.