Rearranged settings files