added sub nodes and new id attrs for wine
Merge branch 'master' of https://github.com/c0un7-z3r0/wine-ing