splitting classes
updating version