Got rid of redundand files because of naming conflics