rafactoring: package name deleted dollar symbol, changes in GestureTemplate