refactoring: actor classes
Merge branch 'master' of https://github.com/Peregrine42/uni-work