Cleanup, refactoring, and started on the NpcMovementCoordinator.