Reorgranized the renamed some files