diff --git a/model/Package balance.png b/model/Package balance.png
index 964fa47..8e2a322 100644
Binary files a/model/Package balance.png and b/model/Package balance.png differ
diff --git a/model/Package cli-commands.png b/model/Package cli-commands.png
index eb9d028..e35f67d 100644
Binary files a/model/Package cli-commands.png and b/model/Package cli-commands.png differ
diff --git a/model/Package cli.png b/model/Package cli.png
index 6e7cbc9..d30e441 100644
Binary files a/model/Package cli.png and b/model/Package cli.png differ
diff --git a/model/Package core-components.png b/model/Package core-components.png
index 41ff8ed..ae7aed1 100644
Binary files a/model/Package core-components.png and b/model/Package core-components.png differ
diff --git a/model/Package core-planning-policies.png b/model/Package core-planning-policies.png
deleted file mode 100644
index 537bda5..0000000
Binary files a/model/Package core-planning-policies.png and /dev/null differ
diff --git a/model/Package core-planning.png b/model/Package core-planning.png
index ee79b57..577f6bf 100644
Binary files a/model/Package core-planning.png and b/model/Package core-planning.png differ
diff --git a/model/Package core-renting.png b/model/Package core-renting.png
index 54464e5..5ae6fd4 100644
Binary files a/model/Package core-renting.png and b/model/Package core-renting.png differ
diff --git a/model/Package core-setup.png b/model/Package core-setup.png
index dd164ca..f3863d2 100644
Binary files a/model/Package core-setup.png and b/model/Package core-setup.png differ
diff --git a/model/Package core-statistics-balace-station.png b/model/Package core-statistics-balace-station.png
index 2a1eff5..bba2770 100644
Binary files a/model/Package core-statistics-balace-station.png and b/model/Package core-statistics-balace-station.png differ
diff --git a/model/Package core-statistics-balace-system.png b/model/Package core-statistics-balace-system.png
deleted file mode 100644
index b3b03c4..0000000
Binary files a/model/Package core-statistics-balace-system.png and /dev/null differ
diff --git a/model/Package core-statistics-balace-user.png b/model/Package core-statistics-balace-user.png
index 555d49f..d3b72e7 100644
Binary files a/model/Package core-statistics-balace-user.png and b/model/Package core-statistics-balace-user.png differ
diff --git a/model/Package core-system.png b/model/Package core-system.png
new file mode 100644
index 0000000..6584dcb
Binary files /dev/null and b/model/Package core-system.png differ
diff --git a/model/Package core.png b/model/Package core.png
index 7c97354..cfd5619 100644
Binary files a/model/Package core.png and b/model/Package core.png differ
diff --git a/model/Package factories.png b/model/Package factories.png
new file mode 100644
index 0000000..1b8ed35
Binary files /dev/null and b/model/Package factories.png differ
diff --git a/model/Top-Level Package (src).png b/model/Top-Level Package (src).png
new file mode 100644
index 0000000..7ce291c
Binary files /dev/null and b/model/Top-Level Package (src).png differ
diff --git a/model/Top-Level Package.png b/model/Top-Level Package.png
deleted file mode 100644
index da94c5a..0000000
Binary files a/model/Top-Level Package.png and /dev/null differ
diff --git a/model/balance.uml b/model/balance.uml
index 85f3699..1756f8f 100644
--- a/model/balance.uml
+++ b/model/balance.uml
@@ -4,13 +4,14 @@
   <OriginalElement>core.statistics.balance</OriginalElement>
   <nodes>
     <node x="0.0" y="0.0">core.statistics.balance.station</node>
-    <node x="0.0" y="97.0">core.statistics.balance.system</node>
-    <node x="0.0" y="194.0">core.statistics.balance.user</node>
+    <node x="0.0" y="97.0">core.statistics.balance.user</node>
   </nodes>
   <notes />
   <edges />
-  <settings layout="Hierarchic Group" zoom="1.0" x="76.0" y="123.0" />
-  <SelectedNodes />
+  <settings layout="Hierarchic Group" zoom="1.0" x="76.0" y="74.5" />
+  <SelectedNodes>
+    <node>core.statistics.balance.station</node>
+  </SelectedNodes>
   <Categories>
     <Category>Fields</Category>
     <Category>Constructors</Category>
diff --git a/model/cli-commands.uml b/model/cli-commands.uml
index 69f4ae2..5d683f8 100644
--- a/model/cli-commands.uml
+++ b/model/cli-commands.uml
@@ -3,132 +3,132 @@
   <ID>JAVA</ID>
   <OriginalElement>cli.commands</OriginalElement>
   <nodes>
-    <node x="505.0" y="184.0">cli.commands.Online</node>
-    <node x="1310.0" y="381.0">cli.commands.RunTestTest</node>
+    <node x="3214.0" y="184.0">cli.commands.Online</node>
+    <node x="2409.0" y="381.0">cli.commands.RunTestTest</node>
     <node x="238.0" y="152.0">cli.commands.AddUser</node>
-    <node x="1695.0" y="184.0">cli.commands.Help</node>
-    <node x="1933.0" y="184.0">cli.commands.Setup</node>
-    <node x="1514.0" y="381.0">cli.commands.OnlineTest</node>
-    <node x="981.0000000000001" y="184.0">cli.commands.Offline</node>
-    <node x="2171.0" y="184.0">cli.commands.DisplayStation</node>
-    <node x="3152.0" y="184.0">cli.commands.RentBicycle</node>
-    <node x="466.0" y="381.0">cli.commands.SortStationTest</node>
-    <node x="1718.0" y="381.0">cli.commands.HelpTest</node>
-    <node x="2409.0" y="152.0">cli.commands.AddManager</node>
-    <node x="0.0" y="381.0">cli.commands.DisplayStationTest</node>
-    <node x="1219.0" y="184.0">cli.commands.SortStation</node>
-    <node x="679.0" y="381.0">cli.commands.DisplayUserTest</node>
-    <node x="1922.0" y="381.0">cli.commands.SetupTest</node>
-    <node x="1457.0" y="184.0">cli.commands.DisplayUser</node>
-    <node x="2914.0" y="184.0">cli.commands.Display</node>
-    <node x="892.0" y="381.0">cli.commands.RentBicycleTest</node>
-    <node x="2126.0" y="381.0">cli.commands.AddUserTest</node>
-    <node x="743.0000000000001" y="184.0">cli.commands.RunTest</node>
-    <node x="2330.0" y="381.0">cli.commands.DisplayTest</node>
-    <node x="2534.0" y="381.0">cli.commands.OfflineTest</node>
-    <node x="1105.0" y="381.0">cli.commands.AddManagerTest</node>
-    <node x="237.0" y="381.0">cli.commands.ReturnBicycleTest</node>
-    <node x="2738.0" y="381.0">cli.commands.ExitTest</node>
-    <node x="2676.0" y="184.0">cli.commands.Exit</node>
-    <node x="0.0" y="184.0">cli.commands.ReturnBicycle</node>
-    <node x="1633.0" y="0.0">cli.commands.Command</node>
+    <node x="1043.0" y="184.0">cli.commands.Help</node>
+    <node x="1995.0" y="184.0">cli.commands.Setup</node>
+    <node x="655.0" y="381.0">cli.commands.OnlineTest</node>
+    <node x="2976.0" y="184.0">cli.commands.Offline</node>
+    <node x="1757.0" y="184.0">cli.commands.DisplayStation</node>
+    <node x="2738.0" y="184.0">cli.commands.RentBicycle</node>
+    <node x="229.0" y="381.0">cli.commands.SortStationTest</node>
+    <node x="1520.0" y="381.0">cli.commands.HelpTest</node>
+    <node x="2233.0" y="152.0">cli.commands.AddManager</node>
+    <node x="1940.0" y="381.0">cli.commands.DisplayStationTest</node>
+    <node x="746.0" y="162.0">cli.commands.SortStation</node>
+    <node x="1307.0" y="381.0">cli.commands.DisplayUserTest</node>
+    <node x="1730.0" y="381.0">cli.commands.SetupTest</node>
+    <node x="1281.0" y="184.0">cli.commands.DisplayUser</node>
+    <node x="2500.0" y="184.0">cli.commands.Display</node>
+    <node x="442.0" y="381.0">cli.commands.RentBicycleTest</node>
+    <node x="1075.0" y="381.0">cli.commands.AddUserTest</node>
+    <node x="505.0" y="162.0">cli.commands.RunTest</node>
+    <node x="2619.0" y="381.0">cli.commands.DisplayTest</node>
+    <node x="865.0" y="381.0">cli.commands.OfflineTest</node>
+    <node x="2177.0" y="381.0">cli.commands.AddManagerTest</node>
+    <node x="0.0" y="381.0">cli.commands.ReturnBicycleTest</node>
+    <node x="2829.0" y="381.0">cli.commands.ExitTest</node>
+    <node x="1519.0" y="184.0">cli.commands.ReturnBicycle</node>
+    <node x="0.0" y="184.0">cli.commands.Exit</node>
+    <node x="1695.0" y="0.0">cli.commands.Command</node>
   </nodes>
   <notes />
   <edges>
-    <edge source="cli.commands.DisplayStation" target="cli.commands.Command">
+    <edge source="cli.commands.Exit" target="cli.commands.Command">
       <point x="0.0" y="-60.0" />
-      <point x="2280.0" y="112.0" />
-      <point x="1703.571428571429" y="112.0" />
-      <point x="18.57142857142867" y="26.0" />
+      <point x="109.0" y="72.0" />
+      <point x="1698.7142857142858" y="72.0" />
+      <point x="-48.28571428571422" y="26.0" />
     </edge>
-    <edge source="cli.commands.Exit" target="cli.commands.Command">
+    <edge source="cli.commands.DisplayStation" target="cli.commands.Command">
       <point x="0.0" y="-60.0" />
-      <point x="2785.0" y="92.0" />
-      <point x="1718.4285714285716" y="92.0" />
-      <point x="33.42857142857133" y="26.0" />
+      <point x="1866.0" y="132.0" />
+      <point x="1750.7142857142858" y="132.0" />
+      <point x="3.7142857142857792" y="26.0" />
     </edge>
     <edge source="cli.commands.AddUser" target="cli.commands.Command">
       <point x="0.0" y="-92.0" />
       <point x="361.5" y="82.0" />
-      <point x="1644.1428571428573" y="82.0" />
+      <point x="1706.142857142857" y="82.0" />
       <point x="-40.85714285714289" y="26.0" />
     </edge>
     <edge source="cli.commands.Help" target="cli.commands.Command">
       <point x="0.0" y="-60.0" />
-      <point x="1804.0" y="132.0" />
-      <point x="1688.7142857142858" y="132.0" />
-      <point x="3.7142857142857792" y="26.0" />
+      <point x="1152.0" y="112.0" />
+      <point x="1728.4285714285713" y="112.0" />
+      <point x="-18.57142857142867" y="26.0" />
     </edge>
     <edge source="cli.commands.SortStation" target="cli.commands.Command">
-      <point x="0.0" y="-60.0" />
-      <point x="1328.0" y="122.0" />
-      <point x="1673.8571428571431" y="122.0" />
-      <point x="-11.14285714285711" y="26.0" />
+      <point x="0.0" y="-82.0" />
+      <point x="884.5" y="102.0" />
+      <point x="1721.0" y="102.0" />
+      <point x="-26.0" y="26.0" />
     </edge>
     <edge source="cli.commands.RentBicycle" target="cli.commands.Command">
       <point x="0.0" y="-60.0" />
-      <point x="3261.0" y="72.0" />
-      <point x="1733.2857142857142" y="72.0" />
-      <point x="48.28571428571422" y="26.0" />
+      <point x="2847.0" y="92.0" />
+      <point x="1780.4285714285713" y="92.0" />
+      <point x="33.42857142857133" y="26.0" />
     </edge>
     <edge source="cli.commands.Online" target="cli.commands.Command">
       <point x="0.0" y="-60.0" />
-      <point x="614.0" y="92.0" />
-      <point x="1651.571428571429" y="92.0" />
-      <point x="-33.42857142857133" y="26.0" />
+      <point x="3323.0" y="72.0" />
+      <point x="1795.2857142857142" y="72.0" />
+      <point x="48.28571428571422" y="26.0" />
     </edge>
     <edge source="cli.commands.Offline" target="cli.commands.Command">
       <point x="0.0" y="-60.0" />
-      <point x="1090.0" y="112.0" />
-      <point x="1666.4285714285716" y="112.0" />
-      <point x="-18.57142857142867" y="26.0" />
+      <point x="3085.0" y="82.0" />
+      <point x="1787.857142857143" y="82.0" />
+      <point x="40.85714285714289" y="26.0" />
     </edge>
     <edge source="cli.commands.DisplayUser" target="cli.commands.Command">
       <point x="0.0" y="-60.0" />
-      <point x="1566.0" y="132.0" />
-      <point x="1681.2857142857142" y="132.0" />
-      <point x="-3.7142857142857792" y="26.0" />
+      <point x="1390.0" y="122.0" />
+      <point x="1735.857142857143" y="122.0" />
+      <point x="-11.14285714285711" y="26.0" />
     </edge>
     <edge source="cli.commands.ReturnBicycle" target="cli.commands.Command">
       <point x="0.0" y="-60.0" />
-      <point x="109.0" y="72.0" />
-      <point x="1636.7142857142858" y="72.0" />
-      <point x="-48.28571428571422" y="26.0" />
+      <point x="1628.0" y="132.0" />
+      <point x="1743.2857142857142" y="132.0" />
+      <point x="-3.7142857142857792" y="26.0" />
     </edge>
     <edge source="cli.commands.AddManager" target="cli.commands.Command">
       <point x="0.0" y="-92.0" />
-      <point x="2532.5" y="102.0" />
-      <point x="1711.0" y="102.0" />
-      <point x="26.0" y="26.0" />
+      <point x="2356.5" y="112.0" />
+      <point x="1765.5714285714287" y="112.0" />
+      <point x="18.57142857142867" y="26.0" />
     </edge>
     <edge source="cli.commands.RunTest" target="cli.commands.Command">
-      <point x="0.0" y="-60.0" />
-      <point x="852.0000000000001" y="102.0" />
-      <point x="1659.0" y="102.0" />
-      <point x="-26.0" y="26.0" />
+      <point x="0.0" y="-82.0" />
+      <point x="615.5" y="92.0" />
+      <point x="1713.5714285714287" y="92.0" />
+      <point x="-33.42857142857133" y="26.0" />
     </edge>
     <edge source="cli.commands.Display" target="cli.commands.Command">
       <point x="0.0" y="-60.0" />
-      <point x="3023.0" y="82.0" />
-      <point x="1725.8571428571431" y="82.0" />
-      <point x="40.85714285714289" y="26.0" />
+      <point x="2609.0" y="102.0" />
+      <point x="1773.0" y="102.0" />
+      <point x="26.0" y="26.0" />
     </edge>
     <edge source="cli.commands.Setup" target="cli.commands.Command">
       <point x="0.0" y="-60.0" />
-      <point x="2042.0" y="122.0" />
-      <point x="1696.1428571428573" y="122.0" />
+      <point x="2104.0" y="122.0" />
+      <point x="1758.142857142857" y="122.0" />
       <point x="11.14285714285711" y="26.0" />
     </edge>
   </edges>
-  <settings layout="Hierarchic Group" zoom="0.6329449152542372" x="924.0000000000001" y="199.0" />
+  <settings layout="Hierarchic Group" zoom="0.7907838983050848" x="2001.0" y="297.2947086403215" />
   <SelectedNodes>
     <node>cli.commands.Command</node>
   </SelectedNodes>
   <Categories>
-    <Category>Properties</Category>
-    <Category>Methods</Category>
     <Category>Constructors</Category>
     <Category>Fields</Category>
+    <Category>Methods</Category>
+    <Category>Properties</Category>
   </Categories>
   <SCOPE>All</SCOPE>
   <VISIBILITY>private</VISIBILITY>
diff --git a/model/cli.uml b/model/cli.uml
index ff5b89b..c7fc431 100644
--- a/model/cli.uml
+++ b/model/cli.uml
@@ -3,17 +3,21 @@
   <ID>JAVA</ID>
   <OriginalElement>cli</OriginalElement>
   <nodes>
-    <node x="0.0" y="198.0">cli.commands</node>
-    <node x="0.0" y="0.0">cli.Main</node>
-    <node x="0.0" y="99.0">cli.MainTest</node>
+    <node x="0.0" y="220.0">cli.RunCommand</node>
+    <node x="0.0" y="121.0">cli.RunCommandTest</node>
+    <node x="0.0" y="319.0">cli.commands</node>
+    <node x="0.0" y="0.0">cli.MyVelibCLITest</node>
+    <node x="192.0" y="220.0">cli.MyVelibCLI</node>
   </nodes>
   <notes />
   <edges />
-  <settings layout="Hierarchic Group" zoom="1.0" x="80.0" y="125.0" />
+  <settings layout="Hierarchic Group" zoom="1.0" x="411.5" y="171.5" />
   <SelectedNodes />
   <Categories>
-    <Category>Constructors</Category>
     <Category>Methods</Category>
+    <Category>Properties</Category>
+    <Category>Constructors</Category>
+    <Category>Fields</Category>
   </Categories>
   <SCOPE>All</SCOPE>
   <VISIBILITY>private</VISIBILITY>
diff --git a/model/components.uml b/model/components.uml
index b2abf28..8f6d80a 100644
--- a/model/components.uml
+++ b/model/components.uml
@@ -3,82 +3,76 @@
   <ID>JAVA</ID>
   <OriginalElement>core.components</OriginalElement>
   <nodes>
-    <node x="1331.0" y="0.0">core.components.ParkingSlot</node>
-    <node x="1622.0" y="2158.0">core.components.factories</node>
-    <node x="1225.0" y="1781.0">core.components.TerminalTest</node>
-    <node x="527.0" y="980.0">core.components.PlusStation</node>
-    <node x="1729.0" y="1781.0">core.components.BicycleTest</node>
-    <node x="1516.0" y="1781.0">core.components.ParkingSlotTest</node>
-    <node x="0.0" y="2158.0">core.components.SortStationByLeastOccupied</node>
-    <node x="2133.0" y="1781.0">core.components.SortStationByLeastOccupiedTest</node>
-    <node x="535.0" y="1781.0">core.components.Terminal</node>
+    <node x="1339.0" y="0.0">core.components.ParkingSlot</node>
+    <node x="554.0" y="1681.0">core.components.factories</node>
+    <node x="856.0" y="1538.0">core.components.TerminalTest</node>
+    <node x="935.0" y="802.0">core.components.PlusStation</node>
+    <node x="452.0" y="1538.0">core.components.BicycleTest</node>
+    <node x="239.0" y="1538.0">core.components.ParkingSlotTest</node>
+    <node x="1378.0" y="1538.0">core.components.SortStationByLeastOccupied</node>
+    <node x="1045.0" y="1538.0">core.components.SortStationByLeastOccupiedTest</node>
+    <node x="1289.0" y="1163.0">core.components.Terminal</node>
     <node x="0.0" y="0.0">core.components.User</node>
-    <node x="89.0" y="1574.0">core.components.Manager</node>
-    <node x="1991.5" y="0.0">core.components.Bicycle</node>
-    <node x="1555.0" y="0.0">core.components.UserTest</node>
-    <node x="1891.0" y="278.0">core.components.MechanicalBicycle</node>
-    <node x="855.0" y="2158.0">core.components.ElectricalBicycleTest</node>
-    <node x="977.0" y="1781.0">core.components.ManagerTest</node>
-    <node x="1835.0" y="2158.0">core.components.PlusStationTest</node>
-    <node x="1116.0" y="2158.0">core.components.MechanicalBicycleTest</node>
-    <node x="0.0" y="2059.0">core.components.Vlibre</node>
-    <node x="15.5" y="1781.0">core.components.Card</node>
-    <node x="1377.0" y="2158.0">core.components.StandardStationTest</node>
-    <node x="2095.0" y="278.0">core.components.ElectricalBicycle</node>
-    <node x="2048.0" y="2158.0">core.components.VlibreTest</node>
-    <node x="301.0" y="2158.0">core.components.SortStationByMostUsedTest</node>
-    <node x="1931.0" y="1781.0">core.components.CardTest</node>
-    <node x="903.0" y="980.0">core.components.StandardStation</node>
-    <node x="732.25" y="0.0">core.components.Station</node>
-    <node x="249.0" y="1781.0">core.components.StationTest</node>
-    <node x="594.0" y="2158.0">core.components.SortStationByMostUsed</node>
-    <node x="2221.0" y="2158.0">core.components.VmaxTest</node>
-    <node x="116.0" y="2059.0">core.components.Vmax</node>
+    <node x="99.5" y="1163.0">core.components.Bicycle</node>
+    <node x="85.0" y="956.0">core.components.Manager</node>
+    <node x="204.0" y="1439.0">core.components.MechanicalBicycle</node>
+    <node x="683.0" y="1163.0">core.components.UserTest</node>
+    <node x="0.0" y="1538.0">core.components.ManagerTest</node>
+    <node x="542.0" y="1439.0">core.components.Vlibre</node>
+    <node x="444.75" y="1163.0">core.components.Card</node>
+    <node x="0.0" y="1439.0">core.components.ElectricalBicycle</node>
+    <node x="0.0" y="1681.0">core.components.SortStationByMostUsedTest</node>
+    <node x="530.0" y="802.0">core.components.StandardStation</node>
+    <node x="654.0" y="1538.0">core.components.CardTest</node>
+    <node x="749.5" y="0.0">core.components.Station</node>
+    <node x="1000.0" y="1163.0">core.components.StationTest</node>
+    <node x="293.0" y="1681.0">core.components.SortStationByMostUsed</node>
+    <node x="433.0" y="1439.0">core.components.Vmax</node>
   </nodes>
   <notes />
   <edges>
     <edge source="core.components.Vmax" target="core.components.Card">
       <point x="0.0" y="-27.0" />
-      <point x="160.0" y="2034.0" />
-      <point x="148.25" y="2034.0" />
-      <point x="44.25" y="114.0" />
+      <point x="477.5" y="1414.0" />
+      <point x="489.25" y="1414.0" />
+      <point x="-44.5" y="113.0" />
     </edge>
     <edge source="core.components.ElectricalBicycle" target="core.components.Bicycle">
       <point x="0.0" y="-27.0" />
-      <point x="2187.0" y="253.0" />
-      <point x="2131.75" y="253.0" />
-      <point x="46.75" y="114.0" />
+      <point x="92.0" y="1414.0" />
+      <point x="146.75" y="1414.0" />
+      <point x="-47.25" y="113.0" />
     </edge>
     <edge source="core.components.MechanicalBicycle" target="core.components.Bicycle">
       <point x="0.0" y="-27.0" />
-      <point x="1983.0" y="253.0" />
-      <point x="2038.25" y="253.0" />
-      <point x="-46.75" y="114.0" />
+      <point x="296.0" y="1414.0" />
+      <point x="241.25" y="1414.0" />
+      <point x="47.25" y="113.0" />
     </edge>
     <edge source="core.components.StandardStation" target="core.components.Station">
       <point x="0.0" y="-38.0" />
-      <point x="1094.5" y="955.0" />
-      <point x="983.5" y="955.0" />
-      <point x="83.75" y="465.0" />
+      <point x="722.5" y="777.0" />
+      <point x="834.0" y="777.0" />
+      <point x="-84.5" y="376.0" />
     </edge>
     <edge source="core.components.Manager" target="core.components.User">
       <point x="0.0" y="-81.0" />
-      <point x="0.0" y="762.0" />
-    </edge>
-    <edge source="core.components.PlusStation" target="core.components.Station">
-      <point x="0.0" y="-38.0" />
-      <point x="705.0" y="955.0" />
-      <point x="816.0" y="955.0" />
-      <point x="-83.75" y="465.0" />
+      <point x="0.0" y="453.0" />
     </edge>
     <edge source="core.components.Vlibre" target="core.components.Card">
       <point x="0.0" y="-27.0" />
-      <point x="48.0" y="2034.0" />
-      <point x="59.75" y="2034.0" />
-      <point x="-44.25" y="114.0" />
+      <point x="590.0" y="1414.0" />
+      <point x="578.25" y="1414.0" />
+      <point x="44.5" y="113.0" />
+    </edge>
+    <edge source="core.components.PlusStation" target="core.components.Station">
+      <point x="0.0" y="-38.0" />
+      <point x="1114.5" y="777.0" />
+      <point x="1003.0" y="777.0" />
+      <point x="84.5" y="376.0" />
     </edge>
   </edges>
-  <settings layout="Hierarchic Group" zoom="0.2361111111111111" x="1210.5" y="1106.0" />
+  <settings layout="Hierarchic Group" zoom="0.5492772667542707" x="406.0" y="360.5" />
   <SelectedNodes>
     <node>core.components.ParkingSlot</node>
   </SelectedNodes>
@@ -86,6 +80,7 @@
     <Category>Fields</Category>
     <Category>Constructors</Category>
     <Category>Methods</Category>
+    <Category>Properties</Category>
   </Categories>
   <SCOPE>All</SCOPE>
   <VISIBILITY>private</VISIBILITY>
diff --git a/model/core.uml b/model/core.uml
index a08e40b..829aa0c 100644
--- a/model/core.uml
+++ b/model/core.uml
@@ -4,17 +4,17 @@
   <OriginalElement>core</OriginalElement>
   <nodes>
     <node x="0.0" y="304.0">core.renting</node>
-    <node x="312.0" y="0.0">core.MainTest</node>
+    <node x="312.0" y="0.0">core.CoreAppTest</node>
+    <node x="0.0" y="0.0">core.CoreApp</node>
     <node x="0.0" y="207.0">core.components</node>
     <node x="0.0" y="401.0">core.rides</node>
     <node x="197.0" y="304.0">core.system</node>
     <node x="221.0" y="207.0">core.statistics</node>
-    <node x="0.0" y="0.0">core.Main</node>
     <node x="181.0" y="401.0">core.setup</node>
   </nodes>
   <notes />
   <edges />
-  <settings layout="Hierarchic Group" zoom="1.0" x="248.5" y="226.5" />
+  <settings layout="Hierarchic Group" zoom="1.0" x="198.5" y="171.5" />
   <SelectedNodes>
     <node>core.renting</node>
   </SelectedNodes>
@@ -22,6 +22,7 @@
     <Category>Fields</Category>
     <Category>Constructors</Category>
     <Category>Methods</Category>
+    <Category>Properties</Category>
   </Categories>
   <SCOPE>All</SCOPE>
   <VISIBILITY>private</VISIBILITY>
diff --git a/model/factories.uml b/model/factories.uml
new file mode 100644
index 0000000..3f20451
--- /dev/null
+++ b/model/factories.uml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Diagram>
+  <ID>JAVA</ID>
+  <OriginalElement>core.components.factories</OriginalElement>
+  <nodes>
+    <node x="725.0" y="704.0">core.components.factories.PointFactory</node>
+    <node x="367.0" y="0.0">core.components.factories.ParkingSlotsFactoryTest</node>
+    <node x="0.0" y="0.0">core.components.factories.ParkingSlotsFactory</node>
+    <node x="256.0" y="539.0">core.components.factories.StationFactoryTest</node>
+    <node x="504.0" y="704.0">core.components.factories.PointFactoryTest</node>
+    <node x="0.0" y="539.0">core.components.factories.BicycleFactoryTest</node>
+    <node x="291.0" y="704.0">core.components.factories.CardFactoryTest</node>
+    <node x="510.0" y="539.0">core.components.factories.UserFactoryTest</node>
+    <node x="0.0" y="825.0">core.components.factories.IFactory</node>
+    <node x="436.0" y="374.0">core.components.factories.BicycleFactory</node>
+    <node x="0.0" y="374.0">core.components.factories.UserFactory</node>
+    <node x="0.0" y="704.0">core.components.factories.CardFactory</node>
+    <node x="0.0" y="209.0">core.components.factories.StationFactory</node>
+  </nodes>
+  <notes />
+  <edges />
+  <settings layout="Hierarchic Group" zoom="0.7504488330341114" x="833.9928229665072" y="268.5" />
+  <SelectedNodes>
+    <node>core.components.factories.PointFactory</node>
+  </SelectedNodes>
+  <Categories>
+    <Category>Fields</Category>
+    <Category>Constructors</Category>
+    <Category>Methods</Category>
+    <Category>Properties</Category>
+  </Categories>
+  <SCOPE>All</SCOPE>
+  <VISIBILITY>private</VISIBILITY>
+</Diagram>
+
diff --git a/model/planning.uml b/model/planning.uml
index 30e6a4b..1a3b77b 100644
--- a/model/planning.uml
+++ b/model/planning.uml
@@ -3,18 +3,20 @@
   <ID>JAVA</ID>
   <OriginalElement>core.rides.planning</OriginalElement>
   <nodes>
-    <node x="0.0" y="0.0">core.rides.planning.Main</node>
-    <node x="205.0" y="99.0">core.rides.planning.policies</node>
-    <node x="0.0" y="99.0">core.rides.planning.MainTest</node>
+    <node x="0.0" y="99.0">core.rides.planning.PlanningAppTest</node>
+    <node x="0.0" y="0.0">core.rides.planning.PlanningApp</node>
   </nodes>
   <notes />
   <edges />
-  <settings layout="Hierarchic Group" zoom="1.0" x="80.0" y="123.0" />
-  <SelectedNodes />
+  <settings layout="Hierarchic Group" zoom="1.0" x="84.0" y="74.5" />
+  <SelectedNodes>
+    <node>core.rides.planning.PlanningAppTest</node>
+  </SelectedNodes>
   <Categories>
     <Category>Fields</Category>
     <Category>Constructors</Category>
     <Category>Methods</Category>
+    <Category>Properties</Category>
   </Categories>
   <SCOPE>All</SCOPE>
   <VISIBILITY>private</VISIBILITY>
diff --git a/model/policies.uml b/model/policies.uml
deleted file mode 100644
index 418aa94..0000000
--- a/model/policies.uml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Diagram>
-  <ID>JAVA</ID>
-  <OriginalElement>core.rides.planning.policies</OriginalElement>
-  <nodes>
-    <node x="0.0" y="97.0">core.rides.planning.policies.PreferPlusStationsPolicy</node>
-    <node x="0.0" y="194.0">core.rides.planning.policies.AvoidPlusStationsPolicy</node>
-    <node x="0.0" y="0.0">core.rides.planning.policies.PreserveUniformBicyclesPolicy</node>
-    <node x="0.0" y="291.0">core.rides.planning.policies.Main</node>
-  </nodes>
-  <notes />
-  <edges />
-  <settings layout="Hierarchic Group" zoom="1.0" x="140.0" y="171.5" />
-  <SelectedNodes />
-  <Categories>
-    <Category>Fields</Category>
-    <Category>Constructors</Category>
-    <Category>Methods</Category>
-    <Category>Properties</Category>
-  </Categories>
-  <SCOPE>All</SCOPE>
-  <VISIBILITY>private</VISIBILITY>
-</Diagram>
-
diff --git a/model/renting.uml b/model/renting.uml
index 3b1d6d2..e20d894 100644
--- a/model/renting.uml
+++ b/model/renting.uml
@@ -3,19 +3,20 @@
   <ID>JAVA</ID>
   <OriginalElement>core.renting</OriginalElement>
   <nodes>
-    <node x="0.0" y="207.0">core.renting.MainTest</node>
-    <node x="0.0" y="0.0">core.renting.Main</node>
+    <node x="0.0" y="341.0">core.renting.RentingApp</node>
+    <node x="0.0" y="0.0">core.renting.RentingAppTest</node>
   </nodes>
   <notes />
   <edges />
-  <settings layout="Hierarchic Group" zoom="1.0" x="56.0" y="156.5" />
+  <settings layout="Hierarchic Group" zoom="1.0" x="80.0" y="314.0" />
   <SelectedNodes>
-    <node>core.renting.MainTest</node>
+    <node>core.renting.RentingApp</node>
   </SelectedNodes>
   <Categories>
     <Category>Fields</Category>
     <Category>Constructors</Category>
     <Category>Methods</Category>
+    <Category>Properties</Category>
   </Categories>
   <SCOPE>All</SCOPE>
   <VISIBILITY>private</VISIBILITY>
diff --git a/model/setup.uml b/model/setup.uml
index 2df00df..234df98 100644
--- a/model/setup.uml
+++ b/model/setup.uml
@@ -3,18 +3,18 @@
   <ID>JAVA</ID>
   <OriginalElement>core.setup</OriginalElement>
   <nodes>
-    <node x="197.0" y="328.0">core.setup.VisualizationStatistics</node>
-    <node x="0.0" y="207.0">core.setup.InitialSetupTest</node>
-    <node x="261.0" y="427.0">core.setup.PlanningRide</node>
-    <node x="243.0" y="207.0">core.setup.RentalBicycleTest</node>
+    <node x="287.0" y="405.0">core.setup.VisualizationStatistics</node>
+    <node x="0.0" y="405.0">core.setup.SetupApp</node>
+    <node x="342.0" y="0.0">core.setup.InitialSetupTest</node>
+    <node x="0.0" y="603.0">core.setup.PlanningRide</node>
+    <node x="261.0" y="504.0">core.setup.RentalBicycleTest</node>
     <node x="0.0" y="0.0">core.setup.InitialSetup</node>
-    <node x="0.0" y="427.0">core.setup.ComputationStatistics</node>
-    <node x="0.0" y="328.0">core.setup.RentalBicycle</node>
-    <node x="450.0" y="427.0">core.setup.Main</node>
+    <node x="490.0" y="504.0">core.setup.RentalBicycle</node>
+    <node x="0.0" y="504.0">core.setup.ComputationStatistics</node>
   </nodes>
   <notes />
   <edges />
-  <settings layout="Hierarchic Group" zoom="0.8282608695652174" x="202.5" y="220.0" />
+  <settings layout="Hierarchic Group" zoom="0.908695652173913" x="202.5" y="210.0" />
   <SelectedNodes>
     <node>core.setup.VisualizationStatistics</node>
   </SelectedNodes>
diff --git a/model/top-level.uml b/model/src.uml
similarity index 79%
rename from model/top-level.uml
rename to model/src.uml
index 8c67eca..b4ea998 100644
--- a/model/top-level.uml
+++ b/model/src.uml
@@ -26,11 +26,14 @@
   </nodes>
   <notes />
   <edges />
-  <settings layout="Hierarchic Group" zoom="0.5825688073394496" x="307.5" y="316.99999999999994" />
-  <SelectedNodes>
-    <node>com</node>
-  </SelectedNodes>
-  <Categories />
+  <settings layout="Hierarchic Group" zoom="0.6391437308868502" x="307.5" y="307.0" />
+  <SelectedNodes />
+  <Categories>
+    <Category>Fields</Category>
+    <Category>Constructors</Category>
+    <Category>Methods</Category>
+    <Category>Properties</Category>
+  </Categories>
   <SCOPE>All</SCOPE>
   <VISIBILITY>private</VISIBILITY>
 </Diagram>
diff --git a/model/station.uml b/model/station.uml
index e2034c0..4194121 100644
--- a/model/station.uml
+++ b/model/station.uml
@@ -3,14 +3,14 @@
   <ID>JAVA</ID>
   <OriginalElement>core.statistics.balance.station</OriginalElement>
   <nodes>
-    <node x="0.0" y="0.0">core.statistics.balance.station.Main</node>
-    <node x="0.0" y="253.0">core.statistics.balance.station.MainTest</node>
+    <node x="0.0" y="253.0">core.statistics.balance.station.StationAppTest</node>
+    <node x="0.0" y="0.0">core.statistics.balance.station.StationApp</node>
   </nodes>
   <notes />
   <edges />
-  <settings layout="Hierarchic Group" zoom="1.0" x="56.0" y="246.5" />
+  <settings layout="Hierarchic Group" zoom="1.0" x="80.0" y="168.0" />
   <SelectedNodes>
-    <node>core.statistics.balance.station.Main</node>
+    <node>core.statistics.balance.station.StationAppTest</node>
   </SelectedNodes>
   <Categories>
     <Category>Fields</Category>
diff --git a/model/system.uml b/model/system.uml
index afacb5f..d53db8d 100644
--- a/model/system.uml
+++ b/model/system.uml
@@ -4,13 +4,13 @@
   <OriginalElement>core.system</OriginalElement>
   <nodes>
     <node x="0.0" y="0.0">core.system.MyVelibSystem</node>
-    <node x="0.0" y="612.0">core.system.MyVelibSystemFactoryTest</node>
     <node x="366.0" y="0.0">core.system.MyVelibSystemTest</node>
+    <node x="0.0" y="612.0">core.system.MyVelibSystemFactoryTest</node>
     <node x="0.0" y="469.0">core.system.MyVelibSystemFactory</node>
   </nodes>
   <notes />
   <edges />
-  <settings layout="Hierarchic Group" zoom="1.0" x="120.0" y="291.5" />
+  <settings layout="Hierarchic Group" zoom="1.0" x="120.0" y="341.0" />
   <SelectedNodes>
     <node>core.system.MyVelibSystem</node>
   </SelectedNodes>
diff --git a/model/user.uml b/model/user.uml
index a87b26e..9979eb0 100644
--- a/model/user.uml
+++ b/model/user.uml
@@ -3,14 +3,14 @@
   <ID>JAVA</ID>
   <OriginalElement>core.statistics.balance.user</OriginalElement>
   <nodes>
-    <node x="0.0" y="209.0">core.statistics.balance.user.MainTest</node>
-    <node x="0.0" y="0.0">core.statistics.balance.user.Main</node>
+    <node x="0.0" y="0.0">core.statistics.balance.user.UserApp</node>
+    <node x="0.0" y="209.0">core.statistics.balance.user.UserAppTest</node>
   </nodes>
   <notes />
   <edges />
-  <settings layout="Hierarchic Group" zoom="1.0" x="56.0" y="74.5" />
+  <settings layout="Hierarchic Group" zoom="1.0" x="495.0" y="184.0" />
   <SelectedNodes>
-    <node>core.statistics.balance.user.MainTest</node>
+    <node>core.statistics.balance.user.UserApp</node>
   </SelectedNodes>
   <Categories>
     <Category>Fields</Category>