Organizing repository and removing ambiguous files