Renamed few files and started coding