#15 package-structure updatet, seperates logic and activities.