Fix compilation issues.

Signed-off-by: Lucio Maciel <lucio.maciel@hp.com>
Fix main layout

Signed-off-by: Lucio Maciel <lucio.maciel@hp.com>