tables renamed, partials restructured