Code restructured, partly.