Instead of putting implementation(s) under the interfaces
section put the implementation(s) under there own section.
This also includes some other tweaks to refer to those
implementation(s) where appropriate.
Change-Id: Iffdc0439c843e7f70cf873e5a75501feb51f96c7