Updated base and swipe classes to 3.0beta2