Added more files and the fixed versions of original files