Reordering files and fixing typography