Actor

Refactor several classes based on the relationship diagram (see dropbox)