Continuing to restructure, adding code outlines