Removed bundle structure. Introduced new, much simpler structure