... to make the structure consistent with the other modules. Change-Id: I3b32dd19eec086ad979441fb2484d6237e891d3a