SWF New Layout

Signed-off-by: vishnu-p <vishnu-p@hcl.com>