changed a few things, reorganized bundles