Refactor structure and add classes for accessing bundles