Forest Ecosystem refactoring preparation
Part 1 of ForestEcosystem refactor
Refactored ForestEcosystem, discovered move bug