Renamed some files and modified .gitingnore