Split out class into definitions and single spec class.