Changed Structure..

Chnaged structure as per our discussion.