More rename: package -> dataset
More test  converage (about 93%)