[Shridhar] - Changing app structure.
[Vivek/Shridhar] - Adding specs