base: bundles structure changes

Signed-off-by: Kamil Neczaj <kamil.neczaj@cern.ch>