change file structure again