refactoring of the bundle to prepare future enhancements.

Add container rebuilding, data access from settings,...
update documentation