Revert "Factory classes for base organisms"

This reverts commit bb593c30243ff2819853edaf1bb1dc33acca979a.