Removed Files and fixed file names