RWD redesign

Signed-off-by: Dileep Mishra <Dileep.Mishra@kony.com>