fixing file structure