Added bundle definition files
Base class rename