move gestures to a better place

Change-Id: I7a37bf569504a8e0fe76ca95f433c4faeecd52b5