Moved stuff to the right folders.