Change: move of the model to proper place
Remove: old, dropped code, that is not going to be used