Remove unwanted directory and modified some files