fixing file stucture