Update rule model icon
Move OH rule structure