improve maven plugin and move module files
move xpatch files to appropriate folder