moved non-Activity code to framework package