Restructure module layout
Format patches in p0 format