Rearranged configuration and preference files