added an Activities folder

added an Activities folder and separated some logic form the controller
back into the activity itself