Updated and renamed some files