ECS refactoring/rewrite (WIP)

- Also fixed base functor constructors.