Moved few classes from Actor to Normal class