Make some reorganisation