Split up to files and work on the actor parts