Moved stuff to reasonable folder.