File structure rearranged