[ORG] Refactoring of Actor classes