changing file structure for clairty