#107 Simplification of the packaging