Broke Activities into Classes

Better breakdown of activities into classes.