Rearranged some files and text strings