Moved stuff to automodules.