Removed Organism class

Removed organism class and added inheritance relationships.