Test
more sessions, refactoring of the views
merge of some files