Minor refactoring

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>
Move NetworkContent class

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>
Refactored UPManager

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>
Merge branch 'large-file'