[Other] Changed some file constructions