Changement structure

Change on structure, "test" on model