move some data structure class to the proper package