removed configure-system, moved stuff to where it is needed