File structure adjusted