This update brings FM in line with directory and index structure of other content. Signed-off-by: Stone <ronald.stone@windriver.com> Change-Id: If730098dc3eb119defa89647b04ac9f7c8717992