moved a stuff to new structure