3e641ae766
This is done in preparation for a major refactoring. Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>