refactoring relation between model and adapt view
refactoring of all parts of the application