moved stuff to correct location