Refactored population and organism