Revert "Revert "Factory classes for base organisms""

This reverts commit da38017c5915cbcf2a1ca94c09739bac3d2731ec.