General Gesture class refactoring
Revert "              General Gesture class refactoring"

This reverts commit 0e01721ae5110e239b3d5e735bda65c81dbcaddc.