move stuff to manifest