cleanup of organism module, removing GenericOrganism, introducing RSATOrganism