Merged pair.c into actor.c (new target.c)
Refactor/renaming tidyness