Refactored organism