move some sets in data folder
fix unittests