Additional renaming and file rearranging.