Minor clean up
Move actors to dedicated package