Activities Refactoring

Refactoring the Activities classes.