Small refactoring
Added first UML diagram