Removed and replaced some files