moving all fields to Cuclass