Moved stuff to have a consistent directly structure.