Moved activitiies to its own package