Decoupled touchlisteners from main

- Also added third party shakeListner not working atm on bb