Move some stuff to clean up root.