Refactor des packages.
Tentative de fluent interface.