fix(activity): Restructured activity components.