Moved patches into packaging