Few corrections.
Renamed & removed few files.