Remove species concept and replace with class