Simplify messages, fix names and folders, extract out actor.
Move actors impl to another branch