Gunnars file structure adapted