As discussed in today's documentation meeting, container classes does
not fit in with the data storage topics. This change makes core look
unbalanced, but that can be fixed later. Even without this change, core
would have needed attention.

Change-Id: I595602ad3a5247eb1531db31e194a04f262ebbe9
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>