Reordering some files into module/{inc,src}