Changed package name, to make it less ambiguous
Routed tap event through NotificationService, to make FSM more responsive