Rearranged some files and made git angry.