file structure rearranged