Moved stuff to organize for the future