Round two of the layout cleanup

Signed-off-by: john mcconnell  johnmcconnell@yahoo.com
round two with  layout

Signed-off-by: john mcconnell  johnmcconnell@yahoo.com