Finished refactoring companion AI

Next step is to add lifetime support for actors