moved stuff to the right place