Move patch package to make patch xml easier to read - the names were too long

Signed-off-by: Ross Allan <rallanpcl@gmail.com>