Revert "Revert "Changes after TouchData renamed to TouchEvent""