*8094* Move header/sidebar structures into PKP