File structure optimization part 2