change to file structure