changing file structure again