Reorganize Maven patches
Unshade Maven 3