Very beginning
Fixe merge
Code cleaning + structure