Re work file structure