Click interaction refactor

Refactoring to the new Interaction structure.