Catageek refactor movers in ecs

Fixes for MSVC