Split the modularity patch into smaller pieces. Add the container module.

Change-Id: I7cc83ae908e4d4f38c294b3d08c367015a8a721a
Signed-off-by: Maxime Millette-Coulombe <mmcoulombe@inocybe.com>