diff --git a/src/com/upc/pbe/upcnews/UpcNews UML.png b/src/com/upc/pbe/upcnews/UpcNews UML.png
new file mode 100644
index 0000000..84e9aaa
--- /dev/null
+++ b/src/com/upc/pbe/upcnews/UpcNews UML.png
diff --git a/src/com/upc/pbe/upcnews/UpcNews UML.ucls b/src/com/upc/pbe/upcnews/UpcNews UML.ucls
new file mode 100644
index 0000000..38a0a3a
--- /dev/null
+++ b/src/com/upc/pbe/upcnews/UpcNews UML.ucls
@@ -0,0 +1,237 @@
+<class-diagram version="1.0.11" icons="true" automaticImage="PNG" always-add-relationships="false" 
+  generalizations="false" realizations="false" associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.MainActivity" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/MainActivity.java" binary="false">    
+    <position height="208" width="228" x="35" y="26"/>    
+    <display autosize="false" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="2" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.HTMLParser" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/HTMLParser.java" binary="false">    
+    <position height="-1" width="-1" x="699" y="88"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="3" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.HLS" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/HLS.java" binary="false">    
+    <position height="141" width="198" x="608" y="572"/>    
+    <display autosize="false" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="4" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.VideoActivity.DescarregaSegment" 
+    project="UPC NEWS" file="/UPC NEWS/src/com/upc/pbe/upcnews/VideoActivity.java" binary="false">    
+    <position height="-1" width="-1" x="191" y="876"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="5" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.VideoActivity" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/VideoActivity.java" binary="false">    
+    <position height="-1" width="-1" x="154" y="652"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="6" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.Descarrega" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/Descarrega.java" binary="false">    
+    <position height="123" width="240" x="320" y="284"/>    
+    <display autosize="false" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="7" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.ResourceAdapter" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/ResourceAdapter.java" binary="false">    
+    <position height="90" width="227" x="35" y="250"/>    
+    <display autosize="false" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="8" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.Segment" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/Segment.java" binary="false">    
+    <position height="-1" width="-1" x="967" y="834"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="9" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.Video" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/Video.java" binary="false">    
+    <position height="-1" width="-1" x="707" y="851"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="10" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.WarningException" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/WarningException.java" binary="false">    
+    <position height="-1" width="-1" x="1006" y="319"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="11" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.InfoException" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/InfoException.java" binary="false">    
+    <position height="74" width="147" x="933" y="205"/>    
+    <display autosize="false" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="12" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.ErrorException" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/ErrorException.java" binary="false">    
+    <position height="73" width="149" x="933" y="129"/>    
+    <display autosize="false" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="13" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.BandwidthMeasurer" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/BandwidthMeasurer.java" binary="false">    
+    <position height="-1" width="-1" x="111" y="429"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="14" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.Help" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/Help.java" binary="false">    
+    <position height="-1" width="-1" x="755" y="378"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="15" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.ParentList" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/ParentList.java" binary="false">    
+    <position height="251" width="155" x="352" y="682"/>    
+    <display autosize="false" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="16" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.Prefs" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/Prefs.java" binary="false">    
+    <position height="135" width="237" x="637" y="177"/>    
+    <display autosize="false" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="17" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.UpcApp" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/UpcApp.java" binary="false">    
+    <position height="-1" width="-1" x="1033" y="598"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="18" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.Directoris" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/Directoris.java" binary="false">    
+    <position height="-1" width="-1" x="411" y="131"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <class id="19" corner="BOTTOM_RIGHT" language="java" name="com.upc.pbe.upcnews.Parser" project="UPC NEWS" 
+    file="/UPC NEWS/src/com/upc/pbe/upcnews/Parser.java" binary="false">    
+    <position height="-1" width="-1" x="439" y="508"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">      
+      <attributes public="false" package="false" protected="false" private="false"/>      
+      <operations public="true" package="false" protected="true" private="true"/>    
+    </display>  
+  </class>  
+  <association id="20">    
+    <end type="SOURCE" refId="15" navigable="false">      
+      <attribute id="21" name="lists"/>      
+      <multiplicity id="22" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="9" navigable="true"/>    
+    <display labels="false" multiplicity="true"/>  
+  </association>  
+  <association id="23">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="24" name="h"/>      
+      <multiplicity id="25" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="3" navigable="true"/>    
+    <display labels="false" multiplicity="true"/>  
+  </association>  
+  <association id="26">    
+    <end type="SOURCE" refId="17" navigable="false">      
+      <attribute id="27" name="h"/>      
+      <multiplicity id="28" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="3" navigable="true"/>    
+    <display labels="false" multiplicity="true"/>  
+  </association>  
+  <association id="29">    
+    <end type="SOURCE" refId="9" navigable="false">      
+      <attribute id="30" name="segments"/>      
+      <multiplicity id="31" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="8" navigable="true"/>    
+    <display labels="false" multiplicity="true"/>  
+  </association>  
+  <association id="32">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="33" name="videos"/>      
+      <multiplicity id="34" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="15" navigable="true"/>    
+    <display labels="false" multiplicity="true"/>  
+  </association>  
+  <association id="35">    
+    <end type="SOURCE" refId="18" navigable="false">      
+      <attribute id="36" name="parser"/>      
+      <multiplicity id="37" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="false" multiplicity="true"/>  
+  </association>  
+  <association id="38">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="39" name="bm"/>      
+      <multiplicity id="40" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="13" navigable="true"/>    
+    <display labels="false" multiplicity="true"/>  
+  </association>  
+  <association id="41">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="42" name="qualities"/>      
+      <multiplicity id="43" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="9" navigable="true"/>    
+    <display labels="false" multiplicity="true"/>  
+  </association>  
+  <association id="44">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="45" name="segments"/>      
+      <multiplicity id="46" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="8" navigable="true"/>    
+    <display labels="false" multiplicity="true"/>  
+  </association>  
+  <nesting id="47">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="4"/>  
+  </nesting>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    visibility="true">    
+    <attributes public="false" package="false" protected="false" private="false"/>    
+    <operations public="true" package="false" protected="true" private="true"/>  
+  </classifier-display>  
+  <association-display labels="false" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file