Adjust implementation section headers

The headers was changed and the sections moved to top level.
Merge in structural changes to the implementation section