>>> Partial restructuring
<<< done.