Gestures bounds and Class restructuring