I more in favour of the nesting of those options but wouldn't add games, applications, etc. subsections for each os/device. That would just add more overlap. Many of the applications are available for multiple targets so I'd leave those sections as they are. In stead I'd just merge os + maching device(s) like someone proposed earlier (for example N900/Maemo5, N8x0/Maemo4, etc.).