Refactoring of Ecosystem (part I)

Need to make it worse before I can make it better...