Simplify structure (a lot !)